Merge pull request #3327 from 9rnsr/fix_error

More error propagation
dlang · Feb 23, 2014 · 6be4420 · 6be4420
2 parents ae31aa5 + 72cab99
commit 6be4420
Show file tree

Hide file tree

Showing 6 changed files with 213 additions and 115 deletions.
diff --git a/src/cast.c b/src/cast.c
@@ -2850,6 +2850,7 @@ int typeMerge(Scope *sc, Expression *e, Type **pt, Expression **pe1, Expression
 
 /************************************
  * Bring leaves to common type.
+ * Returns ErrorExp if error occurs. otherwise returns NULL.
  */
 
 Expression *typeCombine(BinExp *be, Scope *sc)
@@ -2875,13 +2876,12 @@ Expression *typeCombine(BinExp *be, Scope *sc)
         return be->e1;
     if (be->e2->op == TOKerror)
         return be->e2;
-    return be;
+    return NULL;
 
 Lerror:
-    be->incompatibleTypes();
-    be->type = Type::terror;
-    be->e1 = new ErrorExp();
-    be->e2 = new ErrorExp();
+    Expression *ex = be->incompatibleTypes();
+    if (ex->op == TOKerror)
+        return ex;
     return new ErrorExp();
 }