Merge pull request #4346 from 9rnsr/fix14050

fix Issue 14050 - `dmd -v` lists imports from failed __traits(compiles) blocks
dlang · Jan 26, 2015 · 8a04bc4 · 8a04bc4
2 parents 3208762 + 451a54b
commit 8a04bc4
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/module.c b/src/module.c
@@ -228,6 +228,9 @@ Module *Module::load(Loc loc, Identifiers *packages, Identifier *ident)
     if (result)
         m->srcfile = new File(result);
 
+    if (!m->read(loc))
+        return NULL;
+
     if (global.params.verbose)
     {
         fprintf(global.stdmsg, "import    ");
@@ -242,9 +245,6 @@ Module *Module::load(Loc loc, Identifiers *packages, Identifier *ident)
         fprintf(global.stdmsg, "%s\t(%s)\n", ident->toChars(), m->srcfile->toChars());
     }
 
-    if (!m->read(loc))
-        return NULL;
-
     m->parse();
 
     Target::loadModule(m);
@@ -277,7 +277,8 @@ bool Module::read(Loc loc)
         }
 
         if (!global.gag)
-        {   /* Print path
+        {
+            /* Print path
              */
             if (global.path)
             {