Changeset b6923b17

Timestamp:

Jul 24, 2024, 12:22:52 PM (111 minutes ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Parents:

35c792f

Message:

Fixed goto labelled loop. I had to reorder some passes. Updated control declaration hoisting (including comments and correcting update count). Added test, moved more tests into ctrl-flow.

Files:

• src/ControlStruct/HoistControlDecls.cpp (modified) (3 diffs)
• src/ControlStruct/HoistControlDecls.hpp (modified) (2 diffs)
• src/main.cpp (modified) (3 diffs)
• tests/.expect/labelledExit.txt (deleted)
• tests/Makefile.am (modified) (1 diff)
• tests/ctrl-flow/.expect/fallthrough.txt (moved) (moved from tests/.expect/fallthrough.txt)
• tests/ctrl-flow/.expect/goto.txt (added)
• tests/ctrl-flow/.expect/labelledExit.txt (added)
• tests/ctrl-flow/fallthrough.cfa (moved) (moved from tests/fallthrough.cfa)
• tests/ctrl-flow/goto.cfa (added)
• tests/ctrl-flow/labelledExit.cfa (moved) (moved from tests/labelledExit.cfa)

src/ControlStruct/HoistControlDecls.cpp

@@ -9 +9 @@
 // Author           : Andrew Beach
 // Created On       : Fri Dec  3 15:34:00 2021
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Feb  1 18:59:47 2022
-// Update Count     : 25
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Jul 24 12:00:00 2024
+// Update Count     : 3
 //
 
@@ -23 +23 @@
 namespace ControlStruct {
 
+namespace {
+
 template<typename StmtT>
 const Stmt * hoist( const StmtT * stmt ) {
-        // If no hoisting is needed, then make no changes.
-
-        if ( stmt->inits.size() == 0 ) {                                        // no declarations ?
+        // If no hoisting is needed (no declaration), then make no changes.
+        if ( stmt->inits.size() == 0 ) {
                 // if ( /* no conditional declarations */ ...  ) ...
                 return stmt;
-        } // if
+        }
 
-        // Put hoist declarations and modified statement in a compound statement.
-
-        CompoundStmt * block = new CompoundStmt( stmt->location ); // create empty compound statement
+        StmtT * mutStmt = mutate( stmt );
+        CompoundStmt * block = new CompoundStmt( stmt->location );
         //    {}
 
-        for ( const Stmt * next : stmt->inits ) {                       // link conditional declarations into compound
+        //    Label: if ( int x = f(), y = g(); ... ) ...
+        // link declarations into compound statement
+        for ( const Stmt * next : mutStmt->inits ) {
                 block->kids.push_back( next );
         }
-        //    if ( int x = f(), y = g(); ... ) ...
-        // link declarations into compound statement
         //    {
         //         int x = f();
         //         int y = g();
         //    }
+        mutStmt->inits.clear();
+        //    Label: if ( ... ) ...
 
-        StmtT * mutStmt = mutate( stmt );                                       // create mutate handle to change statement
-        mutStmt->inits.clear();                                                         // remove declarations
+        block->labels.swap( mutStmt->labels );
+        //    Label: {
+        //        int x = f();
+        //        int y = g();
+        //    }
         //    if ( ... ) ...
 
-        block->kids.push_back( mutStmt );                                       // link modified statement into compound
-        //    {
+        block->kids.push_back( mutStmt );
+        //    Label: {
         //        int x = f();
         //        int y = g();
@@ -73 +78 @@
 };
 
+} // namespace
+
 // Hoist initialization out of for statements.
 void hoistControlDecls( TranslationUnit & translationUnit ) {

src/ControlStruct/HoistControlDecls.hpp

@@ -9 +9 @@
 // Author           : Andrew Beach
 // Created On       : Fri Dec  3 15:31:00 2021
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jan 31 22:25:07 2022
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Jul 24 12:04:00 2024
 // Update Count     : 3
 //
@@ -21 +21 @@
 
 namespace ControlStruct {
+
 /// Hoist declarations out of control flow statements into compound statement.
-/// Must happen before auto-gen routines are added.
+/// Must happen before auto-gen routines are added and after loop control
+/// flow is resolved.
 void hoistControlDecls( ast::TranslationUnit & translationUnit );
+
 } // namespace ControlStruct
 

src/main.cpp

@@ -331 +331 @@
                 PASS( "Fix Unique Ids", Validate::fixUniqueIds, transUnit );
                 PASS( "Implement Corun", Concurrency::implementCorun, transUnit );
+                PASS( "Fix Label Address", Validate::fixLabelAddresses, transUnit );
+                PASS( "Fix Labels", ControlStruct::fixLabels, transUnit );
                 PASS( "Hoist Control Declarations", ControlStruct::hoistControlDecls, transUnit );
 
@@ -342 +344 @@
                 PASS( "Set Length From Initializer", Validate::setLengthFromInitializer, transUnit );
                 PASS( "Find Global Decls", Validate::findGlobalDecls, transUnit );
-                PASS( "Fix Label Address", Validate::fixLabelAddresses, transUnit );
 
                 if ( symtabp ) {
@@ -356 +357 @@
 
                 PASS( "Translate Throws", ControlStruct::translateThrows, transUnit );
-                PASS( "Fix Labels", ControlStruct::fixLabels, transUnit );
                 PASS( "Implement Waituntil", Concurrency::generateWaitUntil, transUnit  );
                 PASS( "Fix Names", CodeGen::fixNames, transUnit );

tests/Makefile.am

@@ -208 +208 @@
 
 SYNTAX_ONLY_CODE = expression typedefRedef variableDeclarator switch numericConstants identFuncDeclarator \
-        init1 limits nested-types cast labelledExit array quasiKeyword include/stdincludes include/includes builtins/sync warnings/self-assignment concurrency/waitfor/parse
+        init1 limits nested-types cast ctrl-flow/labelledExit array quasiKeyword include/stdincludes include/includes builtins/sync warnings/self-assignment concurrency/waitfor/parse
 ${SYNTAX_ONLY_CODE} : % : %.cfa ${CFACCBIN}
         ${CFACOMPILE_SYNTAX}