Changeset 9d1e3f7

Timestamp:

Apr 5, 2018, 11:58:01 AM (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:

10246645, ca37445

Parents:

593370c

Message:

Minor updates

Location:

src

Files:

• Common/ErrorObjects.h (modified) (1 diff)
• ResolvExpr/CommonType.cc (modified) (5 diffs)

src/Common/ErrorObjects.h

@@ -35 +35 @@
 class SemanticErrorException : public std::exception {
   public:
-        SemanticErrorException() = default;
+        SemanticErrorException() = default;
         SemanticErrorException( CodeLocation location, std::string error );
         ~SemanticErrorException() throw() {}

src/ResolvExpr/CommonType.cc

@@ -27 +27 @@
 #include "typeops.h"                     // for isFtype
 
-// #define DEBUG
+#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;
         }
@@ -94 +105 @@
                         // 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;
                         }