Changeset 136ccd7 for src/main.cc

Timestamp:

Nov 3, 2017, 3:01:31 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

4ee36bf0

Parents:

4ee1efb (diff), 760ba67 (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 cleanup-dtors

File:

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

src/main.cc

@@ -10 +10 @@
 // Author           : Richard C. Bilson
 // Created On       : Fri May 15 23:12:02 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Wed Jul 26 14:38:00 2017
-// Update Count     : 443
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Oct 31 12:22:40 2017
+// Update Count     : 445
 //
 
@@ -93 +93 @@
         codegenp = false,
         prettycodegenp = false,
-        nolinemarks = false;
+        linemarks = false;
 
 static void parse_cmdline( int argc, char *argv[], const char *& filename );
@@ -340 +340 @@
 
                 CodeTools::fillLocations( translationUnit );
-                CodeGen::generate( translationUnit, *output, ! noprotop, prettycodegenp, true, ! nolinemarks );
+                CodeGen::generate( translationUnit, *output, ! noprotop, prettycodegenp, true, linemarks );
 
                 CodeGen::FixMain::fix( *output, treep ? "../prelude/bootloader.c" : CFA_LIBDIR "/bootloader.c" );
@@ -378 +378 @@
 
 void parse_cmdline( int argc, char * argv[], const char *& filename ) {
-        enum { Ast, Bbox, Bresolver, CtorInitFix, DeclStats, Expr, ExprAlt, Grammar, LibCFA, Nopreamble, Parse, Prototypes, Resolver, Symbol, Tree, TupleExpansion, Validate, };
+        enum { Ast, Bbox, Bresolver, CtorInitFix, DeclStats, Expr, ExprAlt, Grammar, LibCFA, Linemarks, Nolinemarks, Nopreamble, Parse, Prototypes, Resolver, Symbol, Tree, TupleExpansion, Validate, };
 
         static struct option long_opts[] = {
@@ -390 +390 @@
                 { "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 },
@@ -405 +407 @@
 
         int c;
-        while ( (c = getopt_long( argc, argv, "abBcCdefglLmnpqrstTvyzZD:F:", long_opts, &long_index )) != -1 ) {
+        while ( (c = getopt_long( argc, argv, "abBcCdefglLmnNpqrstTvyzZD:F:", long_opts, &long_index )) != -1 ) {
                 switch ( c ) {
                   case Ast:
@@ -445 +447 @@
                         libcfap = true;
                         break;
-                  case 'L':                                                                             // surpress lines marks
-                        nolinemarks = true;
+                  case Linemarks:
+                  case 'L':                                                                             // print lines marks
+                        linemarks = 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: