Changeset bcd74f3 for src

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

Location:

src

Files:

• CompilationState.cc (modified) (1 diff)
• CompilationState.h (modified) (1 diff)
• Parser/parser.yy (modified) (2 diffs)
• ResolvExpr/TypeEnvironment.cc (modified) (3 diffs)
• main.cc (modified) (4 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/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar  6 17:26:45 2020
-// Update Count     : 4474
+// Last Modified On : Mon Apr 27 12:25:42 2020
+// Update Count     : 4483
 //
 
@@ -966 +966 @@
 
 tuple_expression_list:
-        assignment_expression_opt
-        | tuple_expression_list ',' assignment_expression_opt
+        assignment_expression
+        | '@'                                                                                           // CFA
+                { SemanticError( yylloc, "Eliding tuple element with '@' is currently unimplemented." ); $$ = nullptr; }
+        | tuple_expression_list ',' assignment_expression
                 { $$ = (ExpressionNode *)($1->set_last( $3 )); }
+        | tuple_expression_list ',' '@'
+                { SemanticError( yylloc, "Eliding tuple element with '@' is currently unimplemented." ); $$ = nullptr; }
         ;
 

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

@@ -449 +449 @@
 
 
-static const char optstring[] = ":c:ghlLmNnpP:S:twW:D:";
+static const char optstring[] = ":c:ghlLmNnpdP:S:twW:D:";
 
 enum { PreludeDir = 128 };
@@ -462 +462 @@
         { "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 },
@@ -482 +483 @@
         "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
@@ -586 +588 @@
                         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 ) {