Changes in src/ResolvExpr/Resolver.cc [4e06c1e:cad355a]

File:

• src/ResolvExpr/Resolver.cc (modified) (5 diffs)

src/ResolvExpr/Resolver.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 12:17:01 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 12 17:45:42 2016
-// Update Count     : 204
+// Last Modified By : Rob Schluntz
+// Last Modified On : Fri May 13 11:36:40 2016
+// Update Count     : 203
 //
 
@@ -49 +49 @@
                 virtual void visit( ForStmt *forStmt );
                 virtual void visit( SwitchStmt *switchStmt );
+                virtual void visit( ChooseStmt *switchStmt );
                 virtual void visit( CaseStmt *caseStmt );
                 virtual void visit( BranchStmt *branchStmt );
@@ -301 +302 @@
 
         void Resolver::visit( SwitchStmt *switchStmt ) {
+                handleSwitchStmt( switchStmt, *this );
+        }
+
+        void Resolver::visit( ChooseStmt *switchStmt ) {
                 handleSwitchStmt( switchStmt, *this );
         }
@@ -545 +550 @@
                         // get Variable <array>, then get the base type of the VariableExpr - this is the type that needs to be fixed
                         Expression * arr = InitTweak::getCallArg( plusExpr, 0 );
-                        assert( dynamic_cast< VariableExpr * >( arr ) );
+                        assert( dynamic_cast< VariableExpr * >( arr ) || dynamic_cast< MemberExpr *>( arr ) );
                         assert( arr && arr->get_results().size() == 1 );
                         type = arr->get_results().front()->clone();
@@ -554 +559 @@
                         assert( constructee->get_results().size() == 1 );
                         AddressExpr * addrExpr = dynamic_cast< AddressExpr * > ( constructee );
-                        assert( addrExpr && addrExpr->get_results().size() == 1);
+                        assert( addrExpr && addrExpr->get_results().size() == 1 );
                         type = addrExpr->get_results().front()->clone();
                 }