Changeset dcbb03b for src/CodeGen

Timestamp:

Mar 1, 2018, 9:29:03 AM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

1f37ed02

Parents:

b002261 (diff), 446ffa3 (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

Location:

src/CodeGen

Files:

• CodeGenerator.cc (modified) (1 diff)
• FixMain.cc (modified) (1 diff)
• FixNames.cc (modified) (1 diff)

src/CodeGen/CodeGenerator.cc

@@ -18 +18 @@
 #include <list>                      // for _List_iterator, list, list<>::it...
 
-#include "Common/SemanticError.h"    // for SemanticError
 #include "Common/UniqueName.h"       // for UniqueName
 #include "Common/utility.h"          // for CodeLocation, toString

src/CodeGen/FixMain.cc

@@ -39 +39 @@
         {
                 if(main_signature) {
-                        throw SemanticError(functionDecl, "Multiple definition of main routine\n");
+                        SemanticError(functionDecl, "Multiple definition of main routine\n");
                 }
                 main_signature.reset( functionDecl->clone() );

src/CodeGen/FixNames.cc

@@ -118 +118 @@
                         int nargs = functionDecl->get_functionType()->get_parameters().size();
                         if( !(nargs == 0 || nargs == 2 || nargs == 3) ) {
-                                throw SemanticError(functionDecl, "Main expected to have 0, 2 or 3 arguments\n");
+                                SemanticError(functionDecl, "Main expected to have 0, 2 or 3 arguments\n");
                         }
                         functionDecl->get_statements()->get_kids().push_back( new ReturnStmt( new ConstantExpr( Constant::from_int( 0 ) ) ) );