Changeset ea23d10 for src/ResolvExpr

Timestamp:

Feb 8, 2017, 2:35:08 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

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:

e994912, f923b5f

Parents:

424931d (diff), 4fbdd1e3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

src/ResolvExpr/AlternativeFinder.cc

@@ -403 +403 @@
                         // End of actuals - Handle default values
                         if ( SingleInit *si = dynamic_cast<SingleInit *>( defaultValue )) {
-                                // so far, only constant expressions are accepted as default values
-                                if ( ConstantExpr *cnstexpr = dynamic_cast<ConstantExpr *>( si->get_value()) ) {
-                                        if ( Constant *cnst = dynamic_cast<Constant *>( cnstexpr->get_constant() ) ) {
-                                                if ( unify( formalType, cnst->get_type(), resultEnv, resultNeed, resultHave, openVars, indexer ) ) {
-                                                        // xxx - Don't know if this is right
-                                                        *out++ = cnstexpr->clone();
-                                                        return true;
+                                if ( CastExpr * castExpr = dynamic_cast< CastExpr * >( si->get_value() ) ) {
+                                        // so far, only constant expressions are accepted as default values
+                                        if ( ConstantExpr *cnstexpr = dynamic_cast<ConstantExpr *>( castExpr->get_arg() ) ) {
+                                                if ( Constant *cnst = dynamic_cast<Constant *>( cnstexpr->get_constant() ) ) {
+                                                        if ( unify( formalType, cnst->get_type(), resultEnv, resultNeed, resultHave, openVars, indexer ) ) {
+                                                                *out++ = cnstexpr->clone();
+                                                                return true;
+                                                        } // if
                                                 } // if
                                         } // if
-                                } // if
+                                }
                         } // if
                         return false;