Changeset 409

Timestamp:

03/06/10 01:31:05 (2 years ago)

Author:

walter

Message:

bugzilla 3378 [tdpl] ++x should be an lvalue

Files:

• trunk/src/expression.c (modified) (1 diff)
• trunk/src/expression.h (modified) (1 diff)
• trunk/src/linux.mak (modified) (3 diffs)
• trunk/src/osx.mak (modified) (3 diffs)

trunk/src/expression.c

@@ -5542 +5542 @@
-}
-
+#if DMDV2
+int BinAssignExp::isLvalue()
+{
+    return 1;
+}
+
+Expression *BinAssignExp::toLvalue(Scope *sc, Expression *ex)
+{   Expression *e;
+
+    if (e1->op == TOKvar)
+    {
+    /* Convert (e1 op= e2) to
+     *    e1 op= e2;
+     *    e1
+     */
+    e = e1->copy();
+    e = new CommaExp(loc, this, e);
+    e = e->semantic(sc);
+    }
+    else
+    {
+    /* Convert (e1 op= e2) to
+     *    ref v = e1;
+     *    v op= e2;
+     *    v
+     */
+
+    // ref v = e1;
+    Identifier *id = Lexer::uniqueId("__assignop");
+    ExpInitializer *ei = new ExpInitializer(loc, e1);
+    VarDeclaration *v = new VarDeclaration(loc, e1->type, id, ei);
+    v->storage_class |= STCref | STCforeach;
+    Expression *de = new DeclarationExp(loc, v);
+
+    // v op= e2
+    e1 = new VarExp(e1->loc, v);
+
+    e = new CommaExp(loc, de, this);
+    e = new CommaExp(loc, e, new VarExp(loc, v));
+    e = e->semantic(sc);
+    }
+    return e;
+}
+
+Expression *BinAssignExp::modifiableLvalue(Scope *sc, Expression *e)
+{
+    return toLvalue(sc, this);
+}
+
+#endif
+
-/************************************************************/
-

trunk/src/expression.h

@@ -792 +792 @@
-
-    Expression *op_overload(Scope *sc);
+
+    int isLvalue();
+    Expression *toLvalue(Scope *sc, Expression *ex);
+    Expression *modifiableLvalue(Scope *sc, Expression *e);
-};
-

trunk/src/linux.mak

@@ -38 +38 @@
-    hdrgen.o delegatize.o aa.o ti_achar.o toir.o interpret.o traits.o \
-    builtin.o clone.o aliasthis.o \
-
+speller.o 
-    libelf.o elfobj.o
-
@@ -81 +81 @@
-    $(ROOT)/gnuc.h $(ROOT)/gnuc.c $(ROOT)/man.c \
-    $(ROOT)/stringtable.h $(ROOT)/stringtable.c \
-
+
+
-
-
@@ -433 +434 @@
-scope.o: scope.c
-    $(CC) -c $(CFLAGS) $<
+
+speller.o: $(ROOT)/speller.c
+    $(CC) -c $(GFLAGS) -I$(ROOT) $<
-
-statement.o: statement.c

trunk/src/osx.mak

@@ -46 +46 @@
-    hdrgen.o delegatize.o aa.o ti_achar.o toir.o interpret.o traits.o \
-    builtin.o clone.o aliasthis.o \
-
+speller.o 
-    libmach.o machobj.o
-
@@ -89 +89 @@
-    $(ROOT)/gnuc.h $(ROOT)/gnuc.c $(ROOT)/man.c \
-    $(ROOT)/stringtable.h $(ROOT)/stringtable.c \
-
+
+
-
-
@@ -441 +442 @@
-scope.o: scope.c
-    $(CC) -c $(CFLAGS) $<
+
+speller.o: $(ROOT)/speller.c
+    $(CC) -c $(GFLAGS) -I$(ROOT) $<
-
-statement.o: statement.c