annotate trunk/src/docgen/misc/parser.d @ 732:231c9a44ba8e

Switch to ImportParser.
author Jari-Matti M?kel? <jmjm@iki.fi>
date Sun, 03 Feb 2008 21:38:40 +0200
parents cb8edb09108a
children 2eee29aaa357
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
441
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
1 /**
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
2 * Author: Aziz Köksal & Jari-Matti Mäkelä
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
3 * License: GPL3
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
4 */
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
5 module docgen.misc.parser;
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
6
717
cb8edb09108a Updated docgen (mostly) to new tango.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 473
diff changeset
7 import dil.parser.Parser;
732
231c9a44ba8e Switch to ImportParser.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 717
diff changeset
8 import dil.parser.ImportParser;
231c9a44ba8e Switch to ImportParser.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 717
diff changeset
9 import dil.File;
441
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
10 import dil.Settings;
717
cb8edb09108a Updated docgen (mostly) to new tango.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 473
diff changeset
11 public import dil.semantic.Module;
441
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
12 import tango.text.Regex : RegExp = Regex;
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
13 import tango.io.FilePath;
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
14 import tango.text.Util;
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
15 debug import tango.io.Stdout;
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
16
462
b7503e02fbe7 Docgen code for handling public imports.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 454
diff changeset
17 alias void delegate (char[] fqn, char[] path, Module module_) modDg;
732
231c9a44ba8e Switch to ImportParser.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 717
diff changeset
18 alias void delegate (Module imported, Module importer, bool isPublic, bool isStatic) importDg;
462
b7503e02fbe7 Docgen code for handling public imports.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 454
diff changeset
19
441
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
20 class Parser {
466
db7e27b5c180 Fixed parts of HTML output, some reorganizing.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 462
diff changeset
21 private:
db7e27b5c180 Fixed parts of HTML output, some reorganizing.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 462
diff changeset
22
732
231c9a44ba8e Switch to ImportParser.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 717
diff changeset
23 static char[] findModuleFilePath(char[] moduleFQNPath, char[][] importPaths) {
231c9a44ba8e Switch to ImportParser.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 717
diff changeset
24 auto filePath = new FilePath();
231c9a44ba8e Switch to ImportParser.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 717
diff changeset
25 foreach (importPath; importPaths) {
231c9a44ba8e Switch to ImportParser.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 717
diff changeset
26 filePath.set(importPath);
231c9a44ba8e Switch to ImportParser.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 717
diff changeset
27 filePath.append(moduleFQNPath);
441
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
28
732
231c9a44ba8e Switch to ImportParser.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 717
diff changeset
29 foreach (moduleSuffix; [".d", ".di"/*interface file*/])
231c9a44ba8e Switch to ImportParser.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 717
diff changeset
30 {
231c9a44ba8e Switch to ImportParser.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 717
diff changeset
31 filePath.suffix(moduleSuffix);
231c9a44ba8e Switch to ImportParser.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 717
diff changeset
32 if (filePath.exists())
231c9a44ba8e Switch to ImportParser.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 717
diff changeset
33 return filePath.toString();
441
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
34 }
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
35 }
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
36
732
231c9a44ba8e Switch to ImportParser.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 717
diff changeset
37 debug Stdout(" * ")(moduleFQNPath)(" does not exist in imports\n")();
441
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
38 return null;
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
39 }
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
40
466
db7e27b5c180 Fixed parts of HTML output, some reorganizing.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 462
diff changeset
41 public:
db7e27b5c180 Fixed parts of HTML output, some reorganizing.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 462
diff changeset
42
441
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
43 /**
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
44 * Imports the transitive closure of imports starting from "filePath",
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
45 * limited by recursionDepth.
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
46 *
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
47 * The search can be filtered by providing a list of regexps that match the
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
48 * FQNs of modules to be ignored.
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
49 *
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
50 * Params:
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
51 * filePath = Path of the file to parse
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
52 * importPaths = Directories to look for imports
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
53 * strRegexps = Filter regexps
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
54 * IncludeUnlocatableModules = Call the delegate also for unlocatable files
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
55 * recursionDepth = How many levels of imports to follow (-1 = no limit)
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
56 * mdg = Delegate that gets called for every module found
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
57 * idg = Delegate that gets called for every import found
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
58 * modules = List of parsed modules
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
59 */
466
db7e27b5c180 Fixed parts of HTML output, some reorganizing.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 462
diff changeset
60 static void loadModules(char[] filePath, char[][] importPaths, char[][] strRegexps,
732
231c9a44ba8e Switch to ImportParser.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 717
diff changeset
61 bool IncludeUnlocatableModules, int recursionDepth,
231c9a44ba8e Switch to ImportParser.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 717
diff changeset
62 modDg mdg, importDg idg, out Module[] modules) {
441
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
63
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
64 loadModules([filePath], importPaths, strRegexps, IncludeUnlocatableModules,
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
65 recursionDepth, mdg, idg, modules);
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
66 }
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
67
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
68 /**
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
69 * Imports the transitive closure of imports starting from "filePath",
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
70 * limited by recursionDepth.
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
71 *
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
72 * The search can be filtered by providing a list of regexps that match the
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
73 * FQNs of modules to be ignored.
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
74 *
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
75 * Params:
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
76 * filePaths = Paths of the files to parse
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
77 * importPaths = Directories to look for imports
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
78 * strRegexps = Filter regexps
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
79 * IncludeUnlocatableModules = Call the delegate also for unlocatable files
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
80 * recursionDepth = How many levels of imports to follow (-1 = no limit)
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
81 * mdg = Delegate that gets called for every module found
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
82 * idg = Delegate that gets called for every import found
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
83 * modules = List of parsed modules
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
84 */
466
db7e27b5c180 Fixed parts of HTML output, some reorganizing.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 462
diff changeset
85 static void loadModules(char[][] filePaths, char[][] importPaths, char[][] strRegexps,
732
231c9a44ba8e Switch to ImportParser.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 717
diff changeset
86 bool IncludeUnlocatableModules, int recursionDepth,
231c9a44ba8e Switch to ImportParser.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 717
diff changeset
87 modDg mdg, importDg idg, out Module[] modules) {
231c9a44ba8e Switch to ImportParser.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 717
diff changeset
88
441
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
89 // Initialize regular expressions.
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
90 RegExp[] regexps;
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
91 foreach (strRegexp; strRegexps)
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
92 regexps ~= new RegExp(strRegexp);
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
93
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
94 // Add directory of file and global directories to import paths.
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
95 foreach(filePath; filePaths) {
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
96 auto fileDir = (new FilePath(filePath)).folder();
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
97 if (fileDir.length)
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
98 importPaths ~= fileDir;
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
99 }
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
100
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
101 importPaths ~= GlobalSettings.importPaths;
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
102
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
103 debug foreach(path; importPaths) {
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
104 Stdout("Import path: ")(path).newline;
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
105 }
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
106
453
4e5b35df3060 Parsing bugfixes, cleaned up imports.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 451
diff changeset
107 Module[char[]] loadedModules;
441
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
108
453
4e5b35df3060 Parsing bugfixes, cleaned up imports.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 451
diff changeset
109 Module loadModule(char[] moduleFQNPath, int depth) {
441
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
110 if (depth == 0) return null;
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
111
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
112 debug Stdout("Loading ")(moduleFQNPath).newline;
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
113
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
114 // Return already loaded module.
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
115 auto mod_ = moduleFQNPath in loadedModules;
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
116 if (mod_ !is null) {
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
117 debug Stdout(" Already loaded.")(moduleFQNPath).newline;
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
118 return *mod_;
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
119 }
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
120
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
121 auto FQN = replace(moduleFQNPath.dup, dirSep, '.');
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
122
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
123 // Ignore module names matching regular expressions.
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
124 foreach (rx; regexps)
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
125 if (rx.test(FQN)) return null;
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
126
732
231c9a44ba8e Switch to ImportParser.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 717
diff changeset
127 auto moduleFilePath = findModuleFilePath(moduleFQNPath, importPaths);
441
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
128 //foreach(filePath; filePaths)
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
129 //if (moduleFQNPath == filePath) modulePath = filePath;
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
130
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
131 debug Stdout(" FQN ")(FQN).newline;
732
231c9a44ba8e Switch to ImportParser.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 717
diff changeset
132 debug Stdout(" Module path ")(moduleFilePath).newline;
441
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
133
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
134 Module mod = null;
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
135
732
231c9a44ba8e Switch to ImportParser.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 717
diff changeset
136 if (moduleFilePath is null) {
441
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
137 if (IncludeUnlocatableModules)
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
138 mdg(FQN, moduleFQNPath, null);
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
139 } else {
732
231c9a44ba8e Switch to ImportParser.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 717
diff changeset
140 mod = new Module(moduleFilePath);
231c9a44ba8e Switch to ImportParser.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 717
diff changeset
141
231c9a44ba8e Switch to ImportParser.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 717
diff changeset
142 // Use lightweight ImportParser.
231c9a44ba8e Switch to ImportParser.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 717
diff changeset
143 mod.parser = new ImportParser(loadFile(moduleFilePath), moduleFilePath);
441
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
144 mod.parse();
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
145
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
146 mdg(FQN, moduleFQNPath, mod);
732
231c9a44ba8e Switch to ImportParser.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 717
diff changeset
147 loadedModules[moduleFQNPath] = mod;
441
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
148
732
231c9a44ba8e Switch to ImportParser.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 717
diff changeset
149 foreach (importDecl; mod.imports)
231c9a44ba8e Switch to ImportParser.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 717
diff changeset
150 foreach(moduleFQN_; importDecl.getModuleFQNs(dirSep)) {
462
b7503e02fbe7 Docgen code for handling public imports.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 454
diff changeset
151 auto loaded_mod = loadModule(moduleFQN_, depth == -1 ? depth : depth-1);
441
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
152
462
b7503e02fbe7 Docgen code for handling public imports.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 454
diff changeset
153 if (loaded_mod !is null) {
732
231c9a44ba8e Switch to ImportParser.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 717
diff changeset
154 idg(loaded_mod, mod, importDecl.isPublic(), importDecl.isStatic());
717
cb8edb09108a Updated docgen (mostly) to new tango.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 473
diff changeset
155 } else if (IncludeUnlocatableModules) {/* FIXME
462
b7503e02fbe7 Docgen code for handling public imports.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 454
diff changeset
156 auto tmp = new Module(null, true);
b7503e02fbe7 Docgen code for handling public imports.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 454
diff changeset
157 tmp.moduleFQN = replace(moduleFQN_.dup, dirSep, '.');
717
cb8edb09108a Updated docgen (mostly) to new tango.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 473
diff changeset
158 idg(tmp, mod, importList.isPublic());*/
462
b7503e02fbe7 Docgen code for handling public imports.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 454
diff changeset
159 }
453
4e5b35df3060 Parsing bugfixes, cleaned up imports.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 451
diff changeset
160 }
441
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
161 }
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
162
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
163 return mod;
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
164 } // loadModule
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
165
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
166 foreach(filePath; filePaths)
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
167 loadModule(filePath, recursionDepth);
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
168
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
169 // Finished loading modules.
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
170
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
171 // Ordered list of loaded modules.
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
172 modules = loadedModules.values;
13ecfb4278a4 Initial docgen test stuff.
Jari-Matti M?kel? <jmjm@iki.fi>
parents:
diff changeset
173 }
453
4e5b35df3060 Parsing bugfixes, cleaned up imports.
Jari-Matti M?kel? <jmjm@iki.fi>
parents: 451
diff changeset
174 }