Changeset 94e0864d for src/ResolvExpr

Timestamp:

Jun 24, 2015, 4:12:31 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

1869adf

Parents:

94b4364 (diff), de62360d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into resolver

Conflicts:

src/CodeGen/CodeGenerator.cc
src/Parser/ExpressionNode.cc
src/ResolvExpr/Resolver.cc

Location:

src/ResolvExpr

Files:

• AlternativeFinder.cc (modified) (2 diffs)
• Resolver.cc (modified) (3 diffs)

src/ResolvExpr/AlternativeFinder.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 23:52:08 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jun  8 14:53:58 2015
-// Update Count     : 14
+// Last Modified On : Mon Jun 22 17:19:54 2015
+// Update Count     : 17
 //
 
@@ -545 +545 @@
                         NameExpr *fname;
                         if ( ( fname = dynamic_cast<NameExpr *>( untypedExpr->get_function()))
-                                 && ( fname->get_name() == std::string("LabAddress")) ) {
-                                alternatives.push_back( Alternative( untypedExpr, env, Cost()) );
+                                 && ( fname->get_name() == std::string("&&")) ) {
+                                alternatives.push_back( Alternative( untypedExpr->clone(), env, Cost()) );
                                 return;
                         }

src/ResolvExpr/Resolver.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 12:17:01 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Tue Jun 16 14:50:11 2015
-// Update Count     : 154
+// Last Modified On : Wed Jun 24 16:08:49 2015
+// Update Count     : 155
 //
 
@@ -47 +47 @@
                 virtual void visit( ChooseStmt *switchStmt );
                 virtual void visit( CaseStmt *caseStmt );
+                virtual void visit( BranchStmt *branchStmt );
                 virtual void visit( ReturnStmt *returnStmt );
 
@@ -268 +269 @@
         void Resolver::visit( CaseStmt *caseStmt ) {
                 Visitor::visit( caseStmt );
+        }
+
+        void Resolver::visit( BranchStmt *branchStmt ) {
+                // must resolve the argument for a computed goto
+                if ( branchStmt->get_type() == BranchStmt::Goto ) { // check for computed goto statement
+                        if ( NameExpr * arg = dynamic_cast< NameExpr * >( branchStmt->get_computedTarget() ) ) {
+                                VoidType v = Type::Qualifiers();                // cast to void * for the alternative finder
+                                PointerType pt( Type::Qualifiers(), v.clone() );
+                                CastExpr * castExpr = new CastExpr( arg, pt.clone() );
+                                Expression * newExpr = findSingleExpression( castExpr, *this ); // find best expression
+                                branchStmt->set_target( newExpr );
+                        } // if
+                } // if
         }