diff trunk/src/main.d @ 758:f4b9680c0e16

Revised module dil.SettingsLoader.
author Aziz K?ksal <aziz.koeksal@gmail.com>
date Thu, 14 Feb 2008 03:31:19 +0100
parents 804111ec8213
children 9c47f377ca0b
line wrap: on
line diff
--- a/trunk/src/main.d	Wed Feb 13 22:08:58 2008 +0100
+++ b/trunk/src/main.d	Thu Feb 14 03:31:19 2008 +0100
@@ -41,7 +41,10 @@
 
 void main(char[][] args)
 {
-  dil.SettingsLoader.loadSettings();
+  auto infoMan = new InfoManager();
+  SettingsLoader(infoMan).load();
+  if (infoMan.info.length)
+    return printErrors(infoMan);
 
   if (args.length <= 1)
     return Stdout(helpMain()).newline;
@@ -53,7 +56,7 @@
     if (args.length < 2)
       return printHelp("compile");
 
-    auto infoMan = new InfoManager();
+    infoMan = new InfoManager();
     auto filePaths = args[2..$];
     foreach (filePath; filePaths)
     {
@@ -108,7 +111,7 @@
         filePaths ~= arg;
     }
 
-    auto infoMan = new InfoManager();
+    infoMan = new InfoManager();
     // Execute command.
     cmd.DDoc.execute(filePaths, destination, macroPaths, incUndoc, verbose, infoMan);
     if (infoMan.info.length)
@@ -220,7 +223,7 @@
     if (!sourceText)
       sourceText = new SourceText(filePath, true);
 
-    auto infoMan = new InfoManager();
+    infoMan = new InfoManager();
     auto lx = new Lexer(sourceText, infoMan);
     lx.scanAll();
     auto token = lx.firstToken();
@@ -243,7 +246,7 @@
     if (args[2] != "German")
       return Stdout.formatln("Error: unrecognized target language \"{}\"", args[2]);
 
-    auto infoMan = new InfoManager();
+    infoMan = new InfoManager();
     auto filePath = args[3];
     auto mod = new Module(filePath, infoMan);
     // Parse the file.