Changeset d5f4613 for src

Timestamp:

Aug 31, 2020, 11:42:30 AM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

207c7330

Parents:

42a2970 (diff), 369ffdf (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

Location:

src

Files:

• AST/Print.cpp (modified) (2 diffs)
• SynTree/Expression.cc (modified) (2 diffs)

src/AST/Print.cpp

@@ -21 +21 @@
 #include "Type.hpp"
 #include "TypeSubstitution.hpp"
+#include "CompilationState.h"
 
 #include "Common/utility.h" // for group_iterate
@@ -239 +240 @@
 
                 if ( node->result ) {
-                        os << endl << indent << "... with resolved type:" << endl;
-                        ++indent;
-                        os << indent;
-                        node->result->accept( *this );
-                        --indent;
+                        if (!deterministic_output) {
+                                os << endl << indent << "... with resolved type:" << endl;
+                                ++indent;
+                                os << indent;
+                                node->result->accept( *this );
+                                --indent;
+                        }
                 }
 

src/SynTree/Expression.cc

@@ -30 +30 @@
 #include "Type.h"                    // for Type, BasicType, Type::Qualifiers
 #include "TypeSubstitution.h"        // for TypeSubstitution
+#include "CompilationState.h"        // for deterministic_output
 
 #include "GenPoly/Lvalue.h"
@@ -71 +72 @@
 
         if ( result ) {
-                os << std::endl << indent << "with resolved type:" << std::endl;
-                os << (indent+1);
-                result->print( os, indent+1 );
+                if (!deterministic_output) {
+                        os << std::endl << indent << "with resolved type:" << std::endl;
+                        os << (indent+1);
+                        result->print( os, indent+1 );
+                }
         }