Changeset 1cf2a9b

Timestamp:

Jun 18, 2020, 4:57:23 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:

8ff586c

Parents:

c7f834e (diff), e068c8a (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 'new-ast' of plg.uwaterloo.ca:software/cfa/cfa-cc into new-ast

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; 
-                // 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);
-                }
-            }
+                assert( functionDecl->unique() );
+                ast::FunctionType * mutType = mutate( functionDecl->type.get() );
+
+                for ( unsigned i = 0 ; i < mutType->params.size() ; ++i ) {
+                        if ( const ast::ObjectDecl * obj = mutType->params[i].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
+                                        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() );
+
+                                        mutValue->env = nullptr;
+                                        mutInit->value = mutValue;
+                                        mutParam->init = mutInit;
+                                        mutType->params[i] = mutParam;
+
+                                        assert( ! mutType->params[i].strict_as< ast::ObjectDecl >()->init.strict_as< ast::SingleInit >()->value->env);
+                                }
+                        }
                 }
                 mutate_field(functionDecl, &ast::FunctionDecl::type, mutType);