Changes in src/ResolvExpr/Resolver.cc [138e29e:32b8144]

File:

• src/ResolvExpr/Resolver.cc (modified) (1 diff)

src/ResolvExpr/Resolver.cc

@@ -302 +302 @@
         }
 
-        template< typename SwitchClass >
-        void handleSwitchStmt( SwitchClass *switchStmt, SymTab::Indexer &visitor ) {
+        void Resolver::visit( SwitchStmt *switchStmt ) {
+                ValueGuard< Type * > oldInitContext( initContext );
                 Expression *newExpr;
-                newExpr = findIntegralExpression( switchStmt->get_condition(), visitor );
+                newExpr = findIntegralExpression( switchStmt->get_condition(), *this );
                 delete switchStmt->get_condition();
                 switchStmt->set_condition( newExpr );
 
-                visitor.Visitor::visit( switchStmt );
-        }
-
-        void Resolver::visit( SwitchStmt *switchStmt ) {
-                handleSwitchStmt( switchStmt, *this );
+                initContext = newExpr->get_result();
+                Parent::visit( switchStmt );
         }
 
         void Resolver::visit( CaseStmt *caseStmt ) {
+                if ( caseStmt->get_condition() ) {
+                        assert( initContext );
+                        CastExpr * castExpr = new CastExpr( caseStmt->get_condition(), initContext->clone() );
+                        Expression * newExpr = findSingleExpression( castExpr, *this );
+                        castExpr = safe_dynamic_cast< CastExpr * >( newExpr );
+                        caseStmt->set_condition( castExpr->get_arg() );
+                        castExpr->set_arg( nullptr );
+                        delete castExpr;
+                }
                 Parent::visit( caseStmt );
         }