allow null in last operand of conditional operator in stage 0

and use it stage 1
NotFound · Sep 5, 2011 · 5d83cd2 · 5d83cd2
1 parent d6436ff
commit 5d83cd2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/winxedst0.cpp b/winxedst0.cpp
@@ -1,5 +1,5 @@
 // winxedst0.cpp
-// Revision 23-aug-2011
+// Revision 5-sep-2011
 
 // Winxed compiler stage 0.
 
@@ -5087,7 +5087,10 @@ class OpConditionalExpr : public Expr
         exprtrue->emit(e, result);
         e << INDENT "goto " << label_end << '\n';
         e << INDENTLABEL << label_false << ":\n";
-        exprfalse->emit(e, result);
+        if (exprfalse->isnull())
+            e << op_null(result) << '\n';
+        else
+            exprfalse->emit(e, result);
         e << INDENTLABEL << label_end << ":\n";
     }
     Condition *condition;

diff --git a/winxedst1.winxed b/winxedst1.winxed
@@ -9787,9 +9787,7 @@ class NamespacePath
     function samehllas(fromns)
     {
         var hll = self.hll;
-        var fromhll;
-        if (fromns != null)
-            fromhll = fromns.hll;
+        var fromhll = fromns != null ? fromns.hll : null;
         if (hll == null)
             return fromhll == null;
         else