Changeset bcd74f3 for src/ResolvExpr

Timestamp:

May 8, 2020, 4:44:53 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

5c9b20c

Parents:

e3bc51c (diff), 0e7e3c17 (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 new-ast

File:

• src/ResolvExpr/TypeEnvironment.cc (modified) (3 diffs)

src/ResolvExpr/TypeEnvironment.cc

@@ -20 +20 @@
 #include <utility>                     // for pair, move
 
+#include "CompilationState.h"          // for deterministic_output
 #include "Common/utility.h"            // for maybeClone
 #include "SynTree/Type.h"              // for Type, FunctionType, Type::Fora...
@@ -106 +107 @@
 
         void EqvClass::print( std::ostream &os, Indenter indent ) const {
-                os << "( ";
-                std::copy( vars.begin(), vars.end(), std::ostream_iterator< std::string >( os, " " ) );
-                os << ")";
+                if( !deterministic_output ) {
+                        os << "( ";
+                        std::copy( vars.begin(), vars.end(), std::ostream_iterator< std::string >( os, " " ) );
+                        os << ")";
+                }
                 if ( type ) {
                         os << " -> ";
@@ -235 +238 @@
                 // check safely bindable
                 if ( r.type && occursIn( r.type, s.vars.begin(), s.vars.end(), *this ) ) return false;
-                
+
                 // merge classes in
                 r.vars.insert( s.vars.begin(), s.vars.end() );