Changes in src/main.cc [6de43b6:bff09c8]

File:

• src/main.cc (modified) (11 diffs)

src/main.cc

@@ -10 +10 @@
 // Author           : Richard C. Bilson
 // Created On       : Fri May 15 23:12:02 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Oct 31 12:22:40 2017
-// Update Count     : 445
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Jul 26 14:38:00 2017
+// Update Count     : 443
 //
 
@@ -44 +44 @@
 #include "ControlStruct/Mutate.h"           // for mutate
 #include "GenPoly/Box.h"                    // for box
+#include "GenPoly/CopyParams.h"             // for copyParams
 #include "GenPoly/InstantiateGeneric.h"     // for instantiateGeneric
 #include "GenPoly/Lvalue.h"                 // for convertLvalue
@@ -93 +94 @@
         codegenp = false,
         prettycodegenp = false,
-        linemarks = false;
+        nolinemarks = false;
 
 static void parse_cmdline( int argc, char *argv[], const char *& filename );
@@ -238 +239 @@
                 } // if
 
+                // OPTPRINT( "Concurrency" )
+                // Concurrency::applyKeywords( translationUnit );
+
                 // add the assignment statement after the initialization of a type parameter
                 OPTPRINT( "validate" )
@@ -320 +324 @@
                 OPTPRINT("instantiateGenerics")
                 GenPoly::instantiateGeneric( translationUnit );
+                OPTPRINT( "copyParams" );
+                GenPoly::copyParams( translationUnit );
                 OPTPRINT( "convertLvalue" )
                 GenPoly::convertLvalue( translationUnit );
@@ -340 +346 @@
 
                 CodeTools::fillLocations( translationUnit );
-                CodeGen::generate( translationUnit, *output, ! noprotop, prettycodegenp, true, linemarks );
+                CodeGen::generate( translationUnit, *output, ! noprotop, prettycodegenp, true, ! nolinemarks );
 
                 CodeGen::FixMain::fix( *output, treep ? "../prelude/bootloader.c" : CFA_LIBDIR "/bootloader.c" );
@@ -378 +384 @@
 
 void parse_cmdline( int argc, char * argv[], const char *& filename ) {
-        enum { Ast, Bbox, Bresolver, CtorInitFix, DeclStats, Expr, ExprAlt, Grammar, LibCFA, Linemarks, Nolinemarks, Nopreamble, Parse, Prototypes, Resolver, Symbol, Tree, TupleExpansion, Validate, };
+        enum { Ast, Bbox, Bresolver, CtorInitFix, DeclStats, Expr, ExprAlt, Grammar, LibCFA, Nopreamble, Parse, Prototypes, Resolver, Symbol, Tree, TupleExpansion, Validate, };
 
         static struct option long_opts[] = {
@@ -390 +396 @@
                 { "grammar", no_argument, 0, Grammar },
                 { "libcfa", no_argument, 0, LibCFA },
-                { "line-marks", no_argument, 0, Linemarks },
-                { "no-line-marks", no_argument, 0, Nolinemarks },
                 { "no-preamble", no_argument, 0, Nopreamble },
                 { "parse", no_argument, 0, Parse },
@@ -407 +411 @@
 
         int c;
-        while ( (c = getopt_long( argc, argv, "abBcCdefglLmnNpqrstTvyzZD:F:", long_opts, &long_index )) != -1 ) {
+        while ( (c = getopt_long( argc, argv, "abBcCdefglLmnpqrstTvyzZD:F:", long_opts, &long_index )) != -1 ) {
                 switch ( c ) {
                   case Ast:
@@ -447 +451 @@
                         libcfap = true;
                         break;
-                  case Linemarks:
-                  case 'L':                                                                             // print lines marks
-                        linemarks = true;
+                  case 'L':                                                                             // surpress lines marks
+                        nolinemarks = true;
                         break;
                   case Nopreamble:
                   case 'n':                                                                             // do not read preamble
                         nopreludep = true;
-                        break;
-                  case Nolinemarks:
-                  case 'N':                                                                             // suppress line marks
-                        linemarks = false;
                         break;
                   case Prototypes:
@@ -509 +508 @@
                                 assertf( false, "Unknown option: %s\n", argv[optind - 1] );
                         } // if
-                        #if __GNUC__ < 7
-                        #else
-                                __attribute__((fallthrough));
-                        #endif
                   default:
                         abort();