Changeset 9bdb8b7

Timestamp:

Oct 25, 2019, 5:44:25 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

c3a2007

Parents:

89124ff

Message:

allow labelled break from within the body of a try statement

Files:

• src/ControlStruct/MLEMutator.cc (modified) (2 diffs)
• src/ControlStruct/MLEMutator.h (modified) (3 diffs)
• tests/labelledExit.cfa (modified) (2 diffs)

src/ControlStruct/MLEMutator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar  8 17:08:25 2018
-// Update Count     : 219
+// Last Modified On : Tue Oct 22 17:22:44 2019
+// Update Count     : 220
 //
 
@@ -313 +313 @@
         }
 
+        void MLEMutator::premutate( TryStmt * tryStmt ) {
+                // generate a label for breaking out of a labeled if
+                bool labeledBlock = !(tryStmt->get_labels().empty());
+                if ( labeledBlock ) {
+                        Label brkLabel = generator->newLabel("blockBreak", tryStmt);
+                        enclosingControlStructures.push_back( Entry( tryStmt, brkLabel ) );
+                        GuardAction( [this]() { enclosingControlStructures.pop_back(); } );
+                } // if
+        }
+
+        Statement * MLEMutator::postmutate( TryStmt * tryStmt ) {
+                bool labeledBlock = !(tryStmt->get_labels().empty());
+                if ( labeledBlock ) {
+                        if ( ! enclosingControlStructures.back().useBreakExit().empty() ) {
+                                set_breakLabel( enclosingControlStructures.back().useBreakExit() );
+                        } // if
+                } // if
+                return tryStmt;
+        }
+
         void MLEMutator::premutate( CaseStmt *caseStmt ) {
                 visit_children = false;

src/ControlStruct/MLEMutator.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar  8 16:42:32 2018
-// Update Count     : 41
+// Last Modified On : Tue Oct 22 17:22:47 2019
+// Update Count     : 45
 //
 
@@ -47 +47 @@
                 void premutate( SwitchStmt *switchStmt );
                 Statement * postmutate( SwitchStmt *switchStmt );
+                void premutate( TryStmt *tryStmt );
+                Statement * postmutate( TryStmt *tryStmt );
 
                 Statement *mutateLoop( Statement *bodyLoop, Entry &e );
@@ -73 +75 @@
                         explicit Entry( SwitchStmt *stmt, Label breakExit, Label fallDefaultExit ) :
                                 stmt( stmt ), breakExit( breakExit ), fallDefaultExit( fallDefaultExit ) {}
+
+                        explicit Entry( TryStmt *stmt, Label breakExit ) :
+                                stmt( stmt ), breakExit( breakExit ) {}
 
                         bool operator==( const Statement *other ) { return stmt == other; }

tests/labelledExit.cfa

@@ -10 +10 @@
 // Created On       : Wed Aug 10 07:29:39 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Nov  6 17:57:42 2018
-// Update Count     : 4
+// Last Modified On : Fri Oct 25 17:41:51 2019
+// Update Count     : 7
 // 
 
@@ -136 +136 @@
         }
 
+        // all nested control options, labelled exits
+
+  Comp: {
+          Try: try {
+                  For: for ( ;; ) {
+                          While: while ( true ) {
+                                  Do: do {
+                                          If: if ( true ) {
+                                                  Switch2: switch ( 3 ) {
+                                                          case 3:
+                                                                break Try;
+                                                                break Comp;
+                                                                break For;              continue For;
+                                                                break While;    continue While;
+                                                                break Do;               continue Do;
+                                                                break If;
+                                                                break Switch2;
+                                                        } // switch
+                                                } // if
+                                        } while ( true );
+                                } // while
+                        } // for
+                } finally {} // always executed
+        } // compound
+
         // computed goto
         // {