Changeset 88bc876

Timestamp:

Jul 16, 2024, 5:28:10 PM (7 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

97f9619

Parents:

2363147

Message:

Breaks (and some other control flow) in a loop else clause now work. I also implemented else clauses in printing and code generation.

Files:

• src/AST/Print.cpp (modified) (3 diffs)
• src/CodeGen/CodeGenerator.cpp (modified) (2 diffs)
• src/ControlStruct/MultiLevelExit.cpp (modified) (7 diffs)
• tests/ctrl-flow/.expect/loop_else.txt (modified) (1 diff)
• tests/ctrl-flow/loop_else.cfa (modified) (2 diffs)

src/AST/Print.cpp

@@ -566 +566 @@
                 ++indent;
                 safe_print( node->cond );
-                os << indent-1 << "... with body:" << endl;
-                safe_print( node->body );
 
                 if ( ! node->inits.empty() ) {
@@ -573 +571 @@
                         printAll( node->inits );
                 }
+
+                os << indent-1 << "... with body:" << endl;
+                safe_print( node->body );
+
+                if ( node->else_ ) {
+                        os << indent-1 << "... with else:" << endl;
+                        os << indent;
+                        node->else_->accept( *this );
+                }
+
                 --indent;
 
@@ -614 +622 @@
                         --indent;
                 }
+
+                if ( node->else_ ) {
+                        os << indent << "... with else:" << endl;
+                        ++indent;
+                        os << indent;
+                        node->else_->accept( *this );
+                        --indent;
+                }
+
                 os << endl;
                 print( node->labels );

src/CodeGen/CodeGenerator.cpp

@@ -1195 +1195 @@
         stmt->body->accept( *visitor );
 
-        output << indent;
-
         if ( stmt->isDoWhile ) {
                 output << " while (";
                 stmt->cond->accept( *visitor );
-                output << ");";
+                output << ( ( nullptr == stmt->else_ ) ? ");" : ")" );
+        }
+        if ( stmt->else_ ) {
+                output << " else ";
+                stmt->else_->accept( *visitor );
         }
 }
@@ -1225 +1227 @@
                 stmt->body->accept( *visitor );
         }
+
+        if ( nullptr != stmt->else_ ) {
+                assertf( !options.genC, "Loop else should not reach code generation." );
+                output << " else ";
+                stmt->else_->accept( *visitor );
+        }
 }
 

src/ControlStruct/MultiLevelExit.cpp

@@ -78 +78 @@
                 stmt( stmt ), firstTarget( breakExit ), secondTarget(), kind( TryStmtK ) {}
 
+        // Check if this entry can be the target of the given type of control flow.
         bool isContTarget() const { return kind <= WhileDoStmtK; }
         bool isBreakTarget() const { return kind != CaseClauseK; }
@@ -207 +208 @@
 
         // If the label is empty, do not add unused attribute.
-  if ( originalTarget.empty() ) return size;
+        if ( originalTarget.empty() ) return size;
 
         // Search for a label that matches the originalTarget.
@@ -343 +344 @@
                 assert(0);
         }
+        assert( !exitLabel.empty() );
 
         // Add unused attribute to silence warnings.
@@ -486 +488 @@
                 }
 
-                auto caseStmt = mutStmt->cases.back().get();
-                auto mutCase = mutate( caseStmt );
-                mutStmt->cases.back() = mutCase;
+                auto mutCase = mutStmt->cases.back().get_and_mutate();
 
                 Label label( mutCase->location, "breakLabel" );
@@ -597 +597 @@
 template<typename LoopNode>
 void MultiLevelExitCore::prehandleLoopStmt( const LoopNode * loopStmt ) {
-        // Remember is loop before going onto mutate the body.
+        // Create temporary labels and mark the enclosing loop before traversal.
         // The labels will be folded in if they are used.
         Label breakLabel = newLabel( "loopBreak", loopStmt );
         Label contLabel = newLabel( "loopContinue", loopStmt );
         enclosing_control_structures.emplace_back( loopStmt, breakLabel, contLabel );
-        // labels are added temporarily to see if they are used and then added permanently in postvisit if ther are used
-        // children will tag labels as being used during their traversal which occurs before postvisit
-
-        // GuardAction calls the lambda after the node is done being visited
+
         GuardAction( [this](){ enclosing_control_structures.pop_back(); } );
+
+        // Because of fixBlock, this should be empty now (and must be).
+        assert( nullptr == loopStmt->else_ );
 }
 
@@ -617 +617 @@
         // Now check if the labels are used and add them if so.
         return mutate_field( loopStmt, &LoopNode::body, mutateLoop( loopStmt->body, entry ) );
-        // this call to mutate_field compares loopStmt->body and the result of mutateLoop
-        //              if they are the same the node isn't mutated, if they differ then the new mutated node is returned
-        //              the stmts will only differ if a label is used
 }
 
@@ -639 +636 @@
 
                 ptr<Stmt> else_stmt = nullptr;
-                const Stmt * loop_kid = nullptr;
+                const Stmt * to_visit;
                 // check if loop node and if so add else clause if it exists
-                const WhileDoStmt * whilePtr = kid.as<WhileDoStmt>();
-                if ( whilePtr && whilePtr->else_ ) {
-                        else_stmt = whilePtr->else_;
-                        loop_kid = mutate_field( whilePtr, &WhileDoStmt::else_, nullptr );
-                }
-                const ForStmt * forPtr = kid.as<ForStmt>();
-                if ( forPtr && forPtr->else_ ) {
-                        else_stmt = forPtr->else_;
-                        loop_kid = mutate_field( forPtr, &ForStmt::else_, nullptr );
-                }
-
+                if ( auto ptr = kid.as<WhileDoStmt>() ; ptr && ptr->else_ ) {
+                        else_stmt = ptr->else_;
+                        to_visit = mutate_field( ptr, &WhileDoStmt::else_, nullptr );
+                } else if ( auto ptr = kid.as<ForStmt>() ; ptr && ptr->else_ ) {
+                        else_stmt = ptr->else_;
+                        to_visit = mutate_field( ptr, &ForStmt::else_, nullptr );
+                } else {
+                        to_visit = kid.get();
+                }
+
+                // This is the main (safe) visit of the child node.
                 try {
-                        if (else_stmt) ret.push_back( loop_kid->accept( *visitor ) );
-                        else ret.push_back( kid->accept( *visitor ) );
+                        ret.push_back( to_visit->accept( *visitor ) );
                 } catch ( SemanticErrorException & e ) {
                         errors.append( e );
                 }
 
-                if (else_stmt) ret.push_back(else_stmt);
-
-                if ( ! break_label.empty() ) {
+                // The following sections handle visiting loop else clause and makes
+                // sure breaking from a loop body does not execute that clause.
+                Label local_break_label = std::move( break_label );
+                break_label = Label( CodeLocation(), "" );
+
+                if ( else_stmt ) try {
+                        ret.push_back( else_stmt->accept( *visitor ) );
+                } catch ( SemanticErrorException & e ) {
+                        errors.append( e );
+                }
+
+                if ( !break_label.empty() ) {
                         ret.push_back( labelledNullStmt( ret.back()->location, break_label ) );
                         break_label = Label( CodeLocation(), "" );
                 }
-        }
-
-        if ( ! errors.isEmpty() ) {
+
+                // This handles a break from the body or non-loop statement.
+                if ( !local_break_label.empty() ) {
+                        ret.push_back( labelledNullStmt( ret.back()->location, local_break_label ) );
+                }
+        }
+
+        if ( !errors.isEmpty() ) {
                 throw errors;
         }

tests/ctrl-flow/.expect/loop_else.txt

@@ -63 +63 @@
 (10 10)(9 9)(8 8)(7 7)(6 6)(5 5)(4 4)(3 3)(2 2)(1 1)(0 0)else
 
+before begin else after

tests/ctrl-flow/loop_else.cfa

@@ -74 +74 @@
                 i -= 1.7;
         } else { sout | "else"; }                                                                                                               sout | nl | nl;
-        
+
         enum { N = 10 };
         for ( N ) { sout | "N"; } else { sout | "else"; }                                                       sout | nl;
@@ -109 +109 @@
         for ( s; (S){0} -~  (S){10,10} ~ (S){1} ) { sout | s; } else { sout | "else"; } sout | nl;
         for ( s; (S){0} -~= (S){10,10} ) { sout | s; } else { sout | "else"; }           sout | nl;
-        for ( s; (S){0} -~= (S){10,10} ~ (S){1} ) { sout | s; } else { sout | "else"; } sout | nl | nl;
+        for ( s; (S){0} -~= (S){10,10} ~ (S){1} ) { sout | s; } else { sout | "else"; } sout | nl;
+        sout | nl;
+
+        // A break (or a continue) in an else clause should target an outer loop.
+        sout | "before";
+        while ( true ) {
+                sout | " begin";
+                while ( false ) {
+                        sout | "never";
+                } else {
+                        sout | " else";
+                        break;
+                }
+                sout | " end";
+        }
+        sout | " after" | nl;
 }