Changeset b56ad5e for src/ControlStruct/LabelGenerator.cc

Timestamp:

Feb 4, 2022, 10:10:34 PM (4 years ago)

Author:

Fangren Yu <f37yu@…>

Branches:

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

Children:

f8143a6

Parents:

5f3ba11 (diff), 67e86ae6 (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.cc (modified) (3 diffs)

src/ControlStruct/LabelGenerator.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Mon Nov  8 10:18:00 2021
-// Update Count     : 17
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon Jan 31 22:30:26 2022
+// Update Count     : 28
 //
 
@@ -17 +17 @@
 #include <sstream>              // for ostringstream
 #include <list>                 // for list
+using namespace std;
 
 #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<<
@@ -28 +26 @@
 
 namespace ControlStruct {
-
 int LabelGenerator::current = 0;
 LabelGenerator * LabelGenerator::labelGenerator = nullptr;
 
-        LabelGenerator * LabelGenerator::getGenerator() {
-                if ( LabelGenerator::labelGenerator == 0 )
-                        LabelGenerator::labelGenerator = new LabelGenerator();
-                return labelGenerator;
-        }
-
-        Label LabelGenerator::newLabel( std::string suffix, Statement * stmt ) {
-                std::ostringstream os;
-                os << "__L" << current++ << "__" << suffix;
-                if ( stmt && ! stmt->get_labels().empty() ) {
-                        os << "_" << stmt->get_labels().front() << "__";
-                } // if
-                std::string ret = os.str();
-                Label l( ret );
-                l.get_attributes().push_back( new Attribute("unused") );
-                return l;
-        }
-
-ast::Label LabelGenerator::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;
+LabelGenerator * LabelGenerator::getGenerator() {
+        if ( LabelGenerator::labelGenerator == 0 )
+                LabelGenerator::labelGenerator = new LabelGenerator();
+        return labelGenerator;
 }
 
+Label LabelGenerator::newLabel( string suffix, Statement * stmt ) {
+        ostringstream os;
+        os << "__L_OLD" << current++ << "__" << suffix;
+        if ( stmt && ! stmt->get_labels().empty() ) {
+                os << "_" << stmt->get_labels().front() << "__";
+        } // if
+        string ret = os.str();
+        Label l( ret );
+        l.get_attributes().push_back( new Attribute( "unused" ) );
+        return l;
+}
 } // namespace ControlStruct
 
 // Local Variables: //
-// tab-width: 4 //
 // mode: c++ //
-// compile-command: "make install" //
 // End: //