Changeset 785

Timestamp:

12/06/10 07:52:42 (14 years ago)

Author:

walter

Message:

bugzilla 4217 Function overloads are not distinguished when instantiating templates

Files:

• trunk/src/declaration.h (modified) (1 diff)
• trunk/src/func.c (modified) (1 diff)

trunk/src/declaration.h

@@ -565 +565 @@
-    enum BUILTIN builtin;               // set if this is a known, builtin
-                                        // function we can evaluate at compile
-                                        // time
-
-    int tookAddressOf;                  // set if someone took the address of
-                                        // this function
-    Dsymbols closureVars;               // local variables in this function
-                                        // which are referenced by nested
-                                        // functions
-#else
-    int nestedFrameRef;                 // !=0 if nested variables referenced
-#endif
-
-    FuncDeclaration(Loc loc, Loc endloc, Identifier *id, StorageClass storage_class, Type *type);
-    Dsymbol *syntaxCopy(Dsymbol *);
-    void semantic(Scope *sc);
-    void semantic2(Scope *sc);
-    void semantic3(Scope *sc);
-    // called from semantic3
-    void varArgs(Scope *sc, TypeFunction*, VarDeclaration *&, VarDeclaration *&);
+    int equals(Object *o);
-
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-    void bodyToCBuffer(OutBuffer *buf, HdrGenState *hgs);
-    int overrides(FuncDeclaration *fd);
-    int findVtblIndex(Array *vtbl, int dim);
-    int overloadInsert(Dsymbol *s);
-    FuncDeclaration *overloadExactMatch(Type *t);
-    FuncDeclaration *overloadResolve(Loc loc, Expression *ethis, Expressions *arguments, int flags = 0);
-    MATCH leastAsSpecialized(FuncDeclaration *g);
-    LabelDsymbol *searchLabel(Identifier *ident);
-    AggregateDeclaration *isThis();
-    AggregateDeclaration *isMember2();
-    int getLevel(Loc loc, FuncDeclaration *fd); // lexical nesting level difference
-    void appendExp(Expression *e);
-    void appendState(Statement *s);
-    char *mangle();
-    const char *toPrettyChars();
-    int isMain();
-    int isWinMain();
-    int isDllMain();

trunk/src/func.c

@@ -1598 +1598 @@
-
-        sc2->callSuper = 0;
-        sc2->pop();
-    }
-
-    if (global.gag && global.errors != nerrors)
-        semanticRun = PASSsemanticdone; // Ensure errors get reported again
-    else
-        semanticRun = PASSsemantic3done;
-}
-
-void FuncDeclaration::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
-    //printf("FuncDeclaration::toCBuffer() '%s'\n", toChars());
-
-    StorageClassDeclaration::stcToCBuffer(buf, storage_class);
-    type->toCBuffer(buf, ident, hgs);
-    bodyToCBuffer(buf, hgs);
-}
-
+int FuncDeclaration::equals(Object *o)
+{
+    if (this == o)
+        return TRUE;
+
+    Dsymbol *s = isDsymbol(o);
+    if (s)
+    {
+        FuncDeclaration *fd = s->isFuncDeclaration();
+        if (fd)
+        {
+            return toParent()->equals(fd->toParent()) &&
+                ident->equals(fd->ident) && type->equals(fd->type);
+        }
+    }
+    return FALSE;
+}
-
-void FuncDeclaration::bodyToCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
-    if (fbody &&
-        (!hgs->hdrgen || hgs->tpltMember || canInline(1,1))
-       )
-    {   buf->writenl();
-
-        // in{}
-        if (frequire)
-        {   buf->writestring("in");
-            buf->writenl();
-            frequire->toCBuffer(buf, hgs);
-        }
-
-        // out{}
-        if (fensure)
-        {   buf->writestring("out");
-            if (outId)
-            {   buf->writebyte('(');