Changeset bee0694

Timestamp:

Jan 29, 2019, 4:15:27 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

no_list

Children:

bbbc067

Parents:

70a1c3ae

Message:

Changed std::list<Label> to vector

Location:

src

Files:

• CodeGen/CodeGenerator.cc (modified) (3 diffs)
• CodeGen/CodeGenerator.h (modified) (1 diff)
• ControlStruct/LabelFixer.cc (modified) (3 diffs)
• ControlStruct/LabelFixer.h (modified) (1 diff)
• ControlStruct/MLEMutator.cc (modified) (4 diffs)
• InitTweak/GenInit.cc (modified) (1 diff)
• Parser/ParseNode.h (modified) (1 diff)
• SynTree/Label.h (modified) (1 diff)
• SynTree/Statement.cc (modified) (4 diffs)
• SynTree/Statement.h (modified) (5 diffs)

src/CodeGen/CodeGenerator.cc

@@ -63 +63 @@
         } // extension
 
-        CodeGenerator::LabelPrinter & CodeGenerator::LabelPrinter::operator()( std::list< Label > & l ) {
+        CodeGenerator::LabelPrinter & CodeGenerator::LabelPrinter::operator()( std::vector< Label > & l ) {
                 labels = &l;
                 return *this;
@@ -69 +69 @@
 
         ostream & operator<<( ostream & output, CodeGenerator::LabelPrinter & printLabels ) {
-                std::list< Label > & labs = *printLabels.labels;
+                std::vector< Label >  & labs = *printLabels.labels;
                 // l.unique(); // assumes a sorted list. Why not use set? Does order matter?
                 for ( Label & l : labs ) {
@@ -911 +911 @@
                 if ( ! asmStmt->get_gotolabels().empty() ) {
                         output << " : ";
-                        for ( std::list<Label>::iterator begin = asmStmt->get_gotolabels().begin();; ) {
+                        for ( std::vector< Label > ::iterator begin = asmStmt->get_gotolabels().begin();; ) {
                                 output << *begin++;
                                 if ( begin == asmStmt->get_gotolabels().end() ) break;

src/CodeGen/CodeGenerator.h

@@ -124 +124 @@
                 struct LabelPrinter {
                         LabelPrinter(CodeGenerator &cg) : cg(cg), labels( 0 ) {}
-                        LabelPrinter & operator()( std::list< Label > & l );
+                        LabelPrinter & operator()( std::vector< Label >  & l );
                         CodeGenerator & cg;
-                        std::list< Label > * labels;
+                        std::vector< Label >  * labels;
                 };
 

src/ControlStruct/LabelFixer.cc

@@ -50 +50 @@
         // prune to at most one label definition for each statement
         void LabelFixer::previsit( Statement *stmt ) {
-                std::list< Label > &labels = stmt->get_labels();
+                std::vector< Label >  &labels = stmt->get_labels();
 
                 if ( ! labels.empty() ) {
@@ -77 +77 @@
         // 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 ) {
+        Label LabelFixer::setLabelsDef( std::vector< Label >  &llabel, Statement *definition ) {
                 assert( definition != 0 );
                 assert( llabel.size() > 0 );
@@ -83 +83 @@
                 Entry * e = new Entry( definition );
 
-                for ( std::list< Label >::iterator i = llabel.begin(); i != llabel.end(); i++ ) {
+                for ( std::vector< Label > ::iterator i = llabel.begin(); i != llabel.end(); i++ ) {
                         Label & l = *i;
                         l.set_statement( definition ); // attach statement to the label to be used later

src/ControlStruct/LabelFixer.h

@@ -46 +46 @@
                 void previsit( LabelAddressExpr *addrExpr );
 
-                Label setLabelsDef( std::list< Label > &, Statement *definition );
+                Label setLabelsDef( std::vector< Label >  &, Statement *definition );
                 template< typename UsageNode >
                 void setLabelsUsg( Label, UsageNode *usage = 0 );

src/ControlStruct/MLEMutator.cc

@@ -70 +70 @@
                         if ( ! get_breakLabel().empty() ) {
                                 std::list< Statement * >::iterator next = k+1;
-                                std::list<Label> ls; ls.push_back( get_breakLabel() );
+                                std::vector< Label >  ls; ls.push_back( get_breakLabel() );
                                 kids.insert( next, new NullStmt( ls ) );
                                 set_breakLabel("");
@@ -242 +242 @@
                 if ( e.isContUsed() ) {
                         // continue label goes in the body as the last statement
-                        std::list< Label > labels; labels.push_back( e.useContExit() );
+                        std::vector< Label >  labels; labels.push_back( e.useContExit() );
                         newBody->get_kids().push_back( new NullStmt( labels ) );
                 } // if
@@ -336 +336 @@
                                 assert( ! enclosingControlStructures.empty() );
                                 if ( enclosingControlStructures.back().isFallUsed() ) {
-                                        std::list<Label> ls{ enclosingControlStructures.back().useFallExit() };
+                                        std::vector< Label >  ls{ enclosingControlStructures.back().useFallExit() };
                                         caseStmt->stmts.push_back( new NullStmt( ls ) );
                                 } // if
@@ -346 +346 @@
                         if ( enclosingControlStructures.back().isFallDefaultUsed() ) {
                                 // add fallthrough default label if necessary
-                                std::list<Label> ls{ enclosingControlStructures.back().useFallDefaultExit() };
+                                std::vector< Label >  ls{ enclosingControlStructures.back().useFallDefaultExit() };
                                 caseStmt->stmts.push_front( new NullStmt( ls ) );
                         } // if

src/InitTweak/GenInit.cc

@@ -45 +45 @@
 namespace InitTweak {
         namespace {
-                const std::list<Label> noLabels;
+                const std::vector< Label >  noLabels;
                 const std::list<Expression *> noDesignators;
         }

src/Parser/ParseNode.h

@@ -169 +169 @@
 
 struct LabelNode {
-        std::list< Label > labels;
+        std::vector< Label >  labels;
 };
 

src/SynTree/Label.h

@@ -49 +49 @@
 inline std::ostream & operator<<( std::ostream & out, const Label & l ) { return out << l.get_name(); }
 
-static const std::list< Label > noLabels;
+static const std::vector< Label >  noLabels;
 
 // Local Variables: //

src/SynTree/Statement.cc

@@ -32 +32 @@
 using std::endl;
 
-Statement::Statement( const std::list<Label> & labels ) : labels( labels ) {}
+Statement::Statement( const std::vector< Label >  & labels ) : labels( labels ) {}
 
 void Statement::print( std::ostream & os, Indenter indent ) const {
@@ -60 +60 @@
 
 
-AsmStmt::AsmStmt( bool voltile, Expression *instruction, std::list<Expression *> output, std::list<Expression *> input, std::list<ConstantExpr *> clobber, std::list<Label> gotolabels ) : Statement(), voltile( voltile ), instruction( instruction ), output( output ), input( input ), clobber( clobber ), gotolabels( gotolabels ) {}
+AsmStmt::AsmStmt( bool voltile, Expression *instruction, std::list<Expression *> output, std::list<Expression *> input, std::list<ConstantExpr *> clobber, std::vector< Label >  gotolabels ) : Statement(), voltile( voltile ), instruction( instruction ), output( output ), input( input ), clobber( clobber ), gotolabels( gotolabels ) {}
 
 AsmStmt::AsmStmt( const AsmStmt & other ) : Statement( other ), voltile( other.voltile ), instruction( maybeClone( other.instruction ) ), gotolabels( other.gotolabels ) {
@@ -223 +223 @@
 }
 
-CaseStmt * CaseStmt::makeDefault( const std::list<Label> & labels, std::list<Statement *> stmts ) {
+CaseStmt * CaseStmt::makeDefault( const std::vector< Label >  & labels, std::list<Statement *> stmts ) {
         CaseStmt * stmt = new CaseStmt( nullptr, stmts, true );
         stmt->labels = labels;
@@ -511 +511 @@
 
 
-NullStmt::NullStmt( const std::list<Label> & labels ) : Statement( labels ) {
+NullStmt::NullStmt( const std::vector< Label >  & labels ) : Statement( labels ) {
 }
 

src/SynTree/Statement.h

@@ -35 +35 @@
 class Statement : public BaseSyntaxNode {
   public:
-        std::list<Label> labels;
-
-        Statement( const std::list<Label> & labels = {} );
+        std::vector< Label >  labels;
+
+        Statement( const std::vector< Label >  & labels = {} );
         virtual ~Statement();
 
-        std::list<Label> & get_labels() { return labels; }
-        const std::list<Label> & get_labels() const { return labels; }
+        std::vector< Label >  & get_labels() { return labels; }
+        const std::vector< Label >  & get_labels() const { return labels; }
 
         virtual Statement *clone() const override = 0;
@@ -70 +70 @@
 class NullStmt : public Statement {
   public:
-        NullStmt( const std::list<Label> & labels = {} );
+        NullStmt( const std::vector< Label >  & labels = {} );
 
         virtual NullStmt *clone() const override { return new NullStmt( *this ); }
@@ -101 +101 @@
         std::list<Expression *> output, input;
         std::list<ConstantExpr *> clobber;
-        std::list<Label> gotolabels;
-
-        AsmStmt( bool voltile, Expression *instruction, std::list<Expression *> output, std::list<Expression *> input, std::list<ConstantExpr *> clobber, std::list<Label> gotolabels );
+        std::vector< Label >  gotolabels;
+
+        AsmStmt( bool voltile, Expression *instruction, std::list<Expression *> output, std::list<Expression *> input, std::list<ConstantExpr *> clobber, std::vector< Label >  gotolabels );
         AsmStmt( const AsmStmt &other );
         virtual ~AsmStmt();
@@ -117 +117 @@
         std::list<ConstantExpr *> & get_clobber() { return clobber; }
         void set_clobber( const std::list<ConstantExpr *> &newValue ) { clobber = newValue; }
-        std::list<Label> & get_gotolabels() { return gotolabels; }
-        void set_gotolabels( const std::list<Label> &newValue ) { gotolabels = newValue; }
+        std::vector< Label >  & get_gotolabels() { return gotolabels; }
+        void set_gotolabels( const std::vector< Label >  &newValue ) { gotolabels = newValue; }
 
         virtual AsmStmt * clone() const { return new AsmStmt( *this ); }
@@ -196 +196 @@
         virtual ~CaseStmt();
 
-        static CaseStmt * makeDefault( const std::list<Label> & labels = {}, std::list<Statement *> stmts = std::list<Statement *>() );
+        static CaseStmt * makeDefault( const std::vector< Label >  & labels = {}, std::list<Statement *> stmts = std::list<Statement *>() );
 
         bool isDefault() const { return _isDefault; }