Changeset 7c782af for src/CodeGen

Timestamp:

Feb 16, 2018, 4:22:25 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

5964127

Parents:

c71b256 (diff), 62cd621 (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:/u/cforall/software/cfa/cfa-cc

Location:

src/CodeGen

Files:

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

src/CodeGen/FixMain.cc

@@ -39 +39 @@
         {
                 if(main_signature) {
-                        throw SemanticError("Multiple definition of main routine\n", functionDecl);
+                        throw 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("Main expected to have 0, 2 or 3 arguments\n", functionDecl);
+                                throw 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 ) ) ) );