Changeset 07d867b for src/AST/Convert.cpp

Timestamp:

Aug 10, 2020, 7:45:18 PM (18 months ago)

Author:

Fangren Yu <f37yu@…>

Branches:

arm-eh, jacob/cs343-translation, master, new-ast, new-ast-unique-expr

Children:

22f94a4

Parents:

ba662b9

Message:

attempt to fix inferparams

File:

• src/AST/Convert.cpp (modified) (2 diffs)

src/AST/Convert.cpp

@@ -588 +588 @@
                 assert( tgtResnSlots.empty() );
 
-                if ( srcInferred.mode == ast::Expr::InferUnion::Params ) {
+                if ( srcInferred.data.inferParams ) {
                         const ast::InferredParams &srcParams = srcInferred.inferParams();
                         for (auto & srcParam : srcParams) {
                                 auto res = tgtInferParams.emplace(srcParam.first, ParamEntry(
                                         srcParam.second.decl,
-                                        get<Declaration>().accept1(srcParam.second.declptr)->clone(),
-                                        get<Type>().accept1(srcParam.second.actualType),
-                                        get<Type>().accept1(srcParam.second.formalType),
-                                        get<Expression>().accept1(srcParam.second.expr)
+                                        get<Declaration>().accept1(srcParam.second.declptr),
+                                        get<Type>().accept1(srcParam.second.actualType)->clone(),
+                                        get<Type>().accept1(srcParam.second.formalType)->clone(),
+                                        get<Expression>().accept1(srcParam.second.expr)->clone()
                                 ));
                                 assert(res.second);
                         }
-                } else if ( srcInferred.mode == ast::Expr::InferUnion::Slots  ) {
+                }
+                if ( srcInferred.data.resnSlots ) {
                         const ast::ResnSlots &srcSlots = srcInferred.resnSlots();
                         for (auto srcSlot : srcSlots) {
@@ -2003 +2004 @@
 
                 assert( oldInferParams.empty() || oldResnSlots.empty() );
-                assert( newInferred.mode == ast::Expr::InferUnion::Empty );
+                // assert( newInferred.mode == ast::Expr::InferUnion::Empty );
 
                 if ( !oldInferParams.empty() ) {