Changeset 5546eee4 for src/CodeGen

Timestamp:

Dec 16, 2023, 1:01:44 AM (6 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

b7898ac

Parents:

0fa0201d (diff), 69ab896 (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.cpp (modified) (1 diff)
• FixMain.cc (modified) (2 diffs)
• FixNames.cc (modified) (2 diffs)

src/CodeGen/CodeGenerator.cpp

@@ -1026 +1026 @@
         output << " ) ";
 
-        output << "{";
+        output << "{" << endl;
         ++indent;
         for ( auto node : stmt->cases ) {

src/CodeGen/FixMain.cc

@@ -11 +11 @@
 // Last Modified By :
 // Last Modified On :
-// Update Count     : 0
+// Update Count     : 1
 //
 
@@ -39 +39 @@
                 if ( isMain( decl ) ) {
                         if ( main_declaration ) {
-                                SemanticError( decl, "Multiple definition of main routine\n" );
+                                SemanticError( decl, "Multiple definition of main routine" );
                         }
                         main_declaration = decl;

src/CodeGen/FixNames.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Wed Jul 20 11:49:00 2022
-// Update Count     : 24
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Dec 14 16:16:51 2023
+// Update Count     : 25
 //
 
@@ -57 +57 @@
                         int nargs = mutDecl->params.size();
                         if ( 0 != nargs && 2 != nargs && 3 != nargs ) {
-                                SemanticError( functionDecl, "Main expected to have 0, 2 or 3 arguments\n" );
+                                SemanticError( functionDecl, "Main expected to have 0, 2 or 3 arguments" );
                         }
                         ast::chain_mutate( mutDecl->stmts )->kids.push_back(