comparison trunk/src/main.d @ 759:9c47f377ca0b

Revised module cmd.Generate. Added class TagMapLoader. Fixed StringExpression.getString() and related code in the Parser. Added options 'xml_map' and 'html_map' to config.d
author Aziz K?ksal <aziz.koeksal@gmail.com>
date Fri, 15 Feb 2008 02:07:53 +0100
parents f4b9680c0e16
children 4579e8505d5e
comparison
equal deleted inserted replaced
758:f4b9680c0e16 759:9c47f377ca0b
41 41
42 void main(char[][] args) 42 void main(char[][] args)
43 { 43 {
44 auto infoMan = new InfoManager(); 44 auto infoMan = new InfoManager();
45 SettingsLoader(infoMan).load(); 45 SettingsLoader(infoMan).load();
46 if (infoMan.info.length) 46 if (infoMan.hasInfo)
47 return printErrors(infoMan); 47 return printErrors(infoMan);
48 48
49 if (args.length <= 1) 49 if (args.length <= 1)
50 return Stdout(helpMain()).newline; 50 return Stdout(helpMain()).newline;
51 51
112 } 112 }
113 113
114 infoMan = new InfoManager(); 114 infoMan = new InfoManager();
115 // Execute command. 115 // Execute command.
116 cmd.DDoc.execute(filePaths, destination, macroPaths, incUndoc, verbose, infoMan); 116 cmd.DDoc.execute(filePaths, destination, macroPaths, incUndoc, verbose, infoMan);
117 if (infoMan.info.length) 117 if (infoMan.hasInfo)
118 return printErrors(infoMan); 118 printErrors(infoMan);
119 break; 119 break;
120 case "gen", "generate": 120 case "gen", "generate":
121 char[] fileName; 121 char[] fileName;
122 DocOption options = DocOption.Tokens; 122 DocOption options = DocOption.Tokens;
123 foreach (arg; args[2..$]) 123 foreach (arg; args[2..$])
134 fileName = arg; 134 fileName = arg;
135 } 135 }
136 } 136 }
137 if (!(options & (DocOption.XML | DocOption.HTML))) 137 if (!(options & (DocOption.XML | DocOption.HTML)))
138 options |= DocOption.XML; // Default to XML. 138 options |= DocOption.XML; // Default to XML.
139 cmd.Generate.execute(fileName, options); 139 cmd.Generate.execute(fileName, options, infoMan);
140 if (infoMan.hasInfo)
141 printErrors(infoMan);
140 break; 142 break;
141 case "importgraph", "igraph": 143 case "importgraph", "igraph":
142 string filePath; 144 string filePath;
143 string[] includePaths; 145 string[] includePaths;
144 string[] regexps; 146 string[] regexps;