Changes in src/ControlStruct/LabelGeneratorNew.cpp [400b8be:fde0a58]

File:

• src/ControlStruct/LabelGeneratorNew.cpp (modified) (3 diffs)

src/ControlStruct/LabelGeneratorNew.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// LabelGeneratorNew.cpp --
+// LabelGenerator.cc --
 //
 // Author           : Peter A. Buhr
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Mon Mar 28 10:03:00 2022
-// Update Count     : 73
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Feb  2 09:11:17 2022
+// Update Count     : 72
 //
 
@@ -25 +25 @@
 namespace ControlStruct {
 
-enum { size = 128 };
-
-static int newLabelPre( char buf[size], const string & suffix ) {
+Label newLabel( const string & suffix, const Stmt * stmt ) {
         static int current = 0;
 
+        assertf( stmt, "CFA internal error: parameter statement cannot be null pointer" );
+
+        enum { size = 128 };
+        char buf[size];                                                                         // space to build label
         int len = snprintf( buf, size, "__L%d__%s", current++, suffix.c_str() );
         assertf( len < size, "CFA Internal error: buffer overflow creating label" );
-        return len;
-}
-
-static Label newLabelPost( char buf[size], const CodeLocation & location ) {
-        Label ret_label( location, buf );
-        ret_label.attributes.push_back( new Attribute( "unused" ) );
-        return ret_label;
-}
-
-Label newLabel( const string & suffix, const Stmt * stmt ) {
-        // Buffer for string manipulation.
-        char buf[size];
-
-        assertf( stmt, "CFA internal error: parameter statement cannot be null pointer" );
-        int len = newLabelPre( buf, suffix );
 
         // What does this do?
@@ -54 +41 @@
         } // if
 
-        return newLabelPost( buf, stmt->location );
-}
-
-Label newLabel( const string & suffix, const CodeLocation & location ) {
-        // Buffer for string manipulation.
-        char buf[size];
-
-        newLabelPre( buf, suffix );
-        return newLabelPost( buf, location );
+        Label ret_label( stmt->location, buf );
+        ret_label.attributes.push_back( new Attribute( "unused" ) );
+        return ret_label;
 }