Changeset 32b8144 for src/ResolvExpr

Timestamp:

Feb 17, 2017, 2:20:25 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:

11f95ee

Parents:

e6512c8

Message:

resolve case labels and case ranges

Location:

src/ResolvExpr

Files:

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

src/ResolvExpr/AlternativeFinder.cc

@@ -1044 +1044 @@
 
         void AlternativeFinder::visit( ConditionalExpr *conditionalExpr ) {
+                // find alternatives for condition
                 AlternativeFinder firstFinder( indexer, env );
                 firstFinder.findWithAdjustment( conditionalExpr->get_arg1() );
                 for ( AltList::const_iterator first = firstFinder.alternatives.begin(); first != firstFinder.alternatives.end(); ++first ) {
+                        // find alternatives for true expression
                         AlternativeFinder secondFinder( indexer, first->env );
                         secondFinder.findWithAdjustment( conditionalExpr->get_arg2() );
                         for ( AltList::const_iterator second = secondFinder.alternatives.begin(); second != secondFinder.alternatives.end(); ++second ) {
+                                // find alterantives for false expression
                                 AlternativeFinder thirdFinder( indexer, second->env );
                                 thirdFinder.findWithAdjustment( conditionalExpr->get_arg3() );
                                 for ( AltList::const_iterator third = thirdFinder.alternatives.begin(); third != thirdFinder.alternatives.end(); ++third ) {
+                                        // unify true and false types, then infer parameters to produce new alternatives
                                         OpenVarSet openVars;
                                         AssertionSet needAssertions, haveAssertions;
@@ -1079 +1083 @@
         }
 
+        void AlternativeFinder::visit( RangeExpr * rangeExpr ) {
+                // resolve low and high, accept alternatives whose low and high types unify
+                AlternativeFinder firstFinder( indexer, env );
+                firstFinder.findWithAdjustment( rangeExpr->get_low() );
+                for ( AltList::const_iterator first = firstFinder.alternatives.begin(); first != firstFinder.alternatives.end(); ++first ) {
+                        AlternativeFinder secondFinder( indexer, first->env );
+                        secondFinder.findWithAdjustment( rangeExpr->get_high() );
+                        for ( AltList::const_iterator second = secondFinder.alternatives.begin(); second != secondFinder.alternatives.end(); ++second ) {
+                                OpenVarSet openVars;
+                                AssertionSet needAssertions, haveAssertions;
+                                Alternative newAlt( 0, second->env, first->cost + second->cost );
+                                Type* commonType = nullptr;
+                                if ( unify( first->expr->get_result(), second->expr->get_result(), newAlt.env, needAssertions, haveAssertions, openVars, indexer, commonType ) ) {
+                                        RangeExpr *newExpr = new RangeExpr( first->expr->clone(), second->expr->clone() );
+                                        newExpr->set_result( commonType ? commonType : first->expr->get_result()->clone() );
+                                        newAlt.expr = newExpr;
+                                        inferParameters( needAssertions, haveAssertions, newAlt, openVars, back_inserter( alternatives ) );
+                                } // if
+                        } // for
+                } // for
+        }
+
         void AlternativeFinder::visit( UntypedTupleExpr *tupleExpr ) {
                 std::list< AlternativeFinder > subExprAlternatives;

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 );
         }