Changeset 9bb6c5f for src/CodeGen

Timestamp:

Sep 5, 2024, 3:57:05 PM (16 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

29c8675

Parents:

ad47ec4 (diff), 508cff0 (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)
• GenType.cpp (modified) (1 diff)

src/CodeGen/CodeGenerator.cpp

@@ -180 +180 @@
 
         if ( 0 == decl->params.size() ) {
-                if ( decl->type->isVarArgs ) {
+                if ( !decl->type->isVarArgs ) {
+                        acc << "(void)";
+                } else if ( options.genC ) {
                         acc << "()";
                 } else {
-                        acc << "(void)";
+                        acc << "(...)";
                 }
         } else {

src/CodeGen/GenType.cpp

@@ -168 +168 @@
 
         if ( type->params.empty() ) {
-                if ( type->isVarArgs ) {
+                if ( !type->isVarArgs ) {
+                        os << "(void)";
+                } else if ( options.genC ) {
                         os << "()";
                 } else {
-                        os << "(void)";
+                        os << "(...)";
                 }
         } else {