Changeset 0f9e4403 for src/SynTree/Type.h

Timestamp:

Apr 15, 2016, 12:03:11 PM (9 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

29ad0ac

Parents:

c5833e8 (diff), 37f0da8 (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' into gc_noraii

File:

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

src/SynTree/Type.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Fri Dec 18 14:46:18 2015
-// Update Count     : 18
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Mar  2 17:29:08 2016
+// Update Count     : 21
 //
 
@@ -296 +296 @@
 };
 
-class ContextInstType : public ReferenceToType {
+class TraitInstType : public ReferenceToType {
         typedef ReferenceToType Parent;
   public:
-        ContextInstType( const Type::Qualifiers &tq, const std::string &name ) : Parent( tq, name ) {}
-        ContextInstType( const ContextInstType &other );
-        ~ContextInstType();
+        TraitInstType( const Type::Qualifiers &tq, const std::string &name ) : Parent( tq, name ) {}
+        TraitInstType( const TraitInstType &other );
+        ~TraitInstType();
 
         std::list< Declaration* >& get_members() { return members; }
 
-        virtual ContextInstType *clone() const { return new ContextInstType( *this ); }
+        virtual TraitInstType *clone() const { return new TraitInstType( *this ); }
         virtual void accept( Visitor &v ) { v.visit( this ); }
         virtual Type *acceptMutator( Mutator &m ) { return m.mutate( this ); }
@@ -400 +400 @@
 };
 
+/// Represents the GCC built-in varargs type
+class VarArgsType : public Type {
+  public:
+        VarArgsType();
+        VarArgsType( Type::Qualifiers tq );
+
+        virtual VarArgsType *clone() const { return new VarArgsType( *this ); }
+        virtual void accept( Visitor &v ) { v.visit( this ); }
+        virtual Type *acceptMutator( Mutator &m ) { return m.mutate( this ); }
+        virtual void print( std::ostream &os, int indent = 0 ) const;
+};
+
 inline Type::Qualifiers &Type::Qualifiers::operator+=( const Type::Qualifiers &other ) {
         isConst |= other.isConst;