Changeset da7fe39 for src/ResolvExpr

Timestamp:

Apr 23, 2018, 12:57:46 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, with_gc

Children:

57acae0

Parents:

ba89e9b7 (diff), c8ad5d9 (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' into references

Location:

src/ResolvExpr

Files:

• AlternativeFinder.cc (modified) (5 diffs)
• ConversionCost.cc (modified) (2 diffs)

src/ResolvExpr/AlternativeFinder.cc

@@ -1247 +1247 @@
         }
 
-        Expression * restructureCast( Expression * argExpr, Type * toType ) {
+        Expression * restructureCast( Expression * argExpr, Type * toType, bool isGenerated ) {
                 if ( argExpr->get_result()->size() > 1 && ! toType->isVoid() && ! dynamic_cast<ReferenceType *>( toType ) ) {
                         // Argument expression is a tuple and the target type is not void and not a reference type.
@@ -1262 +1262 @@
                                 // cast each component
                                 TupleIndexExpr * idx = new TupleIndexExpr( argExpr->clone(), i );
-                                componentExprs.push_back( restructureCast( idx, toType->getComponent( i ) ) );
+                                componentExprs.push_back( restructureCast( idx, toType->getComponent( i ), isGenerated ) );
                         }
                         delete argExpr;
@@ -1270 +1270 @@
                 } else {
                         // handle normally
-                        return new CastExpr( argExpr, toType->clone() );
+                        CastExpr * ret = new CastExpr( argExpr, toType->clone() );
+                        ret->isGenerated = isGenerated;
+                        return ret;
                 }
         }
@@ -1314 +1316 @@
                                 // count one safe conversion for each value that is thrown away
                                 thisCost.incSafe( discardedValues );
-                                Alternative newAlt( restructureCast( alt.expr->clone(), toType ), alt.env,
+                                Alternative newAlt( restructureCast( alt.expr->clone(), toType, castExpr->isGenerated ), alt.env,
                                         alt.cost, thisCost );
                                 inferParameters( needAssertions, haveAssertions, newAlt, openVars,
@@ -1730 +1732 @@
                                         // count one safe conversion for each value that is thrown away
                                         thisCost.incSafe( discardedValues );
-                                        Alternative newAlt( new InitExpr( restructureCast( alt.expr->clone(), toType ), initAlt.designation->clone() ), newEnv, alt.cost, thisCost );
+                                        Alternative newAlt( new InitExpr( restructureCast( alt.expr->clone(), toType, true ), initAlt.designation->clone() ), newEnv, alt.cost, thisCost );
                                         inferParameters( needAssertions, haveAssertions, newAlt, openVars, back_inserter( candidates ) );
                                 }

src/ResolvExpr/ConversionCost.cc

@@ -275 +275 @@
                         // xxx - not positive this is correct, but appears to allow casting int => enum
                         cost = Cost::unsafe;
-                } else if ( dynamic_cast< ZeroType* >( dest ) != nullptr || dynamic_cast< OneType* >( dest ) != nullptr ) {
-                        cost = Cost::unsafe;
-                } // if
+                } // if
+                // no cases for zero_t/one_t because it should not be possible to convert int, etc. to zero_t/one_t.
         }
 
@@ -309 +308 @@
                                 // assignResult == 0 means Cost::Infinity
                         } // if
-                } else if ( dynamic_cast< ZeroType * >( dest ) ) {
-                        cost = Cost::unsafe;
+                        // case case for zero_t because it should not be possible to convert pointers to zero_t.
                 } // if
         }