diff dmd/scope.c @ 1587:def7a1d494fd

Merge DMD 1.051
author Christian Kamm <kamm incasoftware de>
date Fri, 06 Nov 2009 23:58:01 +0100
parents f99a3b393c03
children 9bf06e02070b
line wrap: on
line diff
--- a/dmd/scope.c	Fri Nov 06 21:51:41 2009 +0100
+++ b/dmd/scope.c	Fri Nov 06 23:58:01 2009 +0100
@@ -71,6 +71,7 @@
     this->nofree = 0;
     this->noctor = 0;
     this->noaccesscheck = 0;
+    this->mustsemantic = 0;
     this->intypeof = 0;
     this->parameterSpecialization = 0;
     this->callSuper = 0;
@@ -119,6 +120,7 @@
     this->nofree = 0;
     this->noctor = enclosing->noctor;
     this->noaccesscheck = enclosing->noaccesscheck;
+    this->mustsemantic = enclosing->mustsemantic;
     this->intypeof = enclosing->intypeof;
     this->parameterSpecialization = enclosing->parameterSpecialization;
     this->callSuper = enclosing->callSuper;
@@ -282,7 +284,7 @@
 	    //printf("\t\tsc->scopesym = %p\n", sc->scopesym);
 	    if (!sc->scopesym->symtab)
 		sc->scopesym->symtab = new DsymbolTable();
-	    return sc->scopesym->symtab->insert(s);
+	    return sc->scopesym->symtabInsert(s);
 	}
     }
     assert(0);