Changeset 8d25360

Timestamp:

Feb 13, 2019, 12:24:12 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

no_list

Children:

80eefcb

Parents:

bbbc067

Message:

Fixed problems with changing some lists to vectors

Location:

src

Files:

• Common/utility.h (modified) (2 diffs)
• Parser/TypeData.cc (modified) (2 diffs)
• Parser/TypeData.h (modified) (1 diff)
• SymTab/Validate.cc (modified) (1 diff)

src/Common/utility.h

@@ -94 +94 @@
 template< typename SrcContainer, typename DestContainer >
 void cloneAll( const SrcContainer &src, DestContainer &dest ) {
-        typename SrcContainer::const_iterator in = src.begin();
-        std::back_insert_iterator< DestContainer > out( dest );
-        while ( in != src.end() ) {
-                *out++ = (*in++)->clone();
-        } // while
+        std::transform(src.begin(), src.end(), std::back_insert_iterator< DestContainer >( dest ),
+                [](const typename SrcContainer::value_type & t) -> typename DestContainer::value_type {
+                        return t->clone();
+                }
+        );
 }
 
@@ -464 +464 @@
 
 // -----------------------------------------------------------------------------
-/// Reorders the input range in-place so that the minimal-value elements according to the 
-/// comparator are in front; 
+/// Reorders the input range in-place so that the minimal-value elements according to the
+/// comparator are in front;
 /// returns the iterator after the last minimal-value element.
 template<typename Iter, typename Compare>
 Iter sort_mins( Iter begin, Iter end, Compare& lt ) {
         if ( begin == end ) return end;
-        
+
         Iter min_pos = begin;
         for ( Iter i = begin + 1; i != end; ++i ) {

src/Parser/TypeData.cc

@@ -887 +887 @@
 
 
-NamedTypeDecl * buildSymbolic( const TypeData * td, std::vector< Attribute * > attributes, const string & name, Type::StorageClasses scs, LinkageSpec::Spec linkage ) {
+NamedTypeDecl * buildSymbolic( const TypeData * td, const std::vector< Attribute * > & attributes, const string & name, Type::StorageClasses scs, LinkageSpec::Spec linkage ) {
         assert( td->kind == TypeData::Symbolic );
         NamedTypeDecl * ret;
@@ -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::vector< 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, const std::vector< Attribute * > & attributes ) {
         if ( td->kind == TypeData::Function ) {
                 if ( td->function.idList ) {                                    // KR function ?

src/Parser/TypeData.h

@@ -130 +130 @@
 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::vector< Attribute * > attributes = std::vector< Attribute * >() );
+                                                 Initializer * init = nullptr, const std::vector< Attribute * > & attributes = std::vector< Attribute * >() );
 FunctionType * buildFunction( const TypeData * );
 void buildKRFunction( const TypeData::Function_t & function );

src/SymTab/Validate.cc

@@ -913 +913 @@
                         if ( ! inFunctionType ) {
                                 ret->attributes.insert( ret->attributes.end(), typeInst->attributes.begin(), typeInst->attributes.end() );
+                                typeInst->attributes.clear();
                         } else {
                                 deleteAll( ret->attributes );