Mercurial > projects > dil

annotate trunk/src/cmd/ImportGraph.d @ 764:4579e8505d5e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed unittests and removed dil.File. Fixed Converter.UTF16toUTF8(). Fixed an encode() function in dil.Unicode.
author Aziz K?ksal <aziz.koeksal@gmail.com>
date Sat, 16 Feb 2008 03:28:39 +0100
parents 90668b83ae5e
children 8e6fed11bb68
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;
367
dda55fae37de - ImportGraph.execute() can parse all modules depending on the imports of the root module.
aziz
parents: 366
diff changeset
11 import dil.Settings;
755
90668b83ae5e Introduced new module dil.SourceText and class SourceText.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 720
diff changeset
12 import dil.SourceText;
90668b83ae5e Introduced new module dil.SourceText and class SourceText.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 720
diff changeset
13 import common;
90668b83ae5e Introduced new module dil.SourceText and class SourceText.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 720
diff changeset
14
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 375
diff changeset
15 import tango.text.Regex : RegExp = Regex;
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 375
diff changeset
16 import tango.io.FilePath;
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 375
diff changeset
17 import tango.io.FileConst;
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 375
diff changeset
18 import tango.text.Util;
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 375
diff changeset
19
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 375
diff changeset
20 alias FileConst.PathSeparatorChar dirSep;
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
21
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
22 enum IGraphOption
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
23 {
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
24 None,
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
25 IncludeUnlocatableModules = 1,
427
e2bbc6406a14 Added a new option '-m' to the igraph command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 391
diff changeset
26 PrintDot = 1<<1,
e2bbc6406a14 Added a new option '-m' to the igraph command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 391
diff changeset
27 HighlightCyclicEdges = 1<<2,
e2bbc6406a14 Added a new option '-m' to the igraph command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 391
diff changeset
28 HighlightCyclicVertices = 1<<3,
e2bbc6406a14 Added a new option '-m' to the igraph command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 391
diff changeset
29 GroupByPackageNames = 1<<4,
e2bbc6406a14 Added a new option '-m' to the igraph command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 391
diff changeset
30 GroupByFullPackageName = 1<<5,
e2bbc6406a14 Added a new option '-m' to the igraph command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 391
diff changeset
31 PrintPaths = 1<<6,
e2bbc6406a14 Added a new option '-m' to the igraph command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 391
diff changeset
32 PrintList = 1<<7,
e2bbc6406a14 Added a new option '-m' to the igraph command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 391
diff changeset
33 MarkCyclicModules = 1<<8,
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
34 }
367
dda55fae37de - ImportGraph.execute() can parse all modules depending on the imports of the root module.
aziz
parents: 366
diff changeset
35
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
36 class Graph
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
37 {
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
38 Vertex[] vertices;
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
39 Edge[] edges;
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
40
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
41 void addVertex(Vertex vertex)
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
42 {
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
43 vertex.id = vertices.length;
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
44 vertices ~= 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
702
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
47 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
48 {
702
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
49 auto edge = new Edge(from, to);
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
50 edges ~= edge;
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
51 from.outgoing ~= to;
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
52 to.incoming ~= from;
702
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
53 return edge;
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
54 }
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
55
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
56 /// 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
57 void detectCycles()
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
58 { // 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
59 // 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
60
720
74cdbb25c7c8 Using old algo for cycle detection again.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 719
diff changeset
61 // 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
62 // 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
63 /+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
64 {
702
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
65 switch (vertex.status)
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
66 {
702
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
67 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
68 vertex.isCyclic = true;
699
4c0ea78a7f8b Fixed cycle detection algorithm.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 698
diff changeset
69 return true;
702
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
70 case Vertex.Status.None:
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
71 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
72 foreach (outVertex; vertex.outgoing) // Visit successors.
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
73 vertex.isCyclic |= visit(outVertex);
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
74 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
75 break;
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
76 case Vertex.Status.Visited:
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
77 break;
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
78 default:
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
79 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
80 }
702
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
81 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
82 }
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
83 // Start visiting vertices.
720
74cdbb25c7c8 Using old algo for cycle detection again.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 719
diff changeset
84 visit(vertices[0]);+/
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
85
720
74cdbb25c7c8 Using old algo for cycle detection again.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 719
diff changeset
86 //foreach (edge; edges)
74cdbb25c7c8 Using old algo for cycle detection again.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 719
diff changeset
87 // 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
88 // edge.isCyclic = true;
74cdbb25c7c8 Using old algo for cycle detection again.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 719
diff changeset
89
74cdbb25c7c8 Using old algo for cycle detection again.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 719
diff changeset
90 // Use functioning algorithm.
74cdbb25c7c8 Using old algo for cycle detection again.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 719
diff changeset
91 analyzeGraph(vertices, edges);
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
92 }
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
93 }
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
94
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
95 /// 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
96 class Edge
370
ae4afb66768f - Renamed findModule() to findModulePath().
aziz
parents: 368
diff changeset
97 {
702
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
98 Vertex from; /// Coming from vertex.
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
99 Vertex to; /// Going to vertex.
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
100 bool isCyclic; /// Edge connects cyclic vertices.
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
101 bool isPublic; /// Public import.
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
102 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
103
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
104 this(Vertex from, Vertex to)
370
ae4afb66768f - Renamed findModule() to findModulePath().
aziz
parents: 368
diff changeset
105 {
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
106 this.from = from;
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
107 this.to = to;
370
ae4afb66768f - Renamed findModule() to findModulePath().
aziz
parents: 368
diff changeset
108 }
ae4afb66768f - Renamed findModule() to findModulePath().
aziz
parents: 368
diff changeset
109 }
ae4afb66768f - Renamed findModule() to findModulePath().
aziz
parents: 368
diff changeset
110
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
111 /// 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
112 class Vertex
367
dda55fae37de - ImportGraph.execute() can parse all modules depending on the imports of the root module.
aziz
parents: 366
diff changeset
113 {
702
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
114 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
115 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
116 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
117 Vertex[] outgoing; /// Also called successors.
702
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
118 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
119
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
120 enum Status : ubyte
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
121 { None, Visiting, Visited }
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
122 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
123 }
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
124
703
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
125 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
126 {
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
127 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
128 foreach (importPath; importPaths)
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
129 {
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
130 filePath.set(importPath);
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
131 filePath.append(moduleFQNPath);
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
132 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
133 {
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
134 filePath.suffix(moduleSuffix);
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
135 if (filePath.exists())
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
136 return filePath.toString();
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
137 }
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 return null;
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
140 }
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
141
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
142 class GraphBuilder
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
143 {
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
144 Graph graph;
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
145 IGraphOption options;
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
146 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
147 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
148 bool delegate(string) filterPredicate;
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 this()
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
151 {
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
152 this.graph = new Graph;
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
153 }
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
154
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
155 /// Start building the graph and return that.
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
156 Graph start(string fileName)
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
157 {
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
158 loadModule(fileName);
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
159 return graph;
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
160 }
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
161
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
162 /++
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
163 Loads all modules recursively and builds the graph at the same time.
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
164 Params:
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
165 moduleFQNPath = e.g.: dil/ast/Node (module FQN = dil.ast.Node)
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
166 +/
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
167 Vertex loadModule(string moduleFQNPath)
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
168 {
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
169 // 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
170 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
171 if (pVertex !is null)
702
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
172 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
173
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
174 // Filter out modules.
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
175 if (filterPredicate && filterPredicate(moduleFQNPath))
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
176 { // Store null for filtered modules.
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
177 loadedModulesTable[moduleFQNPath] = null;
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
178 return null;
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
179 }
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
180
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
181 // 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
182 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
183
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
184 Vertex vertex;
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
185
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
186 if (moduleFilePath is null)
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
187 { // Module not found.
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
188 if (options & IGraphOption.IncludeUnlocatableModules)
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
189 { // Include module nevertheless.
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
190 vertex = new Vertex;
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
191 vertex.modul = new Module("");
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
192 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
193 graph.addVertex(vertex);
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
194 }
702
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
195 // 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
196 loadedModulesTable[moduleFQNPath] = vertex;
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
197 }
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
198 else
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
199 {
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
200 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
201 // Use lightweight ImportParser.
755
90668b83ae5e Introduced new module dil.SourceText and class SourceText.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 720
diff changeset
202 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
203 modul.parse();
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 vertex = new Vertex;
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
206 vertex.modul = modul;
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
207
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
208 graph.addVertex(vertex);
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
209 loadedModulesTable[modul.getFQNPath()] = vertex;
702
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
210
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
211 // 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
212 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
213 {
702
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
214 foreach (moduleFQNPath2; importDecl.getModuleFQNs(dirSep))
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
215 {
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
216 auto loaded = loadModule(moduleFQNPath2);
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
217 if (loaded !is null)
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
218 {
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
219 auto edge = graph.addEdge(vertex, loaded);
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
220 edge.isPublic = importDecl.isPublic();
e10838e0b182 Fixed filter delegate in cmd.ImportGraph.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 699
diff changeset
221 edge.isStatic = importDecl.isStatic();
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 }
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
224 }
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
225 }
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
226 return vertex;
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
227 }
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
228 }
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
229
703
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
230 void execute(string filePathString, string[] importPaths, string[] strRegexps,
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
231 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
232 {
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
233 // Init regular expressions.
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
234 RegExp[] regexps;
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
235 foreach (strRegexp; strRegexps)
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
236 regexps ~= new RegExp(strRegexp);
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
237
367
dda55fae37de - ImportGraph.execute() can parse all modules depending on the imports of the root module.
aziz
parents: 366
diff changeset
238 // Add directory of file and global directories to import paths.
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
239 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
240 auto fileDir = filePath.folder();
719
8f8c9ab3f3ba Fixed code that finds out a modules FQN.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 703
diff changeset
241 importPaths ~= fileDir;
370
ae4afb66768f - Renamed findModule() to findModulePath().
aziz
parents: 368
diff changeset
242 importPaths ~= GlobalSettings.importPaths;
367
dda55fae37de - ImportGraph.execute() can parse all modules depending on the imports of the root module.
aziz
parents: 366
diff changeset
243
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
244 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
245
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
246 gbuilder.importPaths = importPaths;
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
247 gbuilder.options = options;
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
248 gbuilder.filterPredicate = (string moduleFQNPath) {
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
249 foreach (rx; regexps)
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
250 // 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
251 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
252 return true;
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
253 return false;
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
254 };
364
1059295c2727 - Every command module has an execute method now.
aziz
parents:
diff changeset
255
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
256 auto graph = gbuilder.start(filePath.name());
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
257
427
e2bbc6406a14 Added a new option '-m' to the igraph command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 391
diff changeset
258 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
259 {
e2bbc6406a14 Added a new option '-m' to the igraph command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 391
diff changeset
260 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
261 graph.detectCycles();
427
e2bbc6406a14 Added a new option '-m' to the igraph command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 391
diff changeset
262
e2bbc6406a14 Added a new option '-m' to the igraph command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 391
diff changeset
263 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
264 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
265 else
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
266 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
267 }
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
268 else
703
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
269 printDotDocument(graph, siStyle, piStyle, options);
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
270 }
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
271
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
272 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
273 {
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
274 if (level == 0)
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
275 return;
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
276 foreach (vertex; vertices)
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
277 {
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
278 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
279 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
280 printModulePaths(vertex.outgoing, level-1, indent~" ");
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
281 }
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
282 }
370
ae4afb66768f - Renamed findModule() to findModulePath().
aziz
parents: 368
diff changeset
283
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
284 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
285 {
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
286 if (level == 0)
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
287 return;
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
288 foreach (vertex; vertices)
370
ae4afb66768f - Renamed findModule() to findModulePath().
aziz
parents: 368
diff changeset
289 {
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
290 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
291 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
292 printModuleList(vertex.outgoing, level-1, indent~" ");
370
ae4afb66768f - Renamed findModule() to findModulePath().
aziz
parents: 368
diff changeset
293 }
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
294 }
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
295
703
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
296 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
297 IGraphOption options)
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
298 {
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
299 Vertex[][string] verticesByPckgName;
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
300 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
301 foreach (vertex; graph.vertices)
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
302 verticesByPckgName[vertex.modul.packageName] ~= vertex;
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 if (options & (IGraphOption.HighlightCyclicVertices |
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
305 IGraphOption.HighlightCyclicEdges))
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
306 graph.detectCycles();
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
307
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
308 // 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
309 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
310 // Output nodes.
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
311 // '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
312 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
313 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
314
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
315 // Output edges.
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
316 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
317 {
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
318 string edgeStyles = "";
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
319 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
320 {
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
321 edgeStyles = `[style="`;
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
322 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
323 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
324 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
325 edgeStyles ~= `"]`;
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
326 }
bf10602159c1 Added static and public import styles to 'igraph' command.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 702
diff changeset
327 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
328 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
329 }
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
330
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
331 if (options & IGraphOption.GroupByFullPackageName)
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
332 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
333 { // 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
334 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
335 foreach (vertex; vertices)
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
336 Stdout.format(`n{};`, vertex.id);
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 375
diff changeset
337 Stdout("\n }\n");
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
338 }
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
339
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 375
diff changeset
340 Stdout("}\n");
364
1059295c2727 - Every command module has an execute method now.
aziz
parents:
diff changeset
341 }
370
ae4afb66768f - Renamed findModule() to findModulePath().
aziz
parents: 368
diff changeset
342
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
343 // 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
344 void analyzeGraph(Vertex[] vertices_init, Edge[] edges)
370
ae4afb66768f - Renamed findModule() to findModulePath().
aziz
parents: 368
diff changeset
345 {
720
74cdbb25c7c8 Using old algo for cycle detection again.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 719
diff changeset
346 edges = edges.dup;
431
7a6bfa569a52 Fix: analyzeGraph() should work correctly now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 427
diff changeset
347 void recursive(Vertex[] vertices)
370
ae4afb66768f - Renamed findModule() to findModulePath().
aziz
parents: 368
diff changeset
348 {
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
349 foreach (idx, vertex; vertices)
370
ae4afb66768f - Renamed findModule() to findModulePath().
aziz
parents: 368
diff changeset
350 {
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
351 uint outgoing, incoming;
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
352 foreach (j, edge; edges)
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
353 {
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
354 if (edge.from is vertex)
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
355 outgoing++;
698
1564e41f454e Revised modules cmd.ImportGraph and dil.semantic.Module.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 596
diff changeset
356 if (edge.to is vertex)
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
357 incoming++;
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
358 }
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
359
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
360 if (outgoing == 0)
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
361 {
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
362 if (incoming != 0)
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
363 {
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
364 // Vertex is a sink.
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
365 alias outgoing i; // Reuse
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
366 alias incoming j; // Reuse
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
367 // Remove edges.
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
368 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
369 if (edges[i].to !is vertex)
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
370 edges[j++] = edges[i];
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
371 edges.length = j;
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
372 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
373 recursive(vertices);
7a6bfa569a52 Fix: analyzeGraph() should work correctly now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 427
diff changeset
374 return;
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
375 }
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
376 else
431
7a6bfa569a52 Fix: analyzeGraph() should work correctly now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 427
diff changeset
377 {
7a6bfa569a52 Fix: analyzeGraph() should work correctly now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 427
diff changeset
378 // 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
379 // Only remove vertex now.
7a6bfa569a52 Fix: analyzeGraph() should work correctly now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 427
diff changeset
380 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
381 recursive(vertices);
7a6bfa569a52 Fix: analyzeGraph() should work correctly now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 427
diff changeset
382 return;
7a6bfa569a52 Fix: analyzeGraph() should work correctly now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 427
diff changeset
383 }
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
384 }
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
385 else if (incoming == 0)
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
386 {
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
387 // Vertex is a source
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
388 alias outgoing i; // Reuse
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
389 alias incoming j; // Reuse
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
390 // Remove edges.
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
391 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
392 if (edges[i].from !is vertex)
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
393 edges[j++] = edges[i];
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
394 edges.length = j;
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
395 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
396 recursive(vertices);
7a6bfa569a52 Fix: analyzeGraph() should work correctly now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 427
diff changeset
397 return;
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
398 }
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
399 // else
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
400 // {
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
401 // // source && sink
431
7a6bfa569a52 Fix: analyzeGraph() should work correctly now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 427
diff changeset
402 // // continue loop.
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
403 // }
370
ae4afb66768f - Renamed findModule() to findModulePath().
aziz
parents: 368
diff changeset
404 }
ae4afb66768f - Renamed findModule() to findModulePath().
aziz
parents: 368
diff changeset
405
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
406 // 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
407 foreach (vertex; vertices)
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
408 vertex.isCyclic = true;
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
409 foreach (edge; edges)
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
410 if (edge)
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 370
diff changeset
411 edge.isCyclic = true;
370
ae4afb66768f - Renamed findModule() to findModulePath().
aziz
parents: 368
diff changeset
412 }
431
7a6bfa569a52 Fix: analyzeGraph() should work correctly now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 427
diff changeset
413 recursive(vertices_init);
370
ae4afb66768f - Renamed findModule() to findModulePath().
aziz
parents: 368
diff changeset
414 }