Changeset 624b722d

Timestamp:

Feb 1, 2018, 4:33:17 PM (7 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:

33c0ce8

Parents:

0992849

Message:

Minor code cleanup

File:

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

src/ResolvExpr/AlternativeFinder.cc

@@ -1563 +1563 @@
                 // find alternatives for condition
                 AlternativeFinder firstFinder( indexer, env );
-                firstFinder.findWithAdjustment( conditionalExpr->get_arg1() );
+                firstFinder.findWithAdjustment( conditionalExpr->arg1 );
                 if ( firstFinder.alternatives.empty() ) return;
                 // find alternatives for true expression
                 AlternativeFinder secondFinder( indexer, env );
-                secondFinder.findWithAdjustment( conditionalExpr->get_arg2() );
+                secondFinder.findWithAdjustment( conditionalExpr->arg2 );
                 if ( secondFinder.alternatives.empty() ) return;
                 // find alterantives for false expression
                 AlternativeFinder thirdFinder( indexer, env );
-                thirdFinder.findWithAdjustment( conditionalExpr->get_arg3() );
+                thirdFinder.findWithAdjustment( conditionalExpr->arg3 );
                 if ( thirdFinder.alternatives.empty() ) return;
-                for ( AltList::const_iterator first = firstFinder.alternatives.begin(); first != firstFinder.alternatives.end(); ++first ) {
-                        for ( AltList::const_iterator second = secondFinder.alternatives.begin(); second != secondFinder.alternatives.end(); ++second ) {
-                                for ( AltList::const_iterator third = thirdFinder.alternatives.begin(); third != thirdFinder.alternatives.end(); ++third ) {
+                for ( const Alternative & first : firstFinder.alternatives ) {
+                        for ( const Alternative & second : secondFinder.alternatives ) {
+                                for ( const Alternative & third : thirdFinder.alternatives ) {
                                         TypeEnvironment compositeEnv;
-                                        compositeEnv.simpleCombine( first->env );
-                                        compositeEnv.simpleCombine( second->env );
-                                        compositeEnv.simpleCombine( third->env );
+                                        compositeEnv.simpleCombine( first.env );
+                                        compositeEnv.simpleCombine( second.env );
+                                        compositeEnv.simpleCombine( third.env );
 
                                         // unify true and false types, then infer parameters to produce new alternatives
                                         OpenVarSet openVars;
                                         AssertionSet needAssertions, haveAssertions;
-                                        Alternative newAlt( 0, compositeEnv, first->cost + second->cost + third->cost );
+                                        Alternative newAlt( 0, compositeEnv, first.cost + second.cost + third.cost );
                                         Type* commonType = nullptr;
-                                        if ( unify( second->expr->get_result(), third->expr->get_result(), newAlt.env, needAssertions, haveAssertions, openVars, indexer, commonType ) ) {
-                                                ConditionalExpr *newExpr = new ConditionalExpr( first->expr->clone(), second->expr->clone(), third->expr->clone() );
-                                                newExpr->set_result( commonType ? commonType : second->expr->get_result()->clone() );
+                                        if ( unify( second.expr->result, third.expr->result, newAlt.env, needAssertions, haveAssertions, openVars, indexer, commonType ) ) {
+                                                ConditionalExpr *newExpr = new ConditionalExpr( first.expr->clone(), second.expr->clone(), third.expr->clone() );
+                                                newExpr->result = commonType ? commonType : second.expr->result->clone();
                                                 // convert both options to the conditional result type
                                                 newAlt.cost += computeExpressionConversionCost( newExpr->arg2, newExpr->result, indexer, newAlt.env );