Changeset 23b6643f for src/SynTree

Timestamp:

Sep 20, 2016, 4:47:34 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

1132b62

Parents:

aefcc3b (diff), db46512 (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 tuples

Conflicts:

src/Makefile.in
src/ResolvExpr/Unify.cc
src/SynTree/Type.h

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) (2 diffs)
• TypeSubstitution.h (modified) (1 diff)
• Visitor.cc (modified) (1 diff)
• Visitor.h (modified) (1 diff)
• ZeroOneType.cc (added)
• module.mk (modified) (1 diff)

src/SynTree/Mutator.cc

@@ -480 +480 @@
 }
 
+Type *Mutator::mutate( ZeroType *zeroType ) {
+        mutateAll( zeroType->get_forall(), *this );
+        return zeroType;
+}
+
+Type *Mutator::mutate( OneType *oneType ) {
+        mutateAll( oneType->get_forall(), *this );
+        return oneType;
+}
+
 Initializer *Mutator::mutate( SingleInit *singleInit ) {
         singleInit->set_value( singleInit->get_value()->acceptMutator( *this ) );

src/SynTree/Mutator.h

@@ -99 +99 @@
         virtual Type* mutate( AttrType *attrType );
         virtual Type* mutate( VarArgsType *varArgsType );
+        virtual Type* mutate( ZeroType *zeroType );
+        virtual Type* mutate( OneType *oneType );
 
         virtual Initializer* mutate( SingleInit *singleInit );

src/SynTree/SynTree.h

@@ -106 +106 @@
 class AttrType;
 class VarArgsType;
+class ZeroType;
+class OneType;
 
 class Initializer;

src/SynTree/Type.h

@@ -436 +436 @@
 };
 
+/// Represents a zero constant
+class ZeroType : public Type {
+  public:
+        ZeroType();
+        ZeroType( Type::Qualifiers tq );
+
+        virtual ZeroType *clone() const { return new ZeroType( *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;
+};
+
+/// Represents a one constant
+class OneType : public Type {
+  public:
+        OneType();
+        OneType( Type::Qualifiers tq );
+
+        virtual OneType *clone() const { return new OneType( *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

@@ -179 +179 @@
 }
 
-Type * TypeSubstitution::mutate( VoidType *basicType ) {
-        return handleType( basicType );
+Type * TypeSubstitution::mutate( VoidType *voidType ) {
+        return handleType( voidType );
 }
 
@@ -221 +221 @@
 Type * TypeSubstitution::mutate( VarArgsType *varArgsType ) {
         return handleType( varArgsType );
+}
+
+Type * TypeSubstitution::mutate( ZeroType *zeroType ) {
+        return handleType( zeroType );
+}
+
+Type * TypeSubstitution::mutate( OneType *oneType ) {
+        return handleType( oneType );
 }
 

src/SynTree/TypeSubstitution.h

@@ -76 +76 @@
         virtual Type* mutate(TupleType *tupleType);
         virtual Type* mutate(VarArgsType *varArgsType);
+        virtual Type* mutate(ZeroType *zeroType);
+        virtual Type* mutate(OneType *oneType);
 
         // TODO: worry about traversing into a forall-qualified function type or type decl with assertions

src/SynTree/Visitor.cc

@@ -406 +406 @@
 }
 
+void Visitor::visit( ZeroType *zeroType ) {
+        acceptAll( zeroType->get_forall(), *this );
+}
+
+void Visitor::visit( OneType *oneType ) {
+        acceptAll( oneType->get_forall(), *this );
+}
+
 void Visitor::visit( SingleInit *singleInit ) {
         singleInit->get_value()->accept( *this );

src/SynTree/Visitor.h

@@ -99 +99 @@
         virtual void visit( AttrType *attrType );
         virtual void visit( VarArgsType *varArgsType );
+        virtual void visit( ZeroType *zeroType );
+        virtual void visit( OneType *oneType );
 
         virtual void visit( SingleInit *singleInit );

src/SynTree/module.mk

@@ -26 +26 @@
        SynTree/AttrType.cc \
        SynTree/VarArgsType.cc \
+       SynTree/ZeroOneType.cc \
        SynTree/Constant.cc \
        SynTree/Expression.cc \