Changeset b8ab91a for src/ControlStruct

Timestamp:

Nov 5, 2021, 1:46:46 PM (4 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

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

Children:

21fe17f

Parents:

77c01ec

Message:

Fix Labels pass translated. This is fix label, mult-level exit and label generator.

Location:

src/ControlStruct

Files:

• FixLabels.cpp (added)
• FixLabels.hpp (added)
• LabelGenerator.cc (modified) (3 diffs)
• LabelGenerator.h (modified) (3 diffs)
• MultiLevelExit.cpp (added)
• MultiLevelExit.hpp (added)
• module.mk (modified) (2 diffs)

src/ControlStruct/LabelGenerator.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Mar 11 22:23:20 2019
-// Update Count     : 15
+// Last Modified By : Andrew Beach
+// Last Modified On : Mon Nov  1 12:21:00 2021
+// Update Count     : 16
 //
 
@@ -19 +19 @@
 
 #include "LabelGenerator.h"
+
+#include "AST/Attribute.hpp"
+#include "AST/Label.hpp"
+#include "AST/Stmt.hpp"
 #include "SynTree/Attribute.h"  // for Attribute
 #include "SynTree/Label.h"      // for Label, operator<<
@@ -43 +47 @@
                 return l;
         }
+
+LabelGenerator_new * LabelGenerator_new::labelGenerator = nullptr;
+
+LabelGenerator_new * LabelGenerator_new::getGenerator() {
+        if ( nullptr == labelGenerator ) {
+                labelGenerator = new LabelGenerator_new();
+        }
+        return labelGenerator;
+}
+
+ast::Label LabelGenerator_new::newLabel(
+                const std::string & suffix, const ast::Stmt * stmt ) {
+        assert( stmt );
+
+        std::ostringstream os;
+        os << "__L" << current++ << "__" << suffix;
+        if ( stmt && !stmt->labels.empty() ) {
+                os << "_" << stmt->labels.front() << "__";
+        }
+        ast::Label ret_label( stmt->location, os.str() );
+        ret_label.attributes.push_back( new ast::Attribute( "unused" ) );
+        return ret_label;
+}
+
 } // namespace ControlStruct
 

src/ControlStruct/LabelGenerator.h

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 22 09:20:14 2017
-// Update Count     : 6
+// Last Modified By : Andrew Beach
+// Last Modified On : Mon Nov  1 12:19:00 2021
+// Update Count     : 7
 //
 
@@ -21 +21 @@
 
 class Statement;
+namespace ast {
+        class Stmt;
+        class Label;
+}
 
 namespace ControlStruct {
@@ -35 +39 @@
                 static LabelGenerator *labelGenerator;
         };
+
+class LabelGenerator_new {
+        int current;
+        static LabelGenerator_new *labelGenerator;
+
+        LabelGenerator_new() : current(0) {}
+public:
+        static LabelGenerator_new *getGenerator();
+
+        ast::Label newLabel( const std::string& suffix, const ast::Stmt * stmt );
+        void reset() { current = 0; }
+        void rewind() { --current; }
+};
+
 } // namespace ControlStruct
 

src/ControlStruct/module.mk

@@ -18 +18 @@
         ControlStruct/ExceptDecl.cc \
         ControlStruct/ExceptDecl.h \
+        ControlStruct/FixLabels.cpp \
+        ControlStruct/FixLabels.hpp \
         ControlStruct/ForExprMutator.cc \
         ControlStruct/ForExprMutator.h \
@@ -26 +28 @@
         ControlStruct/MLEMutator.cc \
         ControlStruct/MLEMutator.h \
+        ControlStruct/MultiLevelExit.cpp \
+        ControlStruct/MultiLevelExit.hpp \
         ControlStruct/Mutate.cc \
         ControlStruct/Mutate.h