Changeset 1cdfa82 for src/ResolvExpr

Timestamp:

Apr 25, 2018, 4:55:53 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

42107b4

Parents:

2efe4b8 (diff), 9d5fb67 (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 remote-tracking branch 'origin/master' into with_gc

Location:

src/ResolvExpr

Files:

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

src/ResolvExpr/AlternativeFinder.cc

@@ -1238 +1238 @@
         }
 
-        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.
@@ -1253 +1253 @@
                                 // 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 ) );
                         }
                         assert( componentExprs.size() > 0 );
@@ -1260 +1260 @@
                 } else {
                         // handle normally
-                        return new CastExpr( argExpr, toType->clone() );
+                        CastExpr * ret = new CastExpr( argExpr, toType->clone() );
+                        ret->isGenerated = isGenerated;
+                        return ret;
                 }
         }
@@ -1304 +1306 @@
                                 // 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,
@@ -1727 +1729 @@
                                         // 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/CommonType.cc

@@ -28 +28 @@
 
 // #define DEBUG
+#ifdef DEBUG
+#define PRINT(x) x
+#else
+#define PRINT(x)
+#endif
 
 namespace ResolvExpr {
@@ -70 +75 @@
                 // need unify to bind type variables
                 if ( unify( t1, t2, env, have, need, newOpen, indexer, common ) ) {
-                        // std::cerr << "unify success: " << widenFirst << " " << widenSecond << std::endl;
+                        PRINT(
+                                std::cerr << "unify success: " << widenFirst << " " << widenSecond << std::endl;
+                        )
                         if ( (widenFirst || t2->get_qualifiers() <= t1->get_qualifiers()) && (widenSecond || t1->get_qualifiers() <= t2->get_qualifiers()) ) {
-                                // std::cerr << "widen okay" << std::endl;
+                                PRINT(
+                                        std::cerr << "widen okay" << std::endl;
+                                )
                                 common->get_qualifiers() |= t1->get_qualifiers();
                                 common->get_qualifiers() |= t2->get_qualifiers();
@@ -78 +87 @@
                         }
                 }
-                // std::cerr << "exact unify failed: " << t1 << " " << t2 << std::endl;
+                PRINT(
+                        std::cerr << "exact unify failed: " << t1 << " " << t2 << std::endl;
+                )
                 return nullptr;
         }
@@ -90 +101 @@
                         int diff = depth1-depth2;
                         // TODO: should it be possible for commonType to generate complicated conversions? I would argue no, only conversions that involve types of the same reference level or a difference of 1 should be allowed.
-                        if ( diff > 1 || diff < -1 ) return nullptr;
+                        // if ( diff > 1 || diff < -1 ) return nullptr;
 
                         // special case where one type has a reference depth of 1 larger than the other
                         if ( diff > 0 || diff < 0 ) {
-                                // std::cerr << "reference depth diff: " << diff << std::endl;
+                                PRINT(
+                                        std::cerr << "reference depth diff: " << diff << std::endl;
+                                )
                                 Type * result = nullptr;
                                 ReferenceType * ref1 = dynamic_cast< ReferenceType * >( type1 );
@@ -109 +122 @@
                                 if ( result && ref1 ) {
                                         // formal is reference, so result should be reference
-                                        // std::cerr << "formal is reference; result should be reference" << std::endl;
+                                        PRINT(
+                                                std::cerr << "formal is reference; result should be reference" << std::endl;
+                                        )
                                         result = new ReferenceType( ref1->get_qualifiers(), result );
                                 }
-                                // std::cerr << "common type of reference [" << type1 << "] and [" << type2 << "] is [" << result << "]" << std::endl;
+                                PRINT(
+                                        std::cerr << "common type of reference [" << type1 << "] and [" << type2 << "] is [" << result << "]" << std::endl;
+                                )
                                 return result;
                         }

src/ResolvExpr/ConversionCost.cc

@@ -276 +276 @@
                         // 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.
         }
 
@@ -310 +309 @@
                                 // 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
         }

src/ResolvExpr/Resolver.cc

@@ -60 +60 @@
                 void previsit( TypeDecl *typeDecl );
                 void previsit( EnumDecl * enumDecl );
+                void previsit( StaticAssertDecl * assertDecl );
 
                 void previsit( ArrayType * at );
@@ -365 +366 @@
         }
 
+        void Resolver::previsit( StaticAssertDecl * assertDecl ) {
+                findIntegralExpression( assertDecl->condition, indexer );
+        }
+
         void Resolver::previsit( ExprStmt *exprStmt ) {
                 visit_children = false;