Changeset cc287800 for src/ControlStruct/LabelGenerator.h

Timestamp:

Nov 8, 2021, 5:28:21 PM (2 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

36a05d7

Parents:

949339b (diff), 5ee153d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/ControlStruct/LabelGenerator.h (modified) (2 diffs)

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  8 10:16:00 2021
+// Update Count     : 8
 //
 
@@ -21 +21 @@
 
 class Statement;
+namespace ast {
+        class Stmt;
+        class Label;
+}
 
 namespace ControlStruct {
-        class LabelGenerator {
-          public:
-                static LabelGenerator *getGenerator();
-                Label newLabel(std::string suffix, Statement * stmt = nullptr);
-                void reset() { current = 0; }
-                void rewind() { current--; }
-          protected:
-                LabelGenerator(): current(0) {}
-          private:
-                int current;
-                static LabelGenerator *labelGenerator;
-        };
+
+class LabelGenerator {
+        static int current;
+        static LabelGenerator *labelGenerator;
+protected:
+        LabelGenerator() {}
+public:
+        static LabelGenerator *getGenerator();
+        static Label newLabel(std::string suffix, Statement * stmt = nullptr);
+        static ast::Label newLabel( const std::string&, const ast::Stmt * );
+        static void reset() { current = 0; }
+        static void rewind() { current--; }
+};
+
 } // namespace ControlStruct