Changeset 3b0bc16 for src/ControlStruct/MultiLevelExit.cpp

Timestamp:

Feb 1, 2022, 8:22:12 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

fde0a58

Parents:

729c991

Message:

change class name WhileStmt? to WhileDoStmt?, add else clause to WhileDoStmt? and ForStmt?, change names thenPart/ElsePart to then/else_

File:

• src/ControlStruct/MultiLevelExit.cpp (modified) (8 diffs)

src/ControlStruct/MultiLevelExit.cpp

@@ -10 +10 @@
 // Created On       : Mon Nov  1 13:48:00 2021
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jan 31 22:35:08 2022
-// Update Count     : 28
+// Last Modified On : Tue Feb  1 18:48:47 2022
+// Update Count     : 29
 //
 
@@ -40 +40 @@
 
         enum Kind {
-                ForStmtK, WhileStmtK, CompoundStmtK, IfStmtK, CaseStmtK, SwitchStmtK, TryStmtK
+                ForStmtK, WhileDoStmtK, CompoundStmtK, IfStmtK, CaseStmtK, SwitchStmtK, TryStmtK
         } kind;
 
@@ -53 +53 @@
         Entry( const ForStmt * stmt, Label breakExit, Label contExit ) :
                 stmt( stmt ), firstTarget( breakExit ), secondTarget( contExit ), kind( ForStmtK ) {}
-        Entry( const WhileStmt * stmt, Label breakExit, Label contExit ) :
-                stmt( stmt ), firstTarget( breakExit ), secondTarget( contExit ), kind( WhileStmtK ) {}
+        Entry( const WhileDoStmt * stmt, Label breakExit, Label contExit ) :
+                stmt( stmt ), firstTarget( breakExit ), secondTarget( contExit ), kind( WhileDoStmtK ) {}
         Entry( const CompoundStmt *stmt, Label breakExit ) :
                 stmt( stmt ), firstTarget( breakExit ), secondTarget(), kind( CompoundStmtK ) {}
@@ -66 +66 @@
                 stmt( stmt ), firstTarget( breakExit ), secondTarget(), kind( TryStmtK ) {}
 
-        bool isContTarget() const { return kind <= WhileStmtK; }
+        bool isContTarget() const { return kind <= WhileDoStmtK; }
         bool isBreakTarget() const { return kind != CaseStmtK; }
         bool isFallTarget() const { return kind == CaseStmtK; }
@@ -72 +72 @@
 
         // These routines set a target as being "used" by a BranchStmt
-        Label useContExit() { assert( kind <= WhileStmtK ); return useTarget(secondTarget); }
+        Label useContExit() { assert( kind <= WhileDoStmtK ); return useTarget(secondTarget); }
         Label useBreakExit() { assert( kind != CaseStmtK ); return useTarget(firstTarget); }
         Label useFallExit() { assert( kind == CaseStmtK );  return useTarget(firstTarget); }
@@ -78 +78 @@
 
         // These routines check if a specific label for a statement is used by a BranchStmt
-        bool isContUsed() const { assert( kind <= WhileStmtK ); return secondTarget.used; }
+        bool isContUsed() const { assert( kind <= WhileDoStmtK ); return secondTarget.used; }
         bool isBreakUsed() const { assert( kind != CaseStmtK ); return firstTarget.used; }
         bool isFallUsed() const { assert( kind == CaseStmtK ); return firstTarget.used; }
@@ -112 +112 @@
         const CompoundStmt * previsit( const CompoundStmt * );
         const BranchStmt * postvisit( const BranchStmt * );
-        void previsit( const WhileStmt * );
-        const WhileStmt * postvisit( const WhileStmt * );
+        void previsit( const WhileDoStmt * );
+        const WhileDoStmt * postvisit( const WhileDoStmt * );
         void previsit( const ForStmt * );
         const ForStmt * postvisit( const ForStmt * );
@@ -342 +342 @@
 }
 
-void MultiLevelExitCore::previsit( const WhileStmt * stmt ) {
+void MultiLevelExitCore::previsit( const WhileDoStmt * stmt ) {
         return prehandleLoopStmt( stmt );
 }
 
-const WhileStmt * MultiLevelExitCore::postvisit( const WhileStmt * stmt ) {
+const WhileDoStmt * MultiLevelExitCore::postvisit( const WhileDoStmt * stmt ) {
         return posthandleLoopStmt( stmt );
 }