Changeset 141b786 for src/ResolvExpr

Timestamp:

Nov 9, 2016, 2:21:05 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:

b726084

Parents:

23bb1b9

Message:

rework UniqueExpr?, handle UniqueExpr? in FixInit?, fix translation for UniqueExprs?, refactor explode functions and fix AddressExpr? distribution over exploded tuple exprs

File:

• src/ResolvExpr/AlternativeFinder.cc (modified) (3 diffs)

src/ResolvExpr/AlternativeFinder.cc

@@ -39 +39 @@
 #include "SymTab/Validate.h"
 #include "Tuples/Tuples.h"
+#include "Tuples/Explode.h"
 #include "Common/utility.h"
 #include "InitTweak/InitTweak.h"
@@ -240 +241 @@
                                 } // if
                         } // if
+                } else if ( NameExpr * nameExpr = dynamic_cast< NameExpr * >( member ) ) {
+                        // xxx - temporary hack until 0/1 are int constants
+                        if ( nameExpr->get_name() == "0" || nameExpr->get_name() == "1" ) {
+                                std::stringstream ss( nameExpr->get_name() );
+                                int val;
+                                ss >> val;
+                                alternatives.push_back( Alternative( new TupleIndexExpr( expr->clone(), val ), env, newCost ) );
+                        }
                 } // if
         }
@@ -1057 +1066 @@
 
         void AlternativeFinder::visit( UniqueExpr *unqExpr ) {
-                // this won't work because the unqExprs wont share an expression anymore...
                 AlternativeFinder finder( indexer, env );
                 finder.findWithAdjustment( unqExpr->get_expr() );
                 for ( Alternative & alt : finder.alternatives ) {
-                        // xxx - attach a resolved ConstructorInit node?
-                        // xxx - is it possible to make the objDecl's type const?
-                        static UniqueName tempNamer( "_unq_expr_" );
-                        ObjectDecl * objDecl = new ObjectDecl( tempNamer.newName(), DeclarationNode::NoStorageClass, LinkageSpec::Cforall, nullptr, alt.expr->get_result()->clone(), nullptr );
-                        // must be done on two lines because genCtorInit accesses objDecl's fields
-                        objDecl->set_init( InitTweak::genCtorInit( objDecl ) );
-
+                        // ensure that the id is passed on to the UniqueExpr alternative so that the expressions are "linked"
                         UniqueExpr * newUnqExpr = new UniqueExpr( alt.expr->clone(), unqExpr->get_id() );
-                        newUnqExpr->set_object( objDecl );
-
-                        resolveObject( indexer, objDecl );
-
-                        alternatives.push_back( Alternative( newUnqExpr, env, Cost::zero ) );
+                        alternatives.push_back( Alternative( newUnqExpr, alt.env, alt.cost ) );
                 }
         }