Changeset 95642c9

Timestamp:

May 18, 2018, 5:42:34 PM (6 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, with_gc

Children:

cdb990a

Parents:

6b8c4a8

Message:

Minor cleanup

File:

• src/ResolvExpr/AlternativeFinder.cc (modified) (3 diffs)

src/ResolvExpr/AlternativeFinder.cc

@@ -1285 +1285 @@
                 AlternativeFinder finder( indexer, env );
                 finder.targetType = toType;
-                finder.findWithAdjustment( castExpr->get_arg() );
+                finder.findWithAdjustment( castExpr->arg );
 
                 AltList candidates;
@@ -1296 +1296 @@
                         // that are cast directly.  The candidate is invalid if it has fewer results than there are types to cast
                         // to.
-                        int discardedValues = alt.expr->get_result()->size() - castExpr->get_result()->size();
+                        int discardedValues = alt.expr->result->size() - castExpr->result->size();
                         if ( discardedValues < 0 ) continue;
                         // xxx - may need to go into tuple types and extract relevant types and use unifyList. Note that currently, this does not
                         // allow casting a tuple to an atomic type (e.g. (int)([1, 2, 3]))
                         // unification run for side-effects
-                        unify( castExpr->get_result(), alt.expr->get_result(), alt.env, needAssertions,
+                        unify( castExpr->result, alt.expr->result, alt.env, needAssertions,
                                 haveAssertions, openVars, indexer );
-                        Cost thisCost = castCost( alt.expr->get_result(), castExpr->get_result(), indexer,
+                        Cost thisCost = castCost( alt.expr->result, castExpr->result, indexer,
                                 alt.env );
                         PRINT(
@@ -1726 +1726 @@
                                 // allow casting a tuple to an atomic type (e.g. (int)([1, 2, 3]))
                                 // unification run for side-effects
-                                unify( toType, alt.expr->get_result(), newEnv, needAssertions, haveAssertions, openVars, indexer ); // xxx - do some inspecting on this line... why isn't result bound to initAlt.type??
+                                unify( toType, alt.expr->result, newEnv, needAssertions, haveAssertions, openVars, indexer ); // xxx - do some inspecting on this line... why isn't result bound to initAlt.type??
 
                                 Cost thisCost = castCost( alt.expr->get_result(), toType, indexer, newEnv );