Changeset ac1ed49 for src/SynTree

Timestamp:

Feb 25, 2016, 5:14:15 PM (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, string, with_gc

Children:

33e6a2cc, 90c3b1c, c14cff1

Parents:

41a2620 (diff), 44b7088 (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 plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

Location:

src/SynTree

Files:

• Mutator.cc (modified) (1 diff)
• Mutator.h (modified) (1 diff)
• SynTree.h (modified) (1 diff)
• Type.h (modified) (1 diff)
• TypeSubstitution.cc (modified) (1 diff)
• TypeSubstitution.h (modified) (1 diff)
• VarArgsType.cc (added)
• Visitor.cc (modified) (1 diff)
• Visitor.h (modified) (1 diff)
• module.mk (modified) (1 diff)

src/SynTree/Mutator.cc

@@ -421 +421 @@
 }
 
+Type *Mutator::mutate( VarArgsType *varArgsType ) {
+        mutateAll( varArgsType->get_forall(), *this );
+        return varArgsType;
+}
+
 Initializer *Mutator::mutate( SingleInit *singleInit ) {
         singleInit->set_value( singleInit->get_value()->acceptMutator( *this ) );

src/SynTree/Mutator.h

@@ -90 +90 @@
         virtual Type* mutate( TypeofType *typeofType );
         virtual Type* mutate( AttrType *attrType );
+        virtual Type* mutate( VarArgsType *varArgsType );
 
         virtual Initializer* mutate( SingleInit *singleInit );

src/SynTree/SynTree.h

@@ -97 +97 @@
 class TypeofType;
 class AttrType;
+class VarArgsType;
 
 class Initializer;

src/SynTree/Type.h

@@ -400 +400 @@
 };
 
+/// Represents the GCC built-in varargs type
+class VarArgsType : public Type {
+        VarArgsType();
+
+        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;

src/SynTree/TypeSubstitution.cc

@@ -198 +198 @@
 }
 
+Type * TypeSubstitution::mutate( VarArgsType *varArgsType ) {
+        return handleType( varArgsType );
+}
+
 void TypeSubstitution::print( std::ostream &os, int indent ) const {
         os << std::string( indent, ' ' ) << "Types:" << std::endl;

src/SynTree/TypeSubstitution.h

@@ -74 +74 @@
         virtual Type* mutate(ContextInstType *aggregateUseType);
         virtual Type* mutate(TupleType *tupleType);
+        virtual Type* mutate(VarArgsType *varArgsType);
         
         // TODO: worry about traversing into a forall-qualified function type or type decl with assertions

src/SynTree/Visitor.cc

@@ -355 +355 @@
 }
 
+void Visitor::visit( VarArgsType *varArgsType ) {
+        acceptAll( varArgsType->get_forall(), *this );
+}
+
 void Visitor::visit( SingleInit *singleInit ) {
         singleInit->get_value()->accept( *this );

src/SynTree/Visitor.h

@@ -90 +90 @@
         virtual void visit( TypeofType *typeofType );
         virtual void visit( AttrType *attrType );
+        virtual void visit( VarArgsType *varArgsType );
 
         virtual void visit( SingleInit *singleInit );

src/SynTree/module.mk

@@ -25 +25 @@
        SynTree/TypeofType.cc \
        SynTree/AttrType.cc \
+       SynTree/VarArgsType.cc \
        SynTree/Constant.cc \
        SynTree/Expression.cc \