Merge pull request #1925 from ibuclaw/moduleinfo_struct

Add check that 'struct ModuleInfo' exists in object.d
dlang · Apr 24, 2013 · 0b5641e · 0b5641e
2 parents 211f09d + bb502a0
commit 0b5641e
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 4 deletions.
diff --git a/src/class.c b/src/class.c
@@ -218,11 +218,13 @@ ClassDeclaration::ClassDeclaration(Loc loc, Identifier *id, BaseClasses *basecla
             classinfo = this;
         }
 
+#if !MODULEINFO_IS_STRUCT
         if (id == Id::ModuleInfo)
         {   if (Module::moduleinfo)
                 Module::moduleinfo->error("%s", msg);
             Module::moduleinfo = this;
         }
+#endif
     }
 
     com = 0;

diff --git a/src/declaration.h b/src/declaration.h
@@ -108,6 +108,8 @@ int overloadApply(FuncDeclaration *fstart,
         int (*fp)(void *, FuncDeclaration *),
         void *param);
 
+void ObjectNotFound(Identifier *id);
+
 enum Semantic
 {
     SemanticStart,      // semantic has not been run

diff --git a/src/module.c b/src/module.c
@@ -27,7 +27,7 @@
 #include "d-dmd-gcc.h"
 #endif
 
-ClassDeclaration *Module::moduleinfo;
+AggregateDeclaration *Module::moduleinfo;
 
 Module *Module::rootModule;
 DsymbolTable *Module::modules;

diff --git a/src/module.h b/src/module.h
@@ -54,7 +54,7 @@ struct Module : Package
     static unsigned dprogress;  // progress resolving the deferred list
     static void init();
 
-    static ClassDeclaration *moduleinfo;
+    static AggregateDeclaration *moduleinfo;
 
 
     const char *arg;    // original argument name

diff --git a/src/mtype.c b/src/mtype.c
@@ -47,8 +47,6 @@
 #include "hdrgen.h"
 
 FuncDeclaration *hasThis(Scope *sc);
-void ObjectNotFound(Identifier *id);
-
 
 #define LOGDOTEXP       0       // log ::dotExp()
 #define LOGDEFAULTINIT  0       // log ::defaultInit()

diff --git a/src/struct.c b/src/struct.c
@@ -427,6 +427,14 @@ StructDeclaration::StructDeclaration(Loc loc, Identifier *id)
 
     // For forward references
     type = new TypeStruct(this);
+
+#if MODULEINFO_IS_STRUCT
+    if (id == Id::ModuleInfo)
+    {   if (Module::moduleinfo)
+            Module::moduleinfo->error("only object.d can define this reserved struct name");
+        Module::moduleinfo = this;
+    }
+#endif
 }
 
 Dsymbol *StructDeclaration::syntaxCopy(Dsymbol *s)

diff --git a/src/toobj.c b/src/toobj.c
@@ -49,6 +49,11 @@ void Module::genmoduleinfo()
 {
     //printf("Module::genmoduleinfo() %s\n", toChars());
 
+    if (! Module::moduleinfo)
+    {
+        ObjectNotFound(Id::ModuleInfo);
+    }
+
     Symbol *msym = toSymbol();
 #if DMDV2
     unsigned sizeof_ModuleInfo = 16 * Target::ptrsize;