Changeset 2f42718 for src/SynTree

Timestamp:

Feb 22, 2019, 10:43:29 AM (7 years ago)

Author:

tdelisle <tdelisle@…>

Branches:

no_list

Parents:

43e0949

Message:

Parameters and return value of functions are now vectors (and some related clean-up)

Location:

src/SynTree

Files:

• Declaration.h (modified) (2 diffs)
• FunctionType.cc (modified) (1 diff)
• TupleExpr.cc (modified) (1 diff)
• TupleType.cc (modified) (1 diff)
• Type.h (modified) (3 diffs)

src/SynTree/Declaration.h

@@ -182 +182 @@
         Type *base;
         std::list< TypeDecl* > parameters;
-        std::list< DeclarationWithType* > assertions;
+        std::vector< DeclarationWithType* > assertions;
 
         NamedTypeDecl( const std::string &name, Type::StorageClasses scs, Type *type );
@@ -191 +191 @@
         void set_base( Type *newValue ) { base = newValue; }
         std::list< TypeDecl* >& get_parameters() { return parameters; }
-        std::list< DeclarationWithType* >& get_assertions() { return assertions; }
 
         virtual std::string typeString() const = 0;

src/SynTree/FunctionType.cc

@@ -39 +39 @@
 
 namespace {
-        bool containsTtype( const std::list<DeclarationWithType * > & l ) {
+        bool containsTtype( const std::vector<DeclarationWithType * > & l ) {
                 if ( ! l.empty() ) {
                         return Tuples::isTtype( l.back()->get_type() );

src/SynTree/TupleExpr.cc

@@ -66 +66 @@
         TupleType * type = strict_dynamic_cast< TupleType * >( tuple->get_result() );
         assertf( type->size() > index, "TupleIndexExpr index out of bounds: tuple size %d, requested index %d in expr %s", type->size(), index, toString( tuple ).c_str() );
-        set_result( (*std::next( type->get_types().begin(), index ))->clone() );
+        set_result( (*std::next( type->types.begin(), index ))->clone() );
         // like MemberExpr, TupleIndexExpr is always an lvalue
         get_result()->set_lvalue( true );

src/SynTree/TupleType.cc

@@ -25 +25 @@
 class Attribute;
 
-TupleType::TupleType( const Type::Qualifiers &tq, const std::list< Type * > & types, const std::vector< Attribute * > & attributes ) : Type( tq, attributes ), types( types ) {
+TupleType::TupleType( const Type::Qualifiers &tq, const std::vector< Type * > & types, const std::vector< Attribute * > & attributes ) : Type( tq, attributes ), types( types ) {
         for ( Type * t : *this ) {
                 // xxx - this is very awkward. TupleTypes should contain objects so that members can be named, but if they don't have an initializer node then

src/SynTree/Type.h

@@ -359 +359 @@
 class FunctionType : public Type {
   public:
-        std::list<DeclarationWithType*> returnVals;
-        std::list<DeclarationWithType*> parameters;
+        std::vector<DeclarationWithType*> returnVals;
+        std::vector<DeclarationWithType*> parameters;
 
         // Does the function accept a variable number of arguments following the arguments specified in the parameters list.
@@ -372 +372 @@
         virtual ~FunctionType();
 
-        std::list<DeclarationWithType*> & get_returnVals() { return returnVals; }
-        std::list<DeclarationWithType*> & get_parameters() { return parameters; }
         bool get_isVarArgs() const { return isVarArgs; }
         void set_isVarArgs( bool newValue ) { isVarArgs = newValue; }
@@ -564 +562 @@
 class TupleType : public Type {
   public:
-        std::list<Type *> types;
+        std::vector<Type *> types;
         std::list<Declaration *> members;
 
-        TupleType( const Type::Qualifiers & tq, const std::list< Type * > & types, const std::vector< Attribute * > & attributes = std::vector< Attribute * >()  );
+        TupleType( const Type::Qualifiers & tq, const std::vector< Type * > & types, const std::vector< Attribute * > & attributes = std::vector< Attribute * >()  );
         TupleType( const TupleType& );
         virtual ~TupleType();
 
-        typedef std::list<Type*> value_type;
+        typedef std::vector< Type * > value_type;
         typedef value_type::iterator iterator;
 
-        std::list<Type *> & get_types() { return types; }
         virtual unsigned size() const override { return types.size(); };