Changeset de31a1d for src/ControlStruct/MultiLevelExit.cpp

Timestamp:

Nov 8, 2021, 10:51:48 AM (3 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

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

Children:

cb921d4

Parents:

817bb3c

Message:

Converted the two LabelGenerator? singletons into a single pure-static class.

File:

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

src/ControlStruct/MultiLevelExit.cpp

@@ -105 +105 @@
                 public ast::WithVisitorRef<MultiLevelExitCore>,
                 public ast::WithShortCircuiting, public ast::WithGuards {
-        MultiLevelExitCore( const LabelToStmt & lt, LabelGenerator_new * lg );
+        MultiLevelExitCore( const LabelToStmt & lt, LabelGenerator * lg );
 
         void previsit( const ast::FunctionDecl * );
@@ -131 +131 @@
         std::vector<Entry> enclosing_control_structures;
         ast::Label break_label;
-        LabelGenerator_new * label_gen;
+        LabelGenerator * label_gen;
         bool inFinally;
 
@@ -155 +155 @@
 
 MultiLevelExitCore::MultiLevelExitCore(
-                const LabelToStmt & lt, LabelGenerator_new * lg ) :
+                const LabelToStmt & lt, LabelGenerator * lg ) :
         target_table( lt ), break_label( CodeLocation(), "" ), label_gen( lg ),
         inFinally( false )
@@ -608 +608 @@
         const ast::CompoundStmt * stmt,
                 const LabelToStmt & labelTable,
-                LabelGenerator_new * labelGen ) {
+                LabelGenerator * labelGen ) {
         // Must start in the body, so FunctionDecls can be a stopping point.
         ast::Pass<MultiLevelExitCore> visitor( labelTable, labelGen );