Changeset bee0694 for src/SynTree

Timestamp:

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

Author:

Thierry Delisle <tdelisle@…>

Branches:

no_list

Children:

bbbc067

Parents:

70a1c3ae

Message:

Changed std::list<Label> to vector

Location:

src/SynTree

Files:

• Label.h (modified) (1 diff)
• Statement.cc (modified) (4 diffs)
• Statement.h (modified) (5 diffs)

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; }