Changeset 73973b6

Timestamp:

Jun 17, 2020, 5:02:14 PM (4 years ago)

Author:

Fangren Yu <f37yu@…>

Branches:

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

Children:

d2de1be9

Parents:

5c9b20c

Message:

manually call mutate on functiondecl

File:

• src/ResolvExpr/Resolver.cc (modified) (1 diff)

src/ResolvExpr/Resolver.cc

@@ -1299 +1299 @@
                 // default value expressions have an environment which shouldn't be there and trips up
                 // later passes.
-                ast::ptr< ast::FunctionDecl > ret = functionDecl;
-                for ( unsigned i = 0; i < functionDecl->type->params.size(); ++i ) {
-                        const ast::ptr< ast::DeclWithType > & d = functionDecl->type->params[i];
-
-                        if ( const ast::ObjectDecl * obj = d.as< ast::ObjectDecl >() ) {
-                                if ( const ast::SingleInit * init = obj->init.as< ast::SingleInit >() ) {
-                                        if ( init->value->env == nullptr ) continue;
-                                        // clone initializer minus the initializer environment
-                                        ast::chain_mutate( ret )
-                                                ( &ast::FunctionDecl::type )
-                                                        ( &ast::FunctionType::params )[i]
-                                                                ( &ast::ObjectDecl::init )
-                                                                        ( &ast::SingleInit::value )->env = nullptr;
-
-                                        assert( functionDecl != ret.get() || functionDecl->unique() );
-                                        assert( ! ret->type->params[i].strict_as< ast::ObjectDecl >()->init.strict_as< ast::SingleInit >()->value->env );
-                                }
-                        }
-                }
-                return ret.release();
+
+                // ast::ptr< ast::FunctionDecl > ret = functionDecl; 
+                // assert(functionDecl->type->unique());
+                assert(functionDecl->unique());
+                
+                auto mutType = mutate(functionDecl->type.get());
+
+                for ( unsigned i = 0; i < mutType->params.size(); ++i ) {
+                        const ast::ptr< ast::DeclWithType > & d = mutType->params[i];
+            if ( const ast::ObjectDecl * obj = d.as< ast::ObjectDecl >() ) {
+                if ( const ast::SingleInit * init = obj->init.as< ast::SingleInit >() ) {
+                    if ( init->value->env == nullptr ) continue;
+                    // clone initializer minus the initializer environment
+                    // ast::FunctionDecl * mutDecl = mutate( functionDecl );
+                    // auto mutType = mutate( mutDecl->type.get() );
+                    auto mutParam = mutate( mutType->params[i].strict_as<ast::ObjectDecl>() );
+                    auto mutInit = mutate( mutParam->init.strict_as<ast::SingleInit>() );
+                    auto mutValue = mutate( mutInit->value.get() );
+                    //ast::chain_mutate( ret )
+                    //  ( &ast::FunctionDecl::type )
+                    //      ( &ast::FunctionType::params )[i]
+                    //          ( &ast::ObjectDecl::init )
+                    //              ( &ast::SingleInit::value )->env = nullptr;
+                    // assert( functionDecl != mutDecl || functionDecl->unique() );
+                    mutValue->env = nullptr;
+                    mutInit->value = mutValue;
+                    mutParam->init = mutInit;
+                    mutType->params[i] = mutParam;
+                    // mutDecl->type = mutType;
+                    // functionDecl = mutDecl;
+                    assert( ! mutType->params[i].strict_as< ast::ObjectDecl >()->init.strict_as< ast::SingleInit >()->value->env);
+                }
+            }
+                }
+                mutate_field(functionDecl, &ast::FunctionDecl::type, mutType);
+                return functionDecl;
         }