Changeset 134

Timestamp:

09/06/07 01:38:05 (5 years ago)

Author:

Gregor

Message:

Implemented: aarray[index], better typeinfo generation

Files:

• trunk/tdcsrc/expression.cc (modified) (2 diffs)
• trunk/tdcsrc/module.cc (modified) (1 diff)
• trunk/tdcsrc/objfile.cc (modified) (5 diffs)
• trunk/tdcsrc/tdc_c.h (modified) (1 diff)

trunk/tdcsrc/expression.cc

@@ -534 +534 @@
-                        e2->toElem(irs)->toC() + "])");
-
+    } else if (e1->type->ty == Taarray) {
+        e2->type->vtinfo->toObjFile();
+        return new elem("(*((" + e1->type->pointerTo()->toCtype()->toC("") + ") _aaGet(" +
+                        e1->toElem(irs)->toC() + ", (void *) &" +
+                        e2->type->vtinfo->mangle() + ", sizeof(" +
+                        type->toCtype()->toC("") + "), " +
+                        e2->toElem(irs)->toC() + ")))");
+
-    } else {
-        return new elem("(" + e1->toElem(irs)->toC() + "[" +
@@ -808 +816 @@
-elem *VarExp::toElem(IRState *irs)
-{
+    // make sure it's genreated
+    if (var->parent && var->parent->isModule())
+        var->toObjFile();
+
-    /* if this is in a function scope, we need to figure out what parent level
-     * it is */

trunk/tdcsrc/module.cc

@@ -82 +82 @@
-    tdc_func_def = "";
-    tdc_var_def = "";
+    handled.clear();
-
-    // then output the content

trunk/tdcsrc/objfile.cc

@@ -169 +169 @@
-
-    // this may be extern
-
+
+
+
-        // in which case we're done
-        return;
@@ -255 +257 @@
-{
-    CHECK_HANDLED_VOID((void *) this);
-    if (tinfo->builtinTypeInfo()) return;
-
-    switch (tinfo->ty) {
@@ -269 +270 @@
-                    mangle());
-            tdc_var_decl += "extern " + def + ";\n";
+            if (tinfo->builtinTypeInfo()) return;
-
-            // the actual typeinfo
@@ -290 +292 @@
-                    mangle());
-            tdc_var_decl += "extern " + def + ";\n";
+            if (tinfo->builtinTypeInfo()) return;
-
-            def += string(" = {\n&") +
@@ -300 +303 @@
-            return;
-        }
+
+        default:
+        {
+            if (tinfo->builtinTypeInfo()) {
+                // we just need a reference
+                Type::typeinfo->toObjFile();
+                tdc_var_decl += "extern struct " +
+                    Type::typeinfo->type->toCtype()->toC(mangle()) + ";\n";
+                return;
+            }
+        }
-    }
-

trunk/tdcsrc/tdc_c.h

@@ -194 +194 @@
-
-void _aaDel(void *aa, void *keyti, ...);
+void* _aaGet(void *aa, void *keyti, size_t valuesize, ...);
-void _d_assert(struct Array, uint32_t);
-void _d_assert_msg(struct Array, struct Array, uint32_t);