Changeset 0f8e4ac for src/ControlStruct

Timestamp:

Jun 16, 2016, 12:24:39 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

25296a3

Parents:

f4bc57c

Message:

change Label from a string typedef to a class

Location:

src/ControlStruct

Files:

• LabelFixer.cc (modified) (5 diffs)
• LabelFixer.h (modified) (3 diffs)
• LabelGenerator.cc (modified) (2 diffs)
• MLEMutator.h (modified) (4 diffs)

src/ControlStruct/LabelFixer.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// LabelFixer.cc -- 
+// LabelFixer.cc --
 //
 // Author           : Rodolfo G. Esteves
@@ -86 +86 @@
 
 
-        // sets the definition of the labelTable entry to be the provided 
+        // sets the definition of the labelTable entry to be the provided
         // statement for every label in the list parameter. Happens for every kind of statement
         Label LabelFixer::setLabelsDef( std::list< Label > &llabel, Statement *definition ) {
@@ -101 +101 @@
                         } else if ( labelTable[ *i ]->defined() ) {
                                 // defined twice, error
-                                throw SemanticError( "Duplicate definition of label: " + *i );
+                                throw SemanticError( "Duplicate definition of label: " + (*i).get_name() );
                         }       else {
                                 // used previously, but undefined until now -> link with this entry
@@ -109 +109 @@
                 } // for
 
-                // produce one of the labels attached to this statement to be 
+                // produce one of the labels attached to this statement to be
                 // temporarily used as the canonical label
                 return labelTable[ llabel.front() ]->get_label();
@@ -130 +130 @@
                 for ( std::map< Label, Entry * >::iterator i = labelTable.begin(); i != labelTable.end(); ++i ) {
                         if ( ! i->second->defined() ) {
-                                throw SemanticError( "Use of undefined label: " + i->first );
+                                throw SemanticError( "Use of undefined label: " + i->first.get_name() );
                         }
                         (*ret)[ i->first ] = i->second->get_definition();

src/ControlStruct/LabelFixer.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// LabelFixer.h -- 
+// LabelFixer.h --
 //
 // Author           : Rodolfo G. Esteves
@@ -20 +20 @@
 #include "SynTree/SynTree.h"
 #include "SynTree/Visitor.h"
+#include "SynTree/Label.h"
 #include "LabelGenerator.h"
-
 #include <map>
 
@@ -74 +74 @@
 
                   private:
-                        Label label;  
+                        Label label;
                         Statement *definition;
                 };
-                  
+
                 std::map < Label, Entry *> labelTable;
                 LabelGenerator *generator;

src/ControlStruct/LabelGenerator.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// LabelGenerator.cc -- 
+// LabelGenerator.cc --
 //
 // Author           : Rodolfo G. Esteves
@@ -18 +18 @@
 
 #include "LabelGenerator.h"
+#include "SynTree/Label.h"
 
 namespace ControlStruct {

src/ControlStruct/MLEMutator.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// MLEMutator.h -- 
+// MLEMutator.h --
 //
 // Author           : Rodolfo G. Esteves
@@ -23 +23 @@
 #include "SynTree/SynTree.h"
 #include "SynTree/Mutator.h"
+#include "SynTree/Label.h"
 
 #include "LabelGenerator.h"
@@ -38 +39 @@
                 Statement *mutate( BranchStmt *branchStmt ) throw ( SemanticError );
 
-                Statement *mutate( CaseStmt *caseStmt ); 
+                Statement *mutate( CaseStmt *caseStmt );
                 Statement *mutate( SwitchStmt *switchStmt );
                 Statement *mutate( ChooseStmt *switchStmt );
@@ -79 +80 @@
                 Statement *handleLoopStmt( LoopClass *loopStmt );
 
-                template< typename SwitchClass > 
+                template< typename SwitchClass >
                 Statement *handleSwitchStmt( SwitchClass *switchStmt );