Changeset 1f44196 for src/SynTree/Type.h

Timestamp:

Nov 29, 2016, 3:30:59 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

8e5724e

Parents:

3a2128f (diff), 9129a84 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg2:software/cfa/cfa-cc

Conflicts:

src/Parser/parser.cc

File:

• src/SynTree/Type.h (modified) (8 diffs)

src/SynTree/Type.h

@@ -20 +20 @@
 #include "Visitor.h"
 #include "Mutator.h"
+#include "Common/utility.h"
 
 class Type {
@@ -27 +28 @@
                 Qualifiers( bool isConst, bool isVolatile, bool isRestrict, bool isLvalue, bool isAtomic, bool isAttribute ): isConst( isConst ), isVolatile( isVolatile ), isRestrict( isRestrict ), isLvalue( isLvalue ), isAtomic( isAtomic ), isAttribute( isAttribute ) {}
 
+                Qualifiers &operator&=( const Qualifiers &other );
                 Qualifiers &operator+=( const Qualifiers &other );
                 Qualifiers &operator-=( const Qualifiers &other );
@@ -63 +65 @@
         void set_isAtomic( bool newValue ) { tq.isAtomic = newValue; }
         void set_isAttribute( bool newValue ) { tq.isAttribute = newValue; }
-        std::list<TypeDecl*>& get_forall() { return forall; }
+
+        typedef std::list<TypeDecl *> ForallList;
+        ForallList& get_forall() { return forall; }
+
+        /// How many elemental types are represented by this type
+        virtual unsigned size() const { return 1; };
+        virtual bool isVoid() const { return size() == 0; }
 
         virtual Type *clone() const = 0;
@@ -71 +79 @@
   private:
         Qualifiers tq;
-        std::list<TypeDecl*> forall;
+        ForallList forall;
 };
 
@@ -77 +85 @@
   public:
         VoidType( const Type::Qualifiers &tq );
+
+        virtual unsigned size() const { return 0; };
 
         virtual VoidType *clone() const { return new VoidType( *this ); }
@@ -234 +244 @@
   public:
         StructInstType( const Type::Qualifiers &tq, const std::string &name ) : Parent( tq, name ), baseStruct( 0 ) {}
+        StructInstType( const Type::Qualifiers &tq, StructDecl * baseStruct );
         StructInstType( const StructInstType &other ) : Parent( other ), baseStruct( other.baseStruct ) {}
 
@@ -348 +359 @@
 class TupleType : public Type {
   public:
-        TupleType( const Type::Qualifiers &tq );
+        TupleType( const Type::Qualifiers &tq, const std::list< Type * > & types = std::list< Type * >() );
         TupleType( const TupleType& );
         virtual ~TupleType();
 
+        typedef std::list<Type*> value_type;
+        typedef value_type::iterator iterator;
+
         std::list<Type*>& get_types() { return types; }
+        virtual unsigned size() const { return types.size(); };
+
+        iterator begin() { return types.begin(); }
+        iterator end() { return types.end(); }
 
         virtual TupleType *clone() const { return new TupleType( *this ); }
@@ -442 +460 @@
 };
 
+inline Type::Qualifiers &Type::Qualifiers::operator&=( const Type::Qualifiers &other ) {
+        isConst &= other.isConst;
+        isVolatile &= other.isVolatile;
+        isRestrict &= other.isRestrict;
+        isLvalue &= other.isLvalue;
+        isAtomic &= other.isAtomic;
+        return *this;
+}
+
 inline Type::Qualifiers &Type::Qualifiers::operator+=( const Type::Qualifiers &other ) {
         isConst |= other.isConst;