Changeset 722617d

Timestamp:

Dec 13, 2016, 5:02:24 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

1d2b64f

Parents:

ea83e00a

Message:

resolve StmtExprs?

Location:

src/ResolvExpr

Files:

• AlternativeFinder.cc (modified) (2 diffs)
• AlternativeFinder.h (modified) (1 diff)

src/ResolvExpr/AlternativeFinder.cc

@@ -44 +44 @@
 #include "InitTweak/GenInit.h"
 #include "ResolveTypeof.h"
+#include "Resolver.h"
 
 extern bool resolvep;
@@ -1122 +1123 @@
         }
 
+        void AlternativeFinder::visit( StmtExpr *stmtExpr ) {
+                StmtExpr * newStmtExpr = stmtExpr->clone();
+                ResolvExpr::resolveStmtExpr( newStmtExpr, indexer );
+                // xxx - this env is almost certainly wrong, and needs to somehow contain the combined environments from all of the statements in the stmtExpr...
+                alternatives.push_back( Alternative( newStmtExpr, env, Cost::zero ) );
+        }
+
 } // namespace ResolvExpr
 

src/ResolvExpr/AlternativeFinder.h

@@ -70 +70 @@
                 virtual void visit( TupleAssignExpr *tupleExpr );
                 virtual void visit( UniqueExpr *unqExpr );
+                virtual void visit( StmtExpr *stmtExpr );
                 /// Runs a new alternative finder on each element in [begin, end)
                 /// and writes each alternative finder to out.