Ignore:
Timestamp:
Feb 5, 2016, 12:28:21 PM (10 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:
408d460, bd85400
Parents:
b4cd03b7 (diff), 2a4b088 (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 fix-argument-passing-type-warnings

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/SynTree/Expression.cc

    rb4cd03b7 r4789f44  
    163163}
    164164
     165UntypedOffsetofExpr::UntypedOffsetofExpr( Type *type_, const std::string &member_, Expression *_aname ) :
     166                Expression( _aname ), type(type_), member(member_) {
     167        add_result( new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ) );
     168}
     169
     170UntypedOffsetofExpr::UntypedOffsetofExpr( const UntypedOffsetofExpr &other ) :
     171        Expression( other ), type( maybeClone( other.type ) ), member( other.member ) {}
     172
     173UntypedOffsetofExpr::~UntypedOffsetofExpr() {
     174        delete type;
     175}
     176
     177void UntypedOffsetofExpr::print( std::ostream &os, int indent) const {
     178        os << std::string( indent, ' ' ) << "Untyped Offsetof Expression on member " << member << " of ";
     179
     180        if ( type ) {
     181                type->print(os, indent + 2);
     182        } else {
     183                os << "<NULL>";
     184        }
     185
     186        os << std::endl;
     187        Expression::print( os, indent );
     188}
     189
    165190OffsetofExpr::OffsetofExpr( Type *type_, DeclarationWithType *member_, Expression *_aname ) :
    166191                Expression( _aname ), type(type_), member(member_) {
Note: See TracChangeset for help on using the changeset viewer.