merge D2 pull 382

dlang · Sep 16, 2011 · 012bbe3 · 012bbe3
1 parent fe308a1
commit 012bbe3
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 9 deletions.
diff --git a/src/backend/cgen.c b/src/backend/cgen.c
@@ -470,7 +470,7 @@ code *genlinnum(code *c,Srcpos srcpos)
     cs.Irex = 0;
     cs.IFL1 = 0;
     cs.IFL2 = 0;
-    cs.IEV2.Vsrcpos = srcpos;
+    cs.IEV1.Vsrcpos = srcpos;
     return gen(c,&cs);
 }
 
@@ -505,7 +505,7 @@ code *genadjesp(code *c, int offset)
         cs.Iop = ESCAPE | ESCadjesp;
         cs.Iflags = 0;
         cs.Irex = 0;
-        cs.IEV2.Vint = offset;
+        cs.IEV1.Vint = offset;
         return gen(c,&cs);
     }
     else
@@ -525,7 +525,7 @@ code *genadjfpu(code *c, int offset)
         cs.Iop = ESCAPE | ESCadjfpu;
         cs.Iflags = 0;
         cs.Irex = 0;
-        cs.IEV2.Vint = offset;
+        cs.IEV1.Vint = offset;
         return gen(c,&cs);
     }
     else

diff --git a/src/backend/cgsched.c b/src/backend/cgsched.c
@@ -1350,7 +1350,7 @@ STATIC void getinfo(Cinfo *ci,code *c)
 
         case ESCAPE:
             if (c->Iop == (ESCAPE | ESCadjfpu))
-                ci->fpuadjust = c->IEV2.Vint;
+                ci->fpuadjust = c->IEV1.Vint;
             break;
 
         case 0xD0:

diff --git a/src/backend/cod3.c b/src/backend/cod3.c
@@ -2766,7 +2766,7 @@ void assignaddrc(code *c)
             if (c->Iop == (ESCAPE | ESCadjesp))
             {
                 //printf("adjusting EBPtoESP (%d) by %ld\n",EBPtoESP,c->IEV2.Vint);
-                EBPtoESP += c->IEV2.Vint;
+                EBPtoESP += c->IEV1.Vint;
                 c->Iop = NOP;
             }
             if (c->Iop == (ESCAPE | ESCframeptr))
@@ -4089,7 +4089,7 @@ unsigned codout(code *c)
                 switch (op & 0xFFFF00)
                 {   case ESClinnum:
                         /* put out line number stuff    */
-                        objlinnum(c->IEV2.Vsrcpos,OFFSET());
+                        objlinnum(c->IEV1.Vsrcpos,OFFSET());
                         break;
 #if SCPP
 #if 1
@@ -4994,7 +4994,7 @@ void code_hydrate(code **pc)
                 break;
 
             case ESCAPE | ESClinnum:
-                srcpos_hydrate(&c->IEV2.Vsrcpos);
+                srcpos_hydrate(&c->IEV1.Vsrcpos);
                 goto done;
 
             case ESCAPE | ESCctor:
@@ -5162,7 +5162,7 @@ void code_dehydrate(code **pc)
                 break;
 
             case ESCAPE | ESClinnum:
-                srcpos_dehydrate(&c->IEV2.Vsrcpos);
+                srcpos_dehydrate(&c->IEV1.Vsrcpos);
                 goto done;
 
             case ESCAPE | ESCctor:
@@ -5348,7 +5348,7 @@ void code::print()
 
   if ((op & 0xFF) == ESCAPE)
   {     if ((op & 0xFF00) == ESClinnum)
-        {   printf(" linnum = %d\n",c->IEV2.Vsrcpos.Slinnum);
+        {   printf(" linnum = %d\n",c->IEV1.Vsrcpos.Slinnum);
             return;
         }
         printf(" ESCAPE %d",c->Iop >> 8);

diff --git a/src/parse.c b/src/parse.c
@@ -523,6 +523,36 @@ void Parser::composeStorageClass(StorageClass stc)
 }
 #endif
 
+/***********************************************
+ * Parse storage class, lexer is on '@'
+ */
+
+#if DMDV2
+StorageClass Parser::parseAttribute()
+{
+    nextToken();
+    StorageClass stc = 0;
+    if (token.value != TOKidentifier)
+    {
+        error("identifier expected after @, not %s", token.toChars());
+    }
+    else if (token.ident == Id::property)
+        stc = STCproperty;
+    else if (token.ident == Id::safe)
+        stc = STCsafe;
+    else if (token.ident == Id::trusted)
+        stc = STCtrusted;
+    else if (token.ident == Id::system)
+        stc = STCsystem;
+    else if (token.ident == Id::disable)
+        stc = STCdisable;
+    else
+        error("valid attribute identifiers are @property, @safe, @trusted, @system, @disable not @%s", token.toChars());
+    return stc;
+}
+#endif
+
+
 /********************************************
  * Parse declarations after an align, protection, or extern decl.
  */

diff --git a/src/template.c b/src/template.c
@@ -3788,7 +3788,12 @@ void TemplateInstance::semantic(Scope *sc)
             // (see bugzilla 4302 and 6602).
             tempdecl->instances.remove(tempdecl_instance_idx);
             if (target_symbol_list)
+            {
+                // Because we added 'this' in the last position above, we
+                // should be able to remove it without messing other indices up.
+                assert(target_symbol_list->tdata()[target_symbol_list_idx] == this);
                 target_symbol_list->remove(target_symbol_list_idx);
+            }
             semanticRun = 0;
             inst = NULL;
         }