Changes in / [9a7c88f:b5276fc]

Files:

• src/CompilationState.cc (modified) (1 diff)
• src/CompilationState.h (modified) (1 diff)
• src/ResolvExpr/TypeEnvironment.cc (modified) (3 diffs)
• src/main.cc (modified) (4 diffs)
• tests/Makefile.am (modified) (1 diff)
• tests/Makefile.in (modified) (1 diff)
• tests/errors/.expect/completeType.txt (modified) (3 diffs)

src/CompilationState.cc

@@ -27 +27 @@
         nopreludep = false,
         genproto = false,
+        deterministic_output = false,
         nomainp = false,
         parsep = false,

src/CompilationState.h

@@ -28 +28 @@
         nopreludep,
         genproto,
+        deterministic_output,
         nomainp,
         parsep,

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() );

src/main.cc

@@ -443 +443 @@
 
 
-static const char optstring[] = ":c:ghlLmNnpP:S:twW:D:";
+static const char optstring[] = ":c:ghlLmNnpdP:S:twW:D:";
 
 enum { PreludeDir = 128 };
@@ -456 +456 @@
         { "no-prelude", no_argument, nullptr, 'n' },
         { "prototypes", no_argument, nullptr, 'p' },
+        { "deterministic-out", no_argument, nullptr, 'd' },
         { "print", required_argument, nullptr, 'P' },
         { "prelude-dir", required_argument, nullptr, PreludeDir },
@@ -476 +477 @@
         "do not read prelude",                                // -n
         "generate prototypes for prelude functions",            // -p
+        "don't print output that isn't deterministic",        // -d
         "print",                                              // -P
         "<directory> prelude directory for debug/nodebug",      // no flag
@@ -580 +582 @@
                         genproto = true;
                         break;
+                  case 'd':                                     // don't print non-deterministic output
+                    deterministic_output = true;
+                        break;
                   case 'P':                                                                             // print options
                         for ( int i = 0;; i += 1 ) {

tests/Makefile.am

@@ -41 +41 @@
         -quiet @CFA_FLAGS@ \
         -DIN_DIR="${abs_srcdir}/.in/"
+
+AM_CFAFLAGS = -XCFA --deterministic-out
 
 # get the desired cfa to test

tests/Makefile.in

@@ -408 +408 @@
         -DIN_DIR="${abs_srcdir}/.in/"
 
+AM_CFAFLAGS = -XCFA --deterministic-out
 
 # get the desired cfa to test

tests/errors/.expect/completeType.txt

@@ -27 +27 @@
     void 
   )
-  Environment:( _85_4_DT ) -> instance of struct A with body 0 (no widening)
+  Environment: -> instance of struct A with body 0 (no widening)
 
 
@@ -50 +50 @@
     void 
   )
-  Environment:( _85_4_DT ) -> instance of struct B with body 1 (no widening)
+  Environment: -> instance of struct B with body 1 (no widening)
 
 
@@ -127 +127 @@
           void 
         )
-        Environment:( _104_0_T ) -> instance of type T (not function type) (no widening)
+        Environment: -> instance of type T (not function type) (no widening)
 
       Could not satisfy assertion: