Changeset ee3c93d

Timestamp:

Jun 4, 2018, 12:40:46 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, with_gc

Children:

2ad4b49

Parents:

b429026

git-author:

Rob Schluntz <rschlunt@…> (06/04/18 12:40:38)

git-committer:

Rob Schluntz <rschlunt@…> (06/04/18 12:40:46)

Message:

Add support for while loops with control declarations

Location:

src

Files:

• Common/PassVisitor.impl.h (modified) (2 diffs)
• ControlStruct/ForExprMutator.cc (modified) (1 diff)
• ControlStruct/ForExprMutator.h (modified) (2 diffs)
• Parser/ParseNode.h (modified) (1 diff)
• Parser/StatementNode.cc (modified) (4 diffs)
• SynTree/Statement.cc (modified) (1 diff)
• SynTree/Statement.h (modified) (1 diff)

src/Common/PassVisitor.impl.h

@@ -828 +828 @@
         VISIT_START( node );
 
-        visitExpression( node->condition );
-        node->body = visitStatement( node->body );
+        {
+                // while statements introduce a level of scope (for the initialization)
+                auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
+                maybeAccept_impl( node->initialization, *this );
+                visitExpression ( node->condition );
+                node->body = visitStatement( node->body );
+        }
 
         VISIT_END( node );
@@ -838 +843 @@
         MUTATE_START( node );
 
-        node->condition = mutateExpression( node->condition );
-        node->body      = mutateStatement ( node->body      );
+        {
+                // while statements introduce a level of scope (for the initialization)
+                auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
+                maybeMutate_impl( node->initialization, *this );
+                node->condition = mutateExpression( node->condition );
+                node->body      = mutateStatement ( node->body      );
+        }
+
 
         MUTATE_END( Statement, node );

src/ControlStruct/ForExprMutator.cc

@@ -45 +45 @@
                 return hoist( forStmt, forStmt->initialization );
         }
+        Statement *ForExprMutator::postmutate( WhileStmt *whileStmt ) {
+                return hoist( whileStmt, whileStmt->initialization );
+        }
 } // namespace ControlStruct
 

src/ControlStruct/ForExprMutator.h

@@ -18 +18 @@
 class IfStmt;
 class ForStmt;
+class WhileStmt;
 class Statement;
 
@@ -25 +26 @@
                 Statement *postmutate( IfStmt * );
                 Statement *postmutate( ForStmt * );
+                Statement *postmutate( WhileStmt * );
         };
 } // namespace ControlStruct

src/Parser/ParseNode.h

@@ -403 +403 @@
 };
 
+Expression * build_if_control( IfCtl * ctl, std::list< Statement * > & init );
 Statement * build_if( IfCtl * ctl, StatementNode * then_stmt, StatementNode * else_stmt );
 Statement * build_switch( bool isSwitch, ExpressionNode * ctl, StatementNode * stmt );

src/Parser/StatementNode.cc

@@ -80 +80 @@
 }
 
-Statement * build_if( IfCtl * ctl, StatementNode * then_stmt, StatementNode * else_stmt ) {
-        Statement * thenb, * elseb = 0;
-        std::list< Statement * > branches;
-        buildMoveList< Statement, StatementNode >( then_stmt, branches );
-        assert( branches.size() == 1 );
-        thenb = branches.front();
-
-        if ( else_stmt ) {
-                std::list< Statement * > branches;
-                buildMoveList< Statement, StatementNode >( else_stmt, branches );
-                assert( branches.size() == 1 );
-                elseb = branches.front();
-        } // if
-
-        std::list< Statement * > init;
+Expression * build_if_control( IfCtl * ctl, std::list< Statement * > & init ) {
         if ( ctl->init != 0 ) {
                 buildMoveList( ctl->init, init );
@@ -102 +88 @@
         if ( ctl->condition ) {
                 // compare the provided condition against 0
-                cond =  notZeroExpr( maybeMoveBuild< Expression >(ctl->condition) );
+                cond = notZeroExpr( maybeMoveBuild< Expression >(ctl->condition) );
         } else {
                 for ( Statement * stmt : init ) {
@@ -113 +99 @@
         }
         delete ctl;
+        return cond;
+}
+
+Statement * build_if( IfCtl * ctl, StatementNode * then_stmt, StatementNode * else_stmt ) {
+        Statement * thenb, * elseb = 0;
+        std::list< Statement * > branches;
+        buildMoveList< Statement, StatementNode >( then_stmt, branches );
+        assert( branches.size() == 1 );
+        thenb = branches.front();
+
+        if ( else_stmt ) {
+                std::list< Statement * > branches;
+                buildMoveList< Statement, StatementNode >( else_stmt, branches );
+                assert( branches.size() == 1 );
+                elseb = branches.front();
+        } // if
+
+        std::list< Statement * > init;
+        Expression * cond = build_if_control( ctl, init );
         return new IfStmt( cond, thenb, elseb, init );
 }
@@ -144 +149 @@
         buildMoveList< Statement, StatementNode >( stmt, branches );
         assert( branches.size() == 1 );
-        return new WhileStmt( notZeroExpr( maybeMoveBuild< Expression >(ctl) ), branches.front(), kind );
+
+        std::list< Statement * > init;
+        return new WhileStmt( notZeroExpr( maybeMoveBuild< Expression >(ctl) ), branches.front(), init, kind );
 }
 

src/SynTree/Statement.cc

@@ -243 +243 @@
 }
 
-WhileStmt::WhileStmt( Expression *condition, Statement *body, bool isDoWhile ):
-        Statement(), condition( condition), body( body), isDoWhile( isDoWhile) {
+WhileStmt::WhileStmt( Expression *condition, Statement *body, std::list< Statement * > & initialization, bool isDoWhile ):
+        Statement(), condition( condition), body( body), initialization( initialization ), isDoWhile( isDoWhile) {
 }
 

src/SynTree/Statement.h

@@ -220 +220 @@
         Expression *condition;
         Statement *body;
+        std::list<Statement *> initialization;
         bool isDoWhile;
 
         WhileStmt( Expression *condition,
-               Statement *body, bool isDoWhile = false );
+               Statement *body, std::list<Statement *> & initialization, bool isDoWhile = false );
         WhileStmt( const WhileStmt &other );
         virtual ~WhileStmt();