Changeset 1cdfa82 for src/ResolvExpr/CommonType.cc

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

File:

• src/ResolvExpr/CommonType.cc (modified) (5 diffs)

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;
                         }