Changeset c28a038d for src

Timestamp:

Jan 31, 2018, 4:53:23 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

c453ac4

Parents:

4670c79

Message:

Refactor resolveWith

File:

• src/ResolvExpr/Resolver.cc (modified) (6 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 resolveAggrInit( ReferenceToType *, InitIterator &, InitIterator & );
-          void resolveSingleAggrInit( Declaration *, InitIterator &, InitIterator &, TypeSubstitution sub );
-          void fallbackInit( ConstructorInit * ctorInit );
+                void resolveWithExprs( std::list< Expression * > & withExprs, std::list< Statement * > & newStmts );
+                void fallbackInit( ConstructorInit * ctorInit );
 
                 Type * functionReturn = nullptr;
@@ -269 +268 @@
                 std::cerr << std::endl;
 #endif
-                Type *new_type = resolveTypeof( functionDecl->get_type(), indexer );
+                Type *new_type = resolveTypeof( functionDecl->type, indexer );
                 functionDecl->set_type( new_type );
                 GuardValue( functionReturn );
@@ -279 +278 @@
                 // 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->get_functionType()->get_parameters() ) {
+                for ( Declaration * d : functionDecl->type->parameters ) {
                         if ( ObjectDecl * obj = dynamic_cast< ObjectDecl * >( d ) ) {
-                                if ( SingleInit * init = dynamic_cast< SingleInit * >( obj->get_init() ) ) {
-                                        delete init->get_value()->get_env();
-                                        init->get_value()->set_env( nullptr );
+                                if ( SingleInit * init = dynamic_cast< SingleInit * >( obj->init ) ) {
+                                        delete init->value->env;
+                                        init->value->env = nullptr;
                                 }
                         }
@@ -584 +583 @@
         }
 
-
-        void Resolver::previsit( WithStmt * withStmt ) {
-                for ( Expression *& expr : withStmt->exprs )  {
+        void Resolver::resolveWithExprs( std::list< Expression * > & withExprs, std::list< Statement * > & newStmts ) {
+                for ( Expression *& expr : withExprs )  {
                         // only struct- and union-typed expressions are viable candidates
                         findKindExpression( expr, indexer, "with statement", isStructOrUnion );
@@ -595 +593 @@
                                 ObjectDecl * tmp = ObjectDecl::newObject( tmpNamer.newName(), expr->result->clone(), new SingleInit( expr ) );
                                 expr = new VariableExpr( tmp );
-                                stmtsToAddBefore.push_back( new DeclStmt( tmp ) );
+                                newStmts.push_back( new DeclStmt( tmp ) );
                                 if ( InitTweak::isConstructable( tmp->type ) ) {
                                         // generate ctor/dtor and resolve them
@@ -603 +601 @@
                         }
                 }
+        }
+
+        void Resolver::previsit( WithStmt * withStmt ) {
+                resolveWithExprs( withStmt->exprs, stmtsToAddBefore );
         }