Made use of type-checked array accessors mandatory, adapted code at c…

…ompiler errors.
michelf · Jul 5, 2011 · 9859b1b · 9859b1b
1 parent 8b3bb0d
commit 9859b1b
Show file tree

Hide file tree

Showing 64 changed files with 1,061 additions and 1,058 deletions.
diff --git a/src/access.c b/src/access.c
@@ -85,7 +85,7 @@ enum PROT ClassDeclaration::getAccess(Dsymbol *smember)
         }
 
         for (i = 0; i < baseclasses->dim; i++)
-        {   BaseClass *b = (BaseClass *)baseclasses->data[i];
+        {   BaseClass *b = baseclasses->tdata()[i];
 
             access = b->base->getAccess(smember);
             switch (access)
@@ -154,7 +154,7 @@ static int accessCheckX(
             if (cdthis)
             {
                 for (int i = 0; i < cdthis->baseclasses->dim; i++)
-                {   BaseClass *b = (BaseClass *)cdthis->baseclasses->data[i];
+                {   BaseClass *b = cdthis->baseclasses->tdata()[i];
                     enum PROT access;
 
                     access = b->base->getAccess(smember);
@@ -175,7 +175,7 @@ static int accessCheckX(
             if (cdthis)
             {
                 for (int i = 0; i < cdthis->baseclasses->dim; i++)
-                {   BaseClass *b = (BaseClass *)cdthis->baseclasses->data[i];
+                {   BaseClass *b = cdthis->baseclasses->tdata()[i];
 
                     if (accessCheckX(smember, sfunc, b->base, cdscope))
                         return 1;

diff --git a/src/aggregate.h b/src/aggregate.h
@@ -210,8 +210,8 @@ struct ClassDeclaration : AggregateDeclaration
 #endif
     FuncDeclaration *staticCtor;
     FuncDeclaration *staticDtor;
-    FuncDeclarations vtbl;              // Array of FuncDeclaration's making up the vtbl[]
-    FuncDeclarations vtblFinal;         // More FuncDeclaration's that aren't in vtbl[]
+    Dsymbols vtbl;                      // Array of FuncDeclaration's making up the vtbl[]
+    Dsymbols vtblFinal;                 // More FuncDeclaration's that aren't in vtbl[]
 
     BaseClasses *baseclasses;           // Array of BaseClass's; first is super,
                                         // rest are Interface's

diff --git a/src/arrayop.c b/src/arrayop.c
@@ -319,7 +319,7 @@ Expression *BinExp::arrayOp(Scope *sc)
 
             Parameters *fparams = new Parameters();
             Expression *loopbody = buildArrayLoop(fparams);
-            Parameter *p = (Parameter *)fparams->data[0 /*fparams->dim - 1*/];
+            Parameter *p = fparams->tdata()[0 /*fparams->dim - 1*/];
 #if DMDV1
             // for (size_t i = 0; i < p.length; i++)
             Initializer *init = new ExpInitializer(0, new IntegerExp(0, 0, Type::tsize_t));
@@ -522,7 +522,7 @@ Expression *AssignExp::buildArrayLoop(Parameters *fparams)
     ex2 = new CastExp(0, ex2, e1->type->nextOf());
 #endif
     Expression *ex1 = e1->buildArrayLoop(fparams);
-    Parameter *param = (Parameter *)fparams->data[0];
+    Parameter *param = fparams->tdata()[0];
     param->storageClass = 0;
     Expression *e = new AssignExp(0, ex1, ex2);
     return e;
@@ -535,7 +535,7 @@ Expression *Str##AssignExp::buildArrayLoop(Parameters *fparams) \
      */                                                         \
     Expression *ex2 = e2->buildArrayLoop(fparams);              \
     Expression *ex1 = e1->buildArrayLoop(fparams);              \
-    Parameter *param = (Parameter *)fparams->data[0];           \
+    Parameter *param = fparams->tdata()[0];           \
     param->storageClass = 0;                                    \
     Expression *e = new Str##AssignExp(0, ex1, ex2);            \
     return e;                                                   \

diff --git a/src/arraytypes.h b/src/arraytypes.h
@@ -54,6 +54,7 @@ struct Symbol;
     void insert(unsigned index, TYPE *v) { ArrayBase::insert(index, (void *)v); } \
     void insert(unsigned index, ArrayOf_##TYPE *a) { ArrayBase::insert(index, (ArrayBase *)a); } \
     void append(ArrayOf_##TYPE *a) { ArrayBase::append((ArrayBase *)a); } \
+    void push(TYPE *a) { ArrayBase::push((void *)a); } \
     ArrayOf_##TYPE *copy() { return (ArrayOf_##TYPE *)ArrayBase::copy(); } \
 }