Changeset 648:8d850fa25713

Timestamp:

10/05/08 05:47:47 (3 months ago)

Author:

Christian Kamm <kamm incasoftware de>

branch:

default

Message:

Fix VarDecls? for tuples. Closes #99.

I've implemented it this way since it doesn't require any changes in the
frontend. However, I think having TypeTuple? expressed as LLVM struct types
would make much more sense and open the door to tuple lvalues.

Files:

• gen/llvmhelpers.cpp (modified) (2 diffs)
• gen/tollvm.cpp (modified) (2 diffs)
• gen/tollvm.h (modified) (1 diff)
• tests/mini/tupleval.d (added)

gen/llvmhelpers.cpp

@@ -1129 +1129 @@
-    {
-        Logger::println("VarDeclaration");
+
+        // if aliassym is set, this VarDecl is redone as an alias to another symbol
+        // this seems to be done to rewrite Tuple!(...) v;
+        // as a TupleDecl that contains a bunch of individual VarDecls
+        if (vd->aliassym)
+            return DtoDeclarationExp(vd->aliassym);
-
-        // static
@@ -1250 +1256 @@
-        }
-    }
+    // tuple declaration
+    else if (TupleDeclaration* tupled = declaration->isTupleDeclaration())
+    {
+        Logger::println("TupleDeclaration");
+        if(!tupled->isexp) {
+            error(declaration->loc, "don't know how to handle non-expression tuple decls yet");
+            assert(0);
+        }
+
+        assert(tupled->objects);
+        for (int i=0; i < tupled->objects->dim; ++i)
+        {
+            DsymbolExp* exp = (DsymbolExp*)tupled->objects->data[i];
+            DtoDeclarationExp(exp->s);
+        }
+    }
-    // unsupported declaration
-    else

gen/tollvm.cpp

@@ -170 +170 @@
-    }
-
+/*
+    Not needed atm as VarDecls for tuples are rewritten as a string of 
+    VarDecls for the fields (u -> _u_field_0, ...)
+
+    case Ttuple:
+    {
+        TypeTuple* ttupl = (TypeTuple*)t;
+        return DtoStructTypeFromArguments(ttupl->arguments);
+    }
+*/
-    // opaque type
-    case Topaque:
@@ -180 +190 @@
-    return 0;
-}
+
+//////////////////////////////////////////////////////////////////////////////////////////
+
+/*
+const LLType* DtoStructTypeFromArguments(Arguments* arguments)
+{
+    if (!arguments)
+        return LLType::VoidTy;
+
+    std::vector<const LLType*> types;
+    for (size_t i = 0; i < arguments->dim; i++)
+    {
+        Argument *arg = (Argument *)arguments->data[i];
+        assert(arg && arg->type);
+
+        types.push_back(DtoType(arg->type));
+    }
+    return LLStructType::get(types);
+}
+*/
-
-//////////////////////////////////////////////////////////////////////////////////////////

gen/tollvm.h

@@ -23 +23 @@
-
-unsigned DtoShouldExtend(Type* type);
+
+// tuple helper
+// takes a arguments list and makes a struct type out of them
+//const LLType* DtoStructTypeFromArguments(Arguments* arguments);
-
-// delegate helpers