Remove empty expression statements from the output.

diff --git a/Parser.hpp b/Parser.hpp
index 033c12cc227a5c0c17fa1bb81568d59fa1f50bab..27431662558439a707ad06d9de07d152fc38542a 100644 (file)
--- a/Parser.hpp
+++ b/Parser.hpp
@@ -384,7 +384,8 @@ struct CYContext {
         Type_ **last(&values);
         CYForEach (next, values) {
             Replace(*last = next);
-            last = &(*last)->next_;
+            if (*last != NULL)
+                last = &(*last)->next_;
         }
     }
 

diff --git a/Replace.cpp b/Replace.cpp
index 00f6419621d4abad1a2e16bb99cde8b77d692a49..f51d2234e2232f35b83cc79918715fc4ab82b823 100644 (file)
--- a/Replace.cpp
+++ b/Replace.cpp
@@ -240,7 +240,7 @@ CYStatement *CYEmpty::Collapse(CYContext &context) {
 }
 
 CYStatement *CYEmpty::Replace(CYContext &context) {
-    return this;
+    return NULL;
 }
 
 CYStatement *CYExpress::Collapse(CYContext &context) {