projects/ldc: dmd/init.c comparison

[svn r23] * Updated to DMD 1.021

comparison

equal deleted inserted replaced

-:c05ef76f1c20
+:788401029ecf
 }
 return this;
 }
+/***************************************
+* This works by transforming a struct initializer into
+* a struct literal. In the future, the two should be the
+* same thing.
+*/
 Expression *StructInitializer::toExpression()
-{
+{   Expression *e;
-return NULL;		// cannot do it
+//printf("StructInitializer::toExpression() %s\n", toChars());
+if (!ad)				// if fwd referenced
+{
+	return NULL;
+}
+StructDeclaration *sd = ad->isStructDeclaration();
+if (!sd)
+	return NULL;
+Expressions *elements = new Expressions();
+for (size_t i = 0; i < value.dim; i++)
+{
+	if (field.data[i])
+	    goto Lno;
+	Initializer *iz = (Initializer *)value.data[i];
+	if (!iz)
+	    goto Lno;
+	Expression *ex = iz->toExpression();
+	if (!ex)
+	    goto Lno;
+	elements->push(ex);
+}
+e = new StructLiteralExp(loc, sd, elements);
+e->type = sd->type;
+return e;
+Lno:
+delete elements;
+//error(loc, "struct initializers as expressions are not allowed");
+return NULL;
 }
 void StructInitializer::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
 {

Mercurial > projects > ldc