Mercurial > projects > dil

annotate trunk/src/cmd/ImportGraph.d @ 785:57ef69eced96

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added functions isCodeSection() and skipCodeSection(). Added a lot of documentation comments and revised some.
author Aziz K?ksal <aziz.koeksal@gmail.com>
date Sat, 23 Feb 2008 21:15:56 +0100
parents edd217e14736
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
364
1059295c2727 - Every command module has an execute method now.
aziz
parents:
diff changeset
1 /++
1059295c2727 - Every command module has an execute method now.
aziz
parents:
diff changeset
2 Author: Aziz Köksal
1059295c2727 - Every command module has an execute method now.
aziz
parents:
diff changeset
3 License: GPL3
1059295c2727 - Every command module has an execute method now.
aziz
parents:
diff changeset
4 +/
1059295c2727 - Every command module has an execute method now.
aziz
parents:
diff changeset
5 module cmd.ImportGraph;
580
fa6d3c52757d Moved SyntaxTree.d to new package 'ast'.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 576
diff changeset
6
fa6d3c52757d Moved SyntaxTree.d to new package 'ast'.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 576
diff changeset
7 import dil.ast.Node;
585
05c375fb2d5c Moved dil.Declarations to dil.ast.Declarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 580
diff changeset
8 import dil.ast.Declarations;
593
2848ce3becf5 Moved dil.Module to dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 585
diff changeset
9 import dil.semantic.Module;
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
10 import dil.parser.ImportParser;
755
90668b83ae5e Introduced new module dil.SourceText and class SourceText.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 720
diff changeset
11 import dil.SourceText;
780
edd217e14736 Using CompilationContext in command 'igraph'.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 779
diff changeset
12 import dil.Compilation;
779
8e6fed11bb68 Moved Settings.d and SettingsLoader.d to src/.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 764
diff changeset
13 import Settings;
755
90668b83ae5e Introduced new module dil.SourceText and class SourceText.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 720
diff changeset
14 import common;
90668b83ae5e Introduced new module dil.SourceText and class SourceText.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 720
diff changeset
15
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 375
diff changeset
16 import tango.text.Regex : RegExp = Regex;
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 375
diff changeset
17 import tango.io.FilePath;
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 375
diff changeset
18 import tango.io.FileConst;
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 375
diff changeset
19 import tango.text.Util;
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 375
diff changeset
20
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 375
diff changeset
21 alias FileConst.PathSeparatorChar dirSep;
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
22
785
57ef69eced96 Added functions isCodeSection() and skipCodeSection().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 780
diff changeset
23 /// Options for the importgraph command.
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
24 enum IGraphOption
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
25 {
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
26 None,
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
27 IncludeUnlocatableModules = 1,
427
e2bbc6406a14 Added a new option '-m' to the igraph command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 391
diff changeset
28 PrintDot = 1<<1,
e2bbc6406a14 Added a new option '-m' to the igraph command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 391
diff changeset
29 HighlightCyclicEdges = 1<<2,
e2bbc6406a14 Added a new option '-m' to the igraph command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 391
diff changeset
30 HighlightCyclicVertices = 1<<3,
e2bbc6406a14 Added a new option '-m' to the igraph command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 391
diff changeset
31 GroupByPackageNames = 1<<4,
e2bbc6406a14 Added a new option '-m' to the igraph command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 391
diff changeset
32 GroupByFullPackageName = 1<<5,
e2bbc6406a14 Added a new option '-m' to the igraph command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 391
diff changeset
33 PrintPaths = 1<<6,
e2bbc6406a14 Added a new option '-m' to the igraph command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 391
diff changeset
34 PrintList = 1<<7,
e2bbc6406a14 Added a new option '-m' to the igraph command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 391
diff changeset
35 MarkCyclicModules = 1<<8,
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
36 }
367
dda55fae37de - ImportGraph.execute() can parse all modules depending on the imports of the root module.
aziz
parents: 366
diff changeset
37
785
57ef69eced96 Added functions isCodeSection() and skipCodeSection().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 780
diff changeset
38 /// Represents a module dependency graph.
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
39 class Graph
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
40 {
785
57ef69eced96 Added functions isCodeSection() and skipCodeSection().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 780
diff changeset
41 Vertex[] vertices; /// The vertices or modules.
57ef69eced96 Added functions isCodeSection() and skipCodeSection().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 780
diff changeset
42 Edge[] edges; /// The edges or import statements.
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
43
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
44 void addVertex(Vertex vertex)
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
45 {
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
46 vertex.id = vertices.length;
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
47 vertices ~= vertex;
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
48 }
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
49
702
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
50 Edge addEdge(Vertex from, Vertex to)
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
51 {
702
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
52 auto edge = new Edge(from, to);
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
53 edges ~= edge;
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
54 from.outgoing ~= to;
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
55 to.incoming ~= from;
702
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
56 return edge;
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
57 }
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
58
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
59 /// Walks the graph and marks cyclic vertices and edges.
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
60 void detectCycles()
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
61 { // Cycles could also be detected in the GraphBuilder,
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
62 // but having the code here makes things much clearer.
702
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
63
720
74cdbb25c7c8 Using old algo for cycle detection again.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 719
diff changeset
64 // Commented out because this algorithm doesn't work.
702
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
65 // Returns true if the vertex is in status Visiting.
720
74cdbb25c7c8 Using old algo for cycle detection again.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 719
diff changeset
66 /+bool visit(Vertex vertex)
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
67 {
702
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
68 switch (vertex.status)
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
69 {
702
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
70 case Vertex.Status.Visiting:
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
71 vertex.isCyclic = true;
699
4c0ea78a7f8b Fixed cycle detection algorithm.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 698
diff changeset
72 return true;
702
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
73 case Vertex.Status.None:
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
74 vertex.status = Vertex.Status.Visiting; // Flag as visiting.
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
75 foreach (outVertex; vertex.outgoing) // Visit successors.
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
76 vertex.isCyclic |= visit(outVertex);
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
77 vertex.status = Vertex.Status.Visited; // Flag as visited.
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
78 break;
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
79 case Vertex.Status.Visited:
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
80 break;
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
81 default:
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
82 assert(0, "unknown vertex status");
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
83 }
702
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
84 return false; // return (vertex.status == Vertex.Status.Visiting);
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
85 }
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
86 // Start visiting vertices.
720
74cdbb25c7c8 Using old algo for cycle detection again.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 719
diff changeset
87 visit(vertices[0]);+/
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
88
720
74cdbb25c7c8 Using old algo for cycle detection again.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 719
diff changeset
89 //foreach (edge; edges)
74cdbb25c7c8 Using old algo for cycle detection again.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 719
diff changeset
90 // if (edge.from.isCyclic && edge.to.isCyclic)
74cdbb25c7c8 Using old algo for cycle detection again.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 719
diff changeset
91 // edge.isCyclic = true;
74cdbb25c7c8 Using old algo for cycle detection again.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 719
diff changeset
92
74cdbb25c7c8 Using old algo for cycle detection again.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 719
diff changeset
93 // Use functioning algorithm.
74cdbb25c7c8 Using old algo for cycle detection again.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 719
diff changeset
94 analyzeGraph(vertices, edges);
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
95 }
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
96 }
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
97
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
98 /// Represents a directed connection between two vertices.
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
99 class Edge
370
ae4afb66768f - Renamed findModule() to findModulePath().
aziz
parents: 368
diff changeset
100 {
702
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
101 Vertex from; /// Coming from vertex.
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
102 Vertex to; /// Going to vertex.
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
103 bool isCyclic; /// Edge connects cyclic vertices.
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
104 bool isPublic; /// Public import.
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
105 bool isStatic; /// Static import.
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
106
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
107 this(Vertex from, Vertex to)
370
ae4afb66768f - Renamed findModule() to findModulePath().
aziz
parents: 368
diff changeset
108 {
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
109 this.from = from;
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
110 this.to = to;
370
ae4afb66768f - Renamed findModule() to findModulePath().
aziz
parents: 368
diff changeset
111 }
ae4afb66768f - Renamed findModule() to findModulePath().
aziz
parents: 368
diff changeset
112 }
ae4afb66768f - Renamed findModule() to findModulePath().
aziz
parents: 368
diff changeset
113
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
114 /// Represents a module in the graph.
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
115 class Vertex
367
dda55fae37de - ImportGraph.execute() can parse all modules depending on the imports of the root module.
aziz
parents: 366
diff changeset
116 {
702
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
117 Module modul; /// The module represented by this vertex.
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
118 uint id; /// The nth vertex in the graph.
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
119 Vertex[] incoming; /// Also called predecessors.
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
120 Vertex[] outgoing; /// Also called successors.
702
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
121 bool isCyclic; /// Whether this vertex is in a cyclic relationship with other vertices.
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
122
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
123 enum Status : ubyte
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
124 { None, Visiting, Visited }
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
125 Status status; /// Used by the cycle detection algorithm.
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
126 }
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
127
785
57ef69eced96 Added functions isCodeSection() and skipCodeSection().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 780
diff changeset
128 /// Searches for a module in the file system looking in importPaths.
57ef69eced96 Added functions isCodeSection() and skipCodeSection().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 780
diff changeset
129 /// Returns: the file path to the module, or null if it wasn't found.
703
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
130 string findModuleFilePath(string moduleFQNPath, string[] importPaths)
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
131 {
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
132 auto filePath = new FilePath();
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
133 foreach (importPath; importPaths)
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
134 {
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
135 filePath.set(importPath);
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
136 filePath.append(moduleFQNPath);
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
137 foreach (moduleSuffix; [".d", ".di"/*interface file*/])
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
138 {
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
139 filePath.suffix(moduleSuffix);
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
140 if (filePath.exists())
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
141 return filePath.toString();
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
142 }
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
143 }
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
144 return null;
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
145 }
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
146
785
57ef69eced96 Added functions isCodeSection() and skipCodeSection().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 780
diff changeset
147 /// Builds a module dependency graph.
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
148 class GraphBuilder
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
149 {
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
150 Graph graph;
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
151 IGraphOption options;
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
152 string[] importPaths; /// Where to look for modules.
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
153 Vertex[string] loadedModulesTable; /// Maps FQN paths to modules.
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
154 bool delegate(string) filterPredicate;
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
155
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
156 this()
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
157 {
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
158 this.graph = new Graph;
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
159 }
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
160
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
161 /// Start building the graph and return that.
785
57ef69eced96 Added functions isCodeSection() and skipCodeSection().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 780
diff changeset
162 /// Params:
57ef69eced96 Added functions isCodeSection() and skipCodeSection().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 780
diff changeset
163 /// fileName = the file name of the root module.
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
164 Graph start(string fileName)
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
165 {
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
166 loadModule(fileName);
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
167 return graph;
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
168 }
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
169
785
57ef69eced96 Added functions isCodeSection() and skipCodeSection().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 780
diff changeset
170 /// Loads all modules recursively and builds the graph at the same time.
57ef69eced96 Added functions isCodeSection() and skipCodeSection().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 780
diff changeset
171 /// Params:
57ef69eced96 Added functions isCodeSection() and skipCodeSection().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 780
diff changeset
172 /// moduleFQNPath = the path version of the module FQN.$(BR)
57ef69eced96 Added functions isCodeSection() and skipCodeSection().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 780
diff changeset
173 /// E.g.: FQN = dil.ast.Node -> FQNPath = dil/ast/Node
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
174 Vertex loadModule(string moduleFQNPath)
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
175 {
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
176 // Look up in table if the module is already loaded.
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
177 auto pVertex = moduleFQNPath in loadedModulesTable;
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
178 if (pVertex !is null)
702
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
179 return *pVertex; // Returns null for filtered or unlocatable modules.
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
180
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
181 // Filter out modules.
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
182 if (filterPredicate && filterPredicate(moduleFQNPath))
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
183 { // Store null for filtered modules.
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
184 loadedModulesTable[moduleFQNPath] = null;
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
185 return null;
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
186 }
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
187
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
188 // Locate the module in the file system.
703
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
189 auto moduleFilePath = findModuleFilePath(moduleFQNPath, importPaths);
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
190
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
191 Vertex vertex;
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
192
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
193 if (moduleFilePath is null)
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
194 { // Module not found.
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
195 if (options & IGraphOption.IncludeUnlocatableModules)
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
196 { // Include module nevertheless.
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
197 vertex = new Vertex;
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
198 vertex.modul = new Module("");
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
199 vertex.modul.setFQN(replace(moduleFQNPath, dirSep, '.'));
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
200 graph.addVertex(vertex);
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
201 }
702
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
202 // Store vertex in the table (vertex may be null.)
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
203 loadedModulesTable[moduleFQNPath] = vertex;
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
204 }
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
205 else
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
206 {
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
207 auto modul = new Module(moduleFilePath);
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
208 // Use lightweight ImportParser.
755
90668b83ae5e Introduced new module dil.SourceText and class SourceText.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 720
diff changeset
209 modul.setParser(new ImportParser(modul.sourceText));
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
210 modul.parse();
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
211
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
212 vertex = new Vertex;
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
213 vertex.modul = modul;
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
214
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
215 graph.addVertex(vertex);
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
216 loadedModulesTable[modul.getFQNPath()] = vertex;
702
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
217
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
218 // Load the modules which this module depends on.
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
219 foreach (importDecl; modul.imports)
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
220 {
702
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
221 foreach (moduleFQNPath2; importDecl.getModuleFQNs(dirSep))
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
222 {
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
223 auto loaded = loadModule(moduleFQNPath2);
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
224 if (loaded !is null)
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
225 {
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
226 auto edge = graph.addEdge(vertex, loaded);
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
227 edge.isPublic = importDecl.isPublic();
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
228 edge.isStatic = importDecl.isStatic();
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
229 }
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
230 }
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
231 }
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
232 }
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
233 return vertex;
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
234 }
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
235 }
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
236
785
57ef69eced96 Added functions isCodeSection() and skipCodeSection().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 780
diff changeset
237 /// Executes the importgraph command.
780
edd217e14736 Using CompilationContext in command 'igraph'.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 779
diff changeset
238 void execute(string filePathString, CompilationContext context, string[] strRegexps,
703
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
239 uint levels, string siStyle, string piStyle, IGraphOption options)
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
240 {
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
241 // Init regular expressions.
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
242 RegExp[] regexps;
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
243 foreach (strRegexp; strRegexps)
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
244 regexps ~= new RegExp(strRegexp);
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
245
780
edd217e14736 Using CompilationContext in command 'igraph'.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 779
diff changeset
246 // Add the directory of the file to the import paths.
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
247 auto filePath = new FilePath(filePathString);
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
248 auto fileDir = filePath.folder();
780
edd217e14736 Using CompilationContext in command 'igraph'.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 779
diff changeset
249 context.importPaths ~= fileDir;
367
dda55fae37de - ImportGraph.execute() can parse all modules depending on the imports of the root module.
aziz
parents: 366
diff changeset
250
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
251 auto gbuilder = new GraphBuilder;
367
dda55fae37de - ImportGraph.execute() can parse all modules depending on the imports of the root module.
aziz
parents: 366
diff changeset
252
780
edd217e14736 Using CompilationContext in command 'igraph'.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 779
diff changeset
253 gbuilder.importPaths = context.importPaths;
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
254 gbuilder.options = options;
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
255 gbuilder.filterPredicate = (string moduleFQNPath) {
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
256 foreach (rx; regexps)
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
257 // Replace slashes: dil/ast/Node -> dil.ast.Node
702
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
258 if (rx.test(replace(moduleFQNPath.dup, dirSep, '.')))
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
259 return true;
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
260 return false;
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
261 };
364
1059295c2727 - Every command module has an execute method now.
aziz
parents:
diff changeset
262
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
263 auto graph = gbuilder.start(filePath.name());
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
264
427
e2bbc6406a14 Added a new option '-m' to the igraph command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 391
diff changeset
265 if (options & (IGraphOption.PrintList | IGraphOption.PrintPaths))
e2bbc6406a14 Added a new option '-m' to the igraph command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 391
diff changeset
266 {
e2bbc6406a14 Added a new option '-m' to the igraph command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 391
diff changeset
267 if (options & IGraphOption.MarkCyclicModules)
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
268 graph.detectCycles();
427
e2bbc6406a14 Added a new option '-m' to the igraph command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 391
diff changeset
269
e2bbc6406a14 Added a new option '-m' to the igraph command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 391
diff changeset
270 if (options & IGraphOption.PrintPaths)
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
271 printModulePaths(graph.vertices, levels+1, "");
427
e2bbc6406a14 Added a new option '-m' to the igraph command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 391
diff changeset
272 else
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
273 printModuleList(graph.vertices, levels+1, "");
427
e2bbc6406a14 Added a new option '-m' to the igraph command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 391
diff changeset
274 }
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
275 else
703
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
276 printDotDocument(graph, siStyle, piStyle, options);
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
277 }
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
278
785
57ef69eced96 Added functions isCodeSection() and skipCodeSection().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 780
diff changeset
279 /// Prints the file paths to the modules.
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
280 void printModulePaths(Vertex[] vertices, uint level, char[] indent)
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
281 {
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
282 if (level == 0)
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
283 return;
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
284 foreach (vertex; vertices)
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
285 {
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
286 Stdout(indent)((vertex.isCyclic?"*":"")~vertex.modul.filePath).newline;
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
287 if (vertex.outgoing.length)
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
288 printModulePaths(vertex.outgoing, level-1, indent~" ");
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
289 }
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
290 }
370
ae4afb66768f - Renamed findModule() to findModulePath().
aziz
parents: 368
diff changeset
291
785
57ef69eced96 Added functions isCodeSection() and skipCodeSection().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 780
diff changeset
292 /// Prints a list of module FQNs.
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
293 void printModuleList(Vertex[] vertices, uint level, char[] indent)
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
294 {
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
295 if (level == 0)
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
296 return;
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
297 foreach (vertex; vertices)
370
ae4afb66768f - Renamed findModule() to findModulePath().
aziz
parents: 368
diff changeset
298 {
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
299 Stdout(indent)((vertex.isCyclic?"*":"")~vertex.modul.getFQN()).newline;
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
300 if (vertex.outgoing.length)
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
301 printModuleList(vertex.outgoing, level-1, indent~" ");
370
ae4afb66768f - Renamed findModule() to findModulePath().
aziz
parents: 368
diff changeset
302 }
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
303 }
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
304
785
57ef69eced96 Added functions isCodeSection() and skipCodeSection().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 780
diff changeset
305 /// Prints the graph as a graphviz dot document.
703
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
306 void printDotDocument(Graph graph, string siStyle, string piStyle,
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
307 IGraphOption options)
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
308 {
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
309 Vertex[][string] verticesByPckgName;
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
310 if (options & IGraphOption.GroupByFullPackageName)
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
311 foreach (vertex; graph.vertices)
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
312 verticesByPckgName[vertex.modul.packageName] ~= vertex;
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
313
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
314 if (options & (IGraphOption.HighlightCyclicVertices |
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
315 IGraphOption.HighlightCyclicEdges))
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
316 graph.detectCycles();
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
317
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
318 // Output header of the dot document.
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
319 Stdout("Digraph ImportGraph\n{\n");
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
320 // Output nodes.
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
321 // 'i' and vertex.id should be the same.
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
322 foreach (i, vertex; graph.vertices)
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
323 Stdout.formatln(` n{} [label="{}"{}];`, i, vertex.modul.getFQN(), (vertex.isCyclic ? ",style=filled,fillcolor=tomato" : ""));
703
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
324
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
325 // Output edges.
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
326 foreach (edge; graph.edges)
703
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
327 {
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
328 string edgeStyles = "";
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
329 if (edge.isStatic || edge.isPublic)
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
330 {
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
331 edgeStyles = `[style="`;
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
332 edge.isStatic && (edgeStyles ~= siStyle ~ ",");
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
333 edge.isPublic && (edgeStyles ~= piStyle);
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
334 edgeStyles[$-1] == ',' && (edgeStyles = edgeStyles[0..$-1]); // Remove last comma.
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
335 edgeStyles ~= `"]`;
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
336 }
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
337 edge.isCyclic && (edgeStyles ~= "[color=red]");
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
338 Stdout.formatln(` n{} -> n{} {};`, edge.from.id, edge.to.id, edgeStyles);
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
339 }
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
340
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
341 if (options & IGraphOption.GroupByFullPackageName)
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
342 foreach (packageName, vertices; verticesByPckgName)
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
343 { // Output nodes in a cluster.
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
344 Stdout.format(` subgraph "cluster_{}" {`\n` label="{}";color=blue;`"\n ", packageName, packageName);
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
345 foreach (vertex; vertices)
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
346 Stdout.format(`n{};`, vertex.id);
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 375
diff changeset
347 Stdout("\n }\n");
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
348 }
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
349
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 375
diff changeset
350 Stdout("}\n");
364
1059295c2727 - Every command module has an execute method now.
aziz
parents:
diff changeset
351 }
370
ae4afb66768f - Renamed findModule() to findModulePath().
aziz
parents: 368
diff changeset
352
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
353 // This is the old algorithm that was used to detect cycles in a directed graph.
431
7a6bfa569a52 Fix: analyzeGraph() should work correctly now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 427
diff changeset
354 void analyzeGraph(Vertex[] vertices_init, Edge[] edges)
370
ae4afb66768f - Renamed findModule() to findModulePath().
aziz
parents: 368
diff changeset
355 {
720
74cdbb25c7c8 Using old algo for cycle detection again.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 719
diff changeset
356 edges = edges.dup;
431
7a6bfa569a52 Fix: analyzeGraph() should work correctly now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 427
diff changeset
357 void recursive(Vertex[] vertices)
370
ae4afb66768f - Renamed findModule() to findModulePath().
aziz
parents: 368
diff changeset
358 {
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
359 foreach (idx, vertex; vertices)
370
ae4afb66768f - Renamed findModule() to findModulePath().
aziz
parents: 368
diff changeset
360 {
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
361 uint outgoing, incoming;
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
362 foreach (j, edge; edges)
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
363 {
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
364 if (edge.from is vertex)
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
365 outgoing++;
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
366 if (edge.to is vertex)
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
367 incoming++;
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
368 }
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
369
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
370 if (outgoing == 0)
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
371 {
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
372 if (incoming != 0)
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
373 {
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
374 // Vertex is a sink.
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
375 alias outgoing i; // Reuse
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
376 alias incoming j; // Reuse
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
377 // Remove edges.
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
378 for (i=j=0; i < edges.length; i++)
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
379 if (edges[i].to !is vertex)
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
380 edges[j++] = edges[i];
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
381 edges.length = j;
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
382 vertices = vertices[0..idx] ~ vertices[idx+1..$];
431
7a6bfa569a52 Fix: analyzeGraph() should work correctly now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 427
diff changeset
383 recursive(vertices);
7a6bfa569a52 Fix: analyzeGraph() should work correctly now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 427
diff changeset
384 return;
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
385 }
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
386 else
431
7a6bfa569a52 Fix: analyzeGraph() should work correctly now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 427
diff changeset
387 {
7a6bfa569a52 Fix: analyzeGraph() should work correctly now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 427
diff changeset
388 // Edges to this vertex were removed previously.
7a6bfa569a52 Fix: analyzeGraph() should work correctly now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 427
diff changeset
389 // Only remove vertex now.
7a6bfa569a52 Fix: analyzeGraph() should work correctly now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 427
diff changeset
390 vertices = vertices[0..idx] ~ vertices[idx+1..$];
7a6bfa569a52 Fix: analyzeGraph() should work correctly now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 427
diff changeset
391 recursive(vertices);
7a6bfa569a52 Fix: analyzeGraph() should work correctly now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 427
diff changeset
392 return;
7a6bfa569a52 Fix: analyzeGraph() should work correctly now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 427
diff changeset
393 }
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
394 }
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
395 else if (incoming == 0)
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
396 {
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
397 // Vertex is a source
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
398 alias outgoing i; // Reuse
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
399 alias incoming j; // Reuse
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
400 // Remove edges.
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
401 for (i=j=0; i < edges.length; i++)
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
402 if (edges[i].from !is vertex)
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
403 edges[j++] = edges[i];
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
404 edges.length = j;
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
405 vertices = vertices[0..idx] ~ vertices[idx+1..$];
431
7a6bfa569a52 Fix: analyzeGraph() should work correctly now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 427
diff changeset
406 recursive(vertices);
7a6bfa569a52 Fix: analyzeGraph() should work correctly now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 427
diff changeset
407 return;
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
408 }
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
409 // else
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
410 // {
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
411 // // source && sink
431
7a6bfa569a52 Fix: analyzeGraph() should work correctly now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 427
diff changeset
412 // // continue loop.
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
413 // }
370
ae4afb66768f - Renamed findModule() to findModulePath().
aziz
parents: 368
diff changeset
414 }
ae4afb66768f - Renamed findModule() to findModulePath().
aziz
parents: 368
diff changeset
415
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
416 // When reaching this point it means only cylic edges and vertices are left.
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
417 foreach (vertex; vertices)
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
418 vertex.isCyclic = true;
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
419 foreach (edge; edges)
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
420 if (edge)
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
421 edge.isCyclic = true;
370
ae4afb66768f - Renamed findModule() to findModulePath().
aziz
parents: 368
diff changeset
422 }
431
7a6bfa569a52 Fix: analyzeGraph() should work correctly now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 427
diff changeset
423 recursive(vertices_init);
370
ae4afb66768f - Renamed findModule() to findModulePath().
aziz
parents: 368
diff changeset
424 }