Changeset 083cf31 for src/SynTree/Type.h

Timestamp:

Jan 7, 2016, 11:28:48 AM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

1e9d87b

Parents:

267cb3d (diff), de91427b (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 with master

File:

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

src/SynTree/Type.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Type.h -- 
+// Type.h --
 //
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Nov 20 12:54:09 2015
-// Update Count     : 15
+// Last Modified By : Rob Schluntz
+// Last Modified On : Fri Dec 18 14:46:18 2015
+// Update Count     : 18
 //
 
@@ -23 +23 @@
 class Type {
   public:
-        struct Qualifiers {  
+        struct Qualifiers {
                 Qualifiers(): isConst( false ), isVolatile( false ), isRestrict( false ), isLvalue( false ), isAtomic( false ), isAttribute( false ) {}
                 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 );
@@ -36 +36 @@
                 bool operator<( const Qualifiers &other );
                 bool operator>( const Qualifiers &other );
-        
+
                 bool isConst;
                 bool isVolatile;
@@ -43 +43 @@
                 bool isAtomic;
                 bool isAttribute;
-        };      
+        };
 
         Type( const Qualifiers &tq );
@@ -85 +85 @@
 class BasicType : public Type {
   public:
-        enum Kind {  
+        enum Kind {
                 Bool,
                 Char,
@@ -108 +108 @@
                 LongDoubleImaginary,
                 NUMBER_OF_BASIC_TYPES
-        };  
+        };
 
         static const char *typeNames[];                                         // string names for basic types, MUST MATCH with Kind
@@ -149 +149 @@
   private:
         Type *base;
-        
+
         // In C99, pointer types can be qualified in many ways e.g., int f( int a[ static 3 ] )
         Expression *dimension;
@@ -188 +188 @@
         virtual ~FunctionType();
 
-        std::list<DeclarationWithType*>& get_returnVals() { return returnVals; }
-        std::list<DeclarationWithType*>& get_parameters() { return parameters; }
+        std::list<DeclarationWithType*> & get_returnVals() { return returnVals; }
+        std::list<DeclarationWithType*> & get_parameters() { return parameters; }
         bool get_isVarArgs() { return isVarArgs; }
         void set_isVarArgs( bool newValue ) { isVarArgs = newValue; }
@@ -217 +217 @@
         void set_name( std::string newValue ) { name = newValue; }
         std::list< Expression* >& get_parameters() { return parameters; }
-        
+
         virtual ReferenceToType *clone() const = 0;
         virtual void accept( Visitor &v ) = 0;
@@ -240 +240 @@
         /// Accesses generic parameters of base struct (NULL if none such)
         std::list<TypeDecl*> * get_baseParameters();
-        
+
         /// Looks up the members of this struct named "name" and places them into "foundDecls".
         /// Clones declarations into "foundDecls", caller responsible for freeing
@@ -250 +250 @@
   private:
         virtual std::string typeString() const;
-        
+
         // this decl is not "owned" by the struct inst; it is merely a pointer to elsewhere in the tree,
         // where the structure used in this type is actually defined
@@ -267 +267 @@
         /// Accesses generic parameters of base union (NULL if none such)
         std::list<TypeDecl*> * get_baseParameters();
-        
+
         /// looks up the members of this union named "name" and places them into "foundDecls"
         /// Clones declarations into "foundDecls", caller responsible for freeing
@@ -277 +277 @@
   private:
         virtual std::string typeString() const;
-        
+
         // this decl is not "owned" by the union inst; it is merely a pointer to elsewhere in the tree,
         // where the union used in this type is actually defined
@@ -310 +310 @@
   private:
         virtual std::string typeString() const;
-        
+
         // this member is filled in by the validate pass, which instantiates the members of the correponding
         // aggregate with the actual type parameters specified for this use of the context
@@ -327 +327 @@
         bool get_isFtype() const { return isFtype; }
         void set_isFtype( bool newValue ) { isFtype = newValue; }
-        
+
         virtual TypeInstType *clone() const { return new TypeInstType( *this ); }
         virtual void accept( Visitor &v ) { v.visit( this ); }
@@ -463 +463 @@
 }
 
+std::ostream & operator<<( std::ostream & out, Type * type );
+
 #endif // TYPE_H