Changeset 318

Timestamp:

12/29/09 11:03:50 (15 years ago)

Author:

walter

Message:

bugzilla 2029 Typesafe variadic functions don't work in CTFE

Files:

• branches/dmd-1.x/src/aggregate.h (modified) (1 diff)
• branches/dmd-1.x/src/struct.c (modified) (1 diff)
• trunk/src/aggregate.h (modified) (1 diff)
• trunk/src/struct.c (modified) (1 diff)

branches/dmd-1.x/src/aggregate.h

@@ -114 +114 @@
-    {
-    }
-
-    AnonymousAggregateDeclaration *isAnonymousAggregateDeclaration() { return this; }
-};
-
-struct StructDeclaration : AggregateDeclaration
-{
-    int zeroInit;       // !=0 if initialize with 0 fill
-#if DMDV2
-    int hasIdentityAssign;  // !=0 if has identity opAssign
-    FuncDeclaration *cpctor;    // generated copy-constructor, if any
-
-    FuncDeclarations postblits; // Array of postblit functions
-    FuncDeclaration *postblit;  // aggregate postblit
-#endif
-
-    StructDeclaration(Loc loc, Identifier *id);
-    Dsymbol *syntaxCopy(Dsymbol *s);
-    void semantic(Scope *sc);
+    Dsymbol *search(Loc, Identifier *ident, int flags);
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-    char *mangle();
-    const char *kind();
-#if DMDV1
-    Expression *cloneMembers();
-#endif
-#if DMDV2
-    int needOpAssign();
-    FuncDeclaration *buildOpAssign(Scope *sc);
-    FuncDeclaration *buildPostBlit(Scope *sc);
-    FuncDeclaration *buildCpCtor(Scope *sc);
-#endif
-    void toDocBuffer(OutBuffer *buf);
-
-    PROT getAccess(Dsymbol *smember);   // determine access to smember
-
-    void toObjFile(int multiobj);           // compile to .obj file
-    void toDt(dt_t **pdt);
-    void toDebug();         // to symbolic debug info
-

branches/dmd-1.x/src/struct.c

@@ -433 +433 @@
-        }
-    }
-    }
-
-    /* Look for special member functions.
-     */
-#if DMDV2
-    ctor =   (CtorDeclaration *)search(0, Id::ctor, 0);
-#endif
-    inv =    (InvariantDeclaration *)search(0, Id::classInvariant, 0);
-    aggNew =       (NewDeclaration *)search(0, Id::classNew,       0);
-    aggDelete = (DeleteDeclaration *)search(0, Id::classDelete,    0);
-
-    if (sc->func)
-    {
-    semantic2(sc);
-    semantic3(sc);
-    }
-}
-
+Dsymbol *StructDeclaration::search(Loc loc, Identifier *ident, int flags)
+{
+    //printf("%s.StructDeclaration::search('%s')\n", toChars(), ident->toChars());
+
+    if (scope)
+        semantic(scope);
+
+    if (!members || !symtab)
+    {
+    error("is forward referenced when looking for '%s'", ident->toChars());
+    return NULL;
+    }
+
+    return ScopeDsymbol::search(loc, ident, flags);
+}
+
-void StructDeclaration::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{   int i;
-
-    buf->printf("%s ", kind());
-    if (!isAnonymous())
-    buf->writestring(toChars());
-    if (!members)
-    {
-    buf->writeByte(';');
-    buf->writenl();
-    return;
-    }
-    buf->writenl();
-    buf->writeByte('{');
-    buf->writenl();
-    for (i = 0; i < members->dim; i++)
-    {
-    Dsymbol *s = (Dsymbol *)members->data[i];
-
-    buf->writestring("    ");

trunk/src/aggregate.h

@@ -115 +115 @@
-    }
-
-    AnonymousAggregateDeclaration *isAnonymousAggregateDeclaration() { return this; }
-};
-
-struct StructDeclaration : AggregateDeclaration
-{
-    int zeroInit;       // !=0 if initialize with 0 fill
-#if DMDV2
-    int hasIdentityAssign;  // !=0 if has identity opAssign
-    FuncDeclaration *cpctor;    // generated copy-constructor, if any
-    FuncDeclaration *eq;    // bool opEquals(ref const T), if any
-
-    FuncDeclarations postblits; // Array of postblit functions
-    FuncDeclaration *postblit;  // aggregate postblit
-#endif
-
-    StructDeclaration(Loc loc, Identifier *id);
-    Dsymbol *syntaxCopy(Dsymbol *s);
-    void semantic(Scope *sc);
+    Dsymbol *search(Loc, Identifier *ident, int flags);
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-    char *mangle();
-    const char *kind();
-#if DMDV1
-    Expression *cloneMembers();
-#endif
-#if DMDV2
-    int needOpAssign();
-    int needOpEquals();
-    FuncDeclaration *buildOpAssign(Scope *sc);
-    FuncDeclaration *buildOpEquals(Scope *sc);
-    FuncDeclaration *buildPostBlit(Scope *sc);
-    FuncDeclaration *buildCpCtor(Scope *sc);
-#endif
-    void toDocBuffer(OutBuffer *buf);
-
-    PROT getAccess(Dsymbol *smember);   // determine access to smember
-
-    void toObjFile(int multiobj);           // compile to .obj file
-    void toDt(dt_t **pdt);

trunk/src/struct.c

@@ -537 +537 @@
-        }
-    }
-    }
-
-    /* Look for special member functions.
-     */
-#if DMDV2
-    ctor = search(0, Id::ctor, 0);
-#endif
-    inv =    (InvariantDeclaration *)search(0, Id::classInvariant, 0);
-    aggNew =       (NewDeclaration *)search(0, Id::classNew,       0);
-    aggDelete = (DeleteDeclaration *)search(0, Id::classDelete,    0);
-
-    if (sc->func)
-    {
-    semantic2(sc);
-    semantic3(sc);
-    }
-}
-
+Dsymbol *StructDeclaration::search(Loc loc, Identifier *ident, int flags)
+{
+    //printf("%s.StructDeclaration::search('%s')\n", toChars(), ident->toChars());
+
+    if (scope)
+        semantic(scope);
+
+    if (!members || !symtab)
+    {
+    error("is forward referenced when looking for '%s'", ident->toChars());
+    return NULL;
+    }
+
+    return ScopeDsymbol::search(loc, ident, flags);
+}
+
-void StructDeclaration::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{   int i;
-
-    buf->printf("%s ", kind());
-    if (!isAnonymous())
-    buf->writestring(toChars());
-    if (!members)
-    {
-    buf->writeByte(';');
-    buf->writenl();
-    return;
-    }
-    buf->writenl();
-    buf->writeByte('{');
-    buf->writenl();
-    for (i = 0; i < members->dim; i++)
-    {
-    Dsymbol *s = (Dsymbol *)members->data[i];
-
-    buf->writestring("    ");