Changeset 1628:6c36e3f49b28

Timestamp:

01/06/10 13:18:23 (2 years ago)

Author:

Leandro Lucarella <llucax@gmail.com>

branch:

default

Message:

Merge DMD r324: bugzilla 3663 and 3664 - fwd ref regressions
---

dmd/class.c | 2 +-
dmd/enum.c | 4 +++-
dmd/enum.h | 2 ++
dmd/mars.c | 2 +-
dmd/struct.c | 5 ++++-
5 files changed, 11 insertions(+), 4 deletions(-)

Files:

• dmd/class.c (modified) (1 diff)
• dmd/enum.c (modified) (2 diffs)
• dmd/enum.h (modified) (1 diff)
• dmd/mars.c (modified) (1 diff)
• dmd/struct.c (modified) (1 diff)

dmd/class.c

@@ -251 +251 @@
-    }
-    if (symtab)
-
+sizeok == 1 || 
-    {   //printf("\tsemantic for '%s' is already completed\n", toChars());
-        return;     // semantic() already completed

dmd/enum.c

@@ -62 +62 @@
-
-    if (symtab)         // if already done
-
+isdone || 
-        return;     // semantic() already completed
-    }
@@ -96 +96 @@
-    memtype = Type::tint32;
-    }
+
+    isdone = 1;
-
-    t = isAnonymous() ? memtype : type;

dmd/enum.h

@@ -43 +43 @@
-#endif
-    int isdeprecated;
+    int isdone;         // 0: not done
+                // 1: semantic() successfully completed
-
-    EnumDeclaration(Loc loc, Identifier *id, Type *memtype);

dmd/mars.c

@@ -59 +59 @@
-    copyright = "Copyright (c) 1999-2009 by Digital Mars and Tomas Lindquist Olsen";
-    written = "written by Walter Bright and Tomas Lindquist Olsen";
-4
+5
-    ldc_version = LDC_REV;
-    llvm_version = LLVM_REV_STR;

dmd/struct.c

@@ -254 +254 @@
-
-    if (symtab)
-
+
+
+
-            return;             // semantic() already completed
+    }
-    }
-    else