Changeset 68c9165 for src/ResolvExpr

Timestamp:

May 23, 2019, 11:35:04 AM (7 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

20a5977, effe5b0

Parents:

b0ec971 (diff), 3ca912a (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.

git-author:

Aaron Moss <a3moss@…> (05/23/19 11:34:34)

git-committer:

Aaron Moss <a3moss@…> (05/23/19 11:35:04)

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/ResolvExpr/Unify.cc (modified) (2 diffs)

src/ResolvExpr/Unify.cc

@@ -179 +179 @@
                                 result = false;
                         } else {
-                                result = env.bindVarToVar( 
-                                        var1, var2, TypeDecl::Data{ entry1->second, entry2->second }, needAssertions, 
+                                result = env.bindVarToVar(
+                                        var1, var2, TypeDecl::Data{ entry1->second, entry2->second }, needAssertions,
                                         haveAssertions, openVars, widenMode, indexer );
                         }
@@ -648 +648 @@
 
         ast::ptr<ast::Type> extractResultType( const ast::FunctionType * func ) {
-                assert(!"restore after AST added to build");
-                // if ( func->returns.empty() ) return new ast::VoidType{};
-                // if ( func->returns.size() == 1 ) return func->returns[0]->get_type();
-
-                // std::vector<ast::ptr<ast::Type>> tys;
-                // for ( const ast::DeclWithType * decl : func->returns ) {
-                //      tys.emplace_back( decl->get_type() );
-                // }
-                // return new ast::TupleType{ std::move(tys) };
+                if ( func->returns.empty() ) return new ast::VoidType{};
+                if ( func->returns.size() == 1 ) return func->returns[0]->get_type();
+
+                std::vector<ast::ptr<ast::Type>> tys;
+                for ( const ast::DeclWithType * decl : func->returns ) {
+                        tys.emplace_back( decl->get_type() );
+                }
+                return new ast::TupleType{ std::move(tys) };
         }
 } // namespace ResolvExpr