Changeset c850687 for src/main.cc

Timestamp:

May 11, 2017, 11:07:58 AM (7 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

8514fe19

Parents:

29cf9c8

Message:

Add -L flag to turn of line marks. Updated the keyword list.

File:

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

src/main.cc

@@ +1 @@
+
 //
 // Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
@@ -9 +10 @@
 // Author           : Richard C. Bilson
 // Created On       : Fri May 15 23:12:02 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Dec 14 14:35:54 2016
-// Update Count     : 436
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed May 10 14:45:00 2017
+// Update Count     : 437
 //
 
@@ -79 +80 @@
         errorp = false,
         codegenp = false,
-        prettycodegenp = false;
+        prettycodegenp = false,
+        nolinemarks = false;
 
 static void parse_cmdline( int argc, char *argv[], const char *& filename );
@@ -310 +312 @@
 
                 CodeTools::fillLocations( translationUnit );
-                CodeGen::generate( translationUnit, *output, ! noprotop, prettycodegenp, true );
+                CodeGen::generate( translationUnit, *output, ! noprotop, prettycodegenp, true, ! nolinemarks );
 
                 CodeGen::FixMain::fix( *output, treep ? "../prelude/bootloader.c" : CFA_LIBDIR "/bootloader.c" );
@@ -336 +338 @@
         } catch ( CompilerError &e ) {
                 cerr << "Compiler Error: " << e.get_what() << endl;
-                cerr << "(please report bugs to " << endl;
+                cerr << "(please report bugs to [REDACTED])" << endl;
                 if ( output != &cout ) {
                         delete output;
@@ -375 +377 @@
 
         int c;
-        while ( (c = getopt_long( argc, argv, "abBcdefglmnpqrstTvyzZD:F:", long_opts, &long_index )) != -1 ) {
+        while ( (c = getopt_long( argc, argv, "abBcdefglLmnpqrstTvyzZD:F:", long_opts, &long_index )) != -1 ) {
                 switch ( c ) {
                   case Ast:
@@ -411 +413 @@
                   case 'l':                                                                             // generate libcfa.c
                         libcfap = true;
+                        break;
+                  case 'L':                                                                             // surpress lines marks
+                        nolinemarks = true;
                         break;
                   case Nopreamble: