Changeset 70a1c3ae for src/Parser

Timestamp:

Jan 29, 2019, 4:09:59 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

no_list

Children:

bee0694

Parents:

ede87c6

Message:

Starting to remove std::list to see if it affects performance, started with List of attributes

Location:

src/Parser

Files:

• DeclarationNode.cc (modified) (2 diffs)
• ParseNode.h (modified) (2 diffs)
• TypeData.cc (modified) (7 diffs)
• TypeData.h (modified) (2 diffs)

src/Parser/DeclarationNode.cc

@@ -509 +509 @@
 
         for ( Attribute *attr: reverseIterate( q->attributes ) ) {
-                attributes.push_front( attr->clone() );
+                attributes.insert(attributes.begin(), attr->clone() );
         } // for
         return this;
@@ -770 +770 @@
         if ( a ) {
                 for ( Attribute *attr: reverseIterate( a->attributes ) ) {
-                        attributes.push_front( attr );
+                        attributes.insert( attributes.begin(), attr );
                 } // for
                 a->attributes.clear();

src/Parser/ParseNode.h

@@ -344 +344 @@
         LinkageSpec::Spec linkage;
         Expression * asmName = nullptr;
-        std::list< Attribute * > attributes;
+        std::vector< Attribute * > attributes;
         InitializerNode * initializer = nullptr;
         bool extension = false;
@@ -374 +374 @@
 
         virtual StatementNode * add_label( const std::string * name, DeclarationNode * attr = nullptr ) {
-                stmt->get_labels().emplace_back( * name, nullptr, attr ? std::move( attr->attributes ) : std::list< Attribute * > {} );
+                stmt->get_labels().emplace_back( * name, nullptr, attr ? std::move( attr->attributes ) : std::vector< Attribute * > {} );
                 delete attr;
                 delete name;

src/Parser/TypeData.cc

@@ -760 +760 @@
 
 
-AggregateDecl * buildAggregate( const TypeData * td, std::list< Attribute * > attributes, LinkageSpec::Spec linkage ) {
+AggregateDecl * buildAggregate( const TypeData * td, std::vector< Attribute * > attributes, LinkageSpec::Spec linkage ) {
         assert( td->kind == TypeData::Aggregate );
         AggregateDecl * at;
@@ -790 +790 @@
 
 
-ReferenceToType * buildComAggInst( const TypeData * type, std::list< Attribute * > attributes, LinkageSpec::Spec linkage ) {
+ReferenceToType * buildComAggInst( const TypeData * type, std::vector< Attribute * > attributes, LinkageSpec::Spec linkage ) {
         switch ( type->kind ) {
           case TypeData::Enum: {
@@ -850 +850 @@
         assert( td->kind == TypeData::AggregateInst );
 
-        // ReferenceToType * ret = buildComAggInst( td->aggInst.aggregate, std::list< Attribute * >() );
+        // ReferenceToType * ret = buildComAggInst( td->aggInst.aggregate, std::vector< Attribute * >() );
         ReferenceToType * ret = nullptr;
         TypeData * type = td->aggInst.aggregate;
@@ -887 +887 @@
 
 
-NamedTypeDecl * buildSymbolic( const TypeData * td, std::list< Attribute * > attributes, const string & name, Type::StorageClasses scs, LinkageSpec::Spec linkage ) {
+NamedTypeDecl * buildSymbolic( const TypeData * td, std::vector< Attribute * > attributes, const string & name, Type::StorageClasses scs, LinkageSpec::Spec linkage ) {
         assert( td->kind == TypeData::Symbolic );
         NamedTypeDecl * ret;
@@ -898 +898 @@
         buildList( td->symbolic.params, ret->get_parameters() );
         buildList( td->symbolic.assertions, ret->get_assertions() );
-        ret->base->attributes.splice( ret->base->attributes.end(), attributes );
+        ret->base->attributes.insert( ret->base->attributes.end(), attributes.begin(), attributes.end() );
         return ret;
 } // buildSymbolic
 
 
-EnumDecl * buildEnum( const TypeData * td, std::list< Attribute * > attributes, LinkageSpec::Spec linkage ) {
+EnumDecl * buildEnum( const TypeData * td, std::vector< Attribute * > attributes, LinkageSpec::Spec linkage ) {
         assert( td->kind == TypeData::Enum );
         EnumDecl * ret = new EnumDecl( *td->enumeration.name, attributes, linkage );
@@ -947 +947 @@
 
 
-Declaration * buildDecl( const TypeData * td, const string &name, Type::StorageClasses scs, Expression * bitfieldWidth, Type::FuncSpecifiers funcSpec, LinkageSpec::Spec linkage, Expression *asmName, Initializer * init, std::list< Attribute * > attributes ) {
+Declaration * buildDecl( const TypeData * td, const string &name, Type::StorageClasses scs, Expression * bitfieldWidth, Type::FuncSpecifiers funcSpec, LinkageSpec::Spec linkage, Expression *asmName, Initializer * init, std::vector< Attribute * > attributes ) {
         if ( td->kind == TypeData::Function ) {
                 if ( td->function.idList ) {                                    // KR function ?
@@ -1020 +1020 @@
                                 param->type = decl->type;                               // set copy declaration type to parameter type
                                 decl->type = nullptr;                                   // reset declaration type
-                                param->attributes.splice( param->attributes.end(), decl->attributes ); // copy and reset attributes from declaration to parameter
+                                param->attributes.insert( param->attributes.end(), decl->attributes.begin(), decl->attributes.end() ); // copy and reset attributes from declaration to parameter
                         } // if
                 } // for

src/Parser/TypeData.h

@@ -19 +19 @@
 #include <list>                  // for list
 #include <string>                // for string
+#include <vector>
 
 #include "ParseNode.h"           // for DeclarationNode, DeclarationNode::Ag...
@@ -120 +121 @@
 ArrayType * buildArray( const TypeData * );
 ReferenceType * buildReference( const TypeData * );
-AggregateDecl * buildAggregate( const TypeData *, std::list< Attribute * > );
-ReferenceToType * buildComAggInst( const TypeData *, std::list< Attribute * > attributes, LinkageSpec::Spec linkage );
+AggregateDecl * buildAggregate( const TypeData *, std::vector< Attribute * > );
+ReferenceToType * buildComAggInst( const TypeData *, std::vector< Attribute * > attributes, LinkageSpec::Spec linkage );
 ReferenceToType * buildAggInst( const TypeData * );
 TypeDecl * buildVariable( const TypeData * );
-EnumDecl * buildEnum( const TypeData *, std::list< Attribute * >, LinkageSpec::Spec );
+EnumDecl * buildEnum( const TypeData *, std::vector< Attribute * >, LinkageSpec::Spec );
 TypeInstType * buildSymbolicInst( const TypeData * );
 TupleType * buildTuple( const TypeData * );
 TypeofType * buildTypeof( const TypeData * );
 Declaration * buildDecl( const TypeData *, const std::string &, Type::StorageClasses, Expression *, Type::FuncSpecifiers funcSpec, LinkageSpec::Spec, Expression * asmName,
-                                                 Initializer * init = nullptr, std::list< class Attribute * > attributes = std::list< class Attribute * >() );
+                                                 Initializer * init = nullptr, std::vector< Attribute * > attributes = std::vector< Attribute * >() );
 FunctionType * buildFunction( const TypeData * );
 void buildKRFunction( const TypeData::Function_t & function );