Changeset b7778c1 for src/SynTree/AddressExpr.cc

Timestamp:

Oct 4, 2017, 3:31:43 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

3364962

Parents:

3628765 (diff), bb9d8e8 (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:software/cfa/cfa-cc

File:

• src/SynTree/AddressExpr.cc (modified) (4 diffs)

src/SynTree/AddressExpr.cc

@@ -33 +33 @@
         Type * addrType( Type * type ) {
                 if ( ReferenceType * refType = dynamic_cast< ReferenceType * >( type ) ) {
-                        return new ReferenceType( refType->get_qualifiers(), addrType( refType->get_base() ) );
+                        return new ReferenceType( refType->get_qualifiers(), addrType( refType->base ) );
                 } else {
                         return new PointerType( Type::Qualifiers(), type->clone() );
@@ -40 +40 @@
 }
 
-AddressExpr::AddressExpr( Expression *arg, Expression *_aname ) : Expression( _aname ), arg( arg ) {
-        if ( arg->has_result() ) {
-                if ( arg->get_result()->get_lvalue() ) {
+AddressExpr::AddressExpr( Expression *arg ) : Expression(), arg( arg ) {
+        if ( arg->result ) {
+                if ( arg->result->get_lvalue() ) {
                         // lvalue, retains all layers of reference and gains a pointer inside the references
-                        set_result( addrType( arg->get_result() ) );
+                        set_result( addrType( arg->result ) );
                 } else {
                         // taking address of non-lvalue -- must be a reference, loses one layer of reference
-                        ReferenceType * refType = strict_dynamic_cast< ReferenceType * >( arg->get_result() );
-                        set_result( addrType( refType->get_base() ) );
+                        ReferenceType * refType = strict_dynamic_cast< ReferenceType * >( arg->result );
+                        set_result( addrType( refType->base ) );
                 }
                 // result of & is never an lvalue
@@ -62 +62 @@
 }
 
-void AddressExpr::print( std::ostream &os, int indent ) const {
+void AddressExpr::print( std::ostream &os, Indenter indent ) const {
         os << "Address of:" << std::endl;
         if ( arg ) {
-                os << std::string( indent+2, ' ' );
-                arg->print( os, indent+2 );
+                os << indent+1;
+                arg->print( os, indent+1 );
         } // if
 }
@@ -77 +77 @@
 LabelAddressExpr::~LabelAddressExpr() {}
 
-void LabelAddressExpr::print( std::ostream & os, int indent ) const {
-        os << "Address of label:" << std::endl << std::string( indent+2, ' ' ) << arg;
+void LabelAddressExpr::print( std::ostream & os, Indenter ) const {
+        os << "Address of label:" << arg;
 }