Changeset 486caad for src/CodeGen

Timestamp:

Mar 25, 2024, 7:15:30 PM (22 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

d734fa1

Parents:

df78cce (diff), bf050c5 (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/CodeGen/CodeGenerator.cpp (modified) (1 diff)

src/CodeGen/CodeGenerator.cpp

@@ -192 +192 @@
         }
 
-        assert( decl->returns.size() < 2 );
         if ( 1 == decl->returns.size() ) {
                 ast::ptr<ast::Type> const & type = decl->returns[0]->get_type();
                 output << genTypeNoAttr( type, acc.str(), subOptions );
-        } else {
+        } else if ( 0 == decl->returns.size() ) {
                 output << "void " + acc.str();
+        } else {
+                assertf( !options.genC, "Multi-return should not reach code generation." );
+                ast::ptr<ast::Type> type = new ast::TupleType( copy( decl->type->returns ) );
+                output << genTypeNoAttr( type, acc.str(), subOptions );
         }