Changes in src/ResolvExpr/Resolver.cc [60914351:ad51cc2]

File:

• src/ResolvExpr/Resolver.cc (modified) (7 diffs)

src/ResolvExpr/Resolver.cc

@@ -82 +82 @@
                 void previsit( ConstructorInit *ctorInit );
           private:
-                typedef std::list< Initializer * >::iterator InitIterator;
+        typedef std::list< Initializer * >::iterator InitIterator;
 
                 template< typename PtrType >
                 void handlePtrType( PtrType * type );
 
-                void resolveWithExprs( std::list< Expression * > & withExprs, std::list< Statement * > & newStmts );
-                void fallbackInit( ConstructorInit * ctorInit );
+          void resolveAggrInit( ReferenceToType *, InitIterator &, InitIterator & );
+          void resolveSingleAggrInit( Declaration *, InitIterator &, InitIterator &, TypeSubstitution sub );
+          void fallbackInit( ConstructorInit * ctorInit );
 
                 Type * functionReturn = nullptr;
@@ -268 +269 @@
                 std::cerr << std::endl;
 #endif
-                Type *new_type = resolveTypeof( functionDecl->type, indexer );
+                Type *new_type = resolveTypeof( functionDecl->get_type(), indexer );
                 functionDecl->set_type( new_type );
                 GuardValue( functionReturn );
-                functionReturn = ResolvExpr::extractResultType( functionDecl->type );
-
-                {
-                        // resolve with-exprs with parameters in scope and add any newly generated declarations to the
-                        // front of the function body.
-                        auto guard = makeFuncGuard( [this]() { indexer.enterScope(); }, [this](){ indexer.leaveScope(); } );
-                        indexer.addFunctionType( functionDecl->type );
-                        std::list< Statement * > newStmts;
-                        resolveWithExprs( functionDecl->withExprs, newStmts );
-                        functionDecl->statements->kids.splice( functionDecl->statements->kids.begin(), newStmts );
-                }
+                functionReturn = ResolvExpr::extractResultType( functionDecl->get_functionType() );
         }
 
@@ -288 +279 @@
                 // xxx - it might be necessary to somehow keep the information from this environment, but I can't currently
                 // see how it's useful.
-                for ( Declaration * d : functionDecl->type->parameters ) {
+                for ( Declaration * d : functionDecl->get_functionType()->get_parameters() ) {
                         if ( ObjectDecl * obj = dynamic_cast< ObjectDecl * >( d ) ) {
-                                if ( SingleInit * init = dynamic_cast< SingleInit * >( obj->init ) ) {
-                                        delete init->value->env;
-                                        init->value->env = nullptr;
+                                if ( SingleInit * init = dynamic_cast< SingleInit * >( obj->get_init() ) ) {
+                                        delete init->get_value()->get_env();
+                                        init->get_value()->set_env( nullptr );
                                 }
                         }
@@ -593 +584 @@
         }
 
-        void Resolver::resolveWithExprs( std::list< Expression * > & withExprs, std::list< Statement * > & newStmts ) {
-                for ( Expression *& expr : withExprs )  {
+
+        void Resolver::previsit( WithStmt * withStmt ) {
+                for ( Expression *& expr : withStmt->exprs )  {
                         // only struct- and union-typed expressions are viable candidates
                         findKindExpression( expr, indexer, "with statement", isStructOrUnion );
@@ -603 +595 @@
                                 ObjectDecl * tmp = ObjectDecl::newObject( tmpNamer.newName(), expr->result->clone(), new SingleInit( expr ) );
                                 expr = new VariableExpr( tmp );
-                                newStmts.push_back( new DeclStmt( tmp ) );
+                                stmtsToAddBefore.push_back( new DeclStmt( tmp ) );
                                 if ( InitTweak::isConstructable( tmp->type ) ) {
                                         // generate ctor/dtor and resolve them
@@ -611 +603 @@
                         }
                 }
-        }
-
-        void Resolver::previsit( WithStmt * withStmt ) {
-                resolveWithExprs( withStmt->exprs, stmtsToAddBefore );
         }
 
@@ -728 +716 @@
                 PassVisitor<Resolver> resolver( indexer );
                 stmtExpr->accept( resolver );
-                stmtExpr->computeResult();
         }