Changes in src/SynTree/Expression.cc [5ccb10d:07516b56]

File:

• src/SynTree/Expression.cc (modified) (2 diffs)

src/SynTree/Expression.cc

@@ -14 +14 @@
 //
 
-#include <iostream>
-#include <cassert>
-#include <list>
-#include <algorithm>
-
-#include <iterator>
-
-#include "Declaration.h"
-#include "Expression.h"
-#include "Initializer.h"
-#include "Statement.h"
-#include "Type.h"
-#include "TypeSubstitution.h"
-#include "VarExprReplacer.h"
-
-#include "Common/utility.h"
-#include "Common/PassVisitor.h"
-
-#include "InitTweak/InitTweak.h"
+#include "SynTree/Expression.h"
+
+#include <cassert>                   // for assert, assertf
+#include <iostream>                  // for ostream, operator<<, basic_ostream
+#include <list>                      // for list, _List_iterator, list<>::co...
+
+#include "Common/utility.h"          // for maybeClone, cloneAll, deleteAll
+#include "Declaration.h"             // for ObjectDecl, DeclarationWithType
+#include "Expression.h"              // for Expression, ImplicitCopyCtorExpr
+#include "InitTweak/InitTweak.h"     // for getCallArg, getPointerBase
+#include "Initializer.h"             // for Designation, Initializer
+#include "Statement.h"               // for CompoundStmt, ExprStmt, Statement
+#include "SynTree/BaseSyntaxNode.h"  // for BaseSyntaxNode
+#include "SynTree/Constant.h"        // for Constant
+#include "Type.h"                    // for Type, BasicType, Type::Qualifiers
+#include "TypeSubstitution.h"        // for TypeSubstitution
 
 #include "GenPoly/Lvalue.h"
@@ -648 +645 @@
                 }
         }
+        // ensure that StmtExpr has a result type
+        if ( ! result ) {
+                set_result( new VoidType( Type::Qualifiers() ) );
+        }
 }
 StmtExpr::StmtExpr( const StmtExpr &other ) : Expression( other ), statements( other.statements->clone() ) {