Ignore:
Timestamp:
Sep 20, 2016, 4:47:34 PM (6 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
aaron-thesis, arm-eh, 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, 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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/SynTree/Type.h

    raefcc3b r23b6643f  
    436436};
    437437
     438/// Represents a zero constant
     439class ZeroType : public Type {
     440  public:
     441        ZeroType();
     442        ZeroType( Type::Qualifiers tq );
     443
     444        virtual ZeroType *clone() const { return new ZeroType( *this ); }
     445        virtual void accept( Visitor &v ) { v.visit( this ); }
     446        virtual Type *acceptMutator( Mutator &m ) { return m.mutate( this ); }
     447        virtual void print( std::ostream &os, int indent = 0 ) const;
     448};
     449
     450/// Represents a one constant
     451class OneType : public Type {
     452  public:
     453        OneType();
     454        OneType( Type::Qualifiers tq );
     455
     456        virtual OneType *clone() const { return new OneType( *this ); }
     457        virtual void accept( Visitor &v ) { v.visit( this ); }
     458        virtual Type *acceptMutator( Mutator &m ) { return m.mutate( this ); }
     459        virtual void print( std::ostream &os, int indent = 0 ) const;
     460};
     461
    438462inline Type::Qualifiers &Type::Qualifiers::operator&=( const Type::Qualifiers &other ) {
    439463        isConst &= other.isConst;
Note: See TracChangeset for help on using the changeset viewer.