Changeset 41ca6fa for src

Timestamp:

Mar 12, 2021, 11:14:36 PM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

5f39135, b0d5c0c

Parents:

2d019af (diff), df65c0c (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

src/main.cc

@@ -9 +9 @@
 // Author           : Peter Buhr and Rob Schluntz
 // Created On       : Fri May 15 23:12:02 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Fri Feb 19 14:59:00 2021
-// Update Count     : 643
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Mar  6 15:49:00 2021
+// Update Count     : 656
 //
 
@@ -101 +101 @@
 static string PreludeDirector = "";
 
-static void parse_cmdline( int argc, char *argv[] );
+static void parse_cmdline( int argc, char * argv[] );
 static void parse( FILE * input, LinkageSpec::Spec linkage, bool shouldExit = false );
 static void dump( list< Declaration * > & translationUnit, ostream & out = cout );
@@ -159 +159 @@
 #define SIGPARMS int sig __attribute__(( unused )), siginfo_t * sfp __attribute__(( unused )), ucontext_t * cxt __attribute__(( unused ))
 
-static void Signal( int sig, void (*handler)(SIGPARMS), int flags ) {
+static void Signal( int sig, void (* handler)(SIGPARMS), int flags ) {
         struct sigaction act;
 
@@ -166 +166 @@
 
         if ( sigaction( sig, &act, nullptr ) == -1 ) {
-            cerr << "*CFA runtime error* problem installing signal handler, error(" << errno << ") " << strerror( errno ) << endl;
+            cerr << "*cfa-cpp compilation error* problem installing signal handler, error(" << errno << ") " << strerror( errno ) << endl;
             _exit( EXIT_FAILURE );
         } // if
@@ -421 +421 @@
                         delete output;
                 } // if
-        } catch ( SemanticErrorException &e ) {
+        } catch ( SemanticErrorException & e ) {
                 if ( errorp ) {
                         cerr << "---AST at error:---" << endl;
@@ -432 +432 @@
                 } // if
                 return EXIT_FAILURE;
-        } catch ( UnimplementedError &e ) {
+        } catch ( UnimplementedError & e ) {
                 cout << "Sorry, " << e.get_what() << " is not currently implemented" << endl;
                 if ( output != &cout ) {
@@ -438 +438 @@
                 } // if
                 return EXIT_FAILURE;
-        } catch ( CompilerError &e ) {
+        } catch ( CompilerError & e ) {
                 cerr << "Compiler Error: " << e.get_what() << endl;
                 cerr << "(please report bugs to [REDACTED])" << endl;
@@ -445 +445 @@
                 } // if
                 return EXIT_FAILURE;
+        } catch ( std::bad_alloc & ) {
+                cerr << "*cfa-cpp compilation error* std::bad_alloc" << endl;
+                backtrace( 1 );
+                abort();
         } catch ( ... ) {
                 exception_ptr eptr = current_exception();
@@ -451 +455 @@
                                 rethrow_exception(eptr);
                         } else {
-                                cerr << "Exception Uncaught and Unknown" << endl;
-                        } // if
-                } catch(const exception& e) {
-                        cerr << "Uncaught Exception \"" << e.what() << "\"\n";
+                                cerr << "*cfa-cpp compilation error* exception uncaught and unknown" << endl;
+                        } // if
+                } catch( const exception & e ) {
+                        cerr << "*cfa-cpp compilation error* uncaught exception \"" << e.what() << "\"\n";
                 } // try
                 return EXIT_FAILURE;
@@ -544 +548 @@
 enum { printoptsSize = sizeof( printopts ) / sizeof( printopts[0] ) };
 
-static void usage( char *argv[] ) {
+static void usage( char * argv[] ) {
     cout << "Usage: " << argv[0] << " [options] [input-file (default stdin)] [output-file (default stdout)], where options are:" << endl;
         int i = 0, j = 1;                                                                       // j skips starting colon