Changeset d29fa5f for src/SynTree

Timestamp:

Oct 2, 2017, 4:58:51 PM (7 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:

effdde0

Parents:

bf4b4cf

Message:

Remove has_result

Location:

src/SynTree

Files:

• AddressExpr.cc (modified) (2 diffs)
• ApplicationExpr.cc (modified) (1 diff)
• Expression.h (modified) (1 diff)

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() );
@@ -41 +41 @@
 
 AddressExpr::AddressExpr( Expression *arg ) : Expression(), arg( arg ) {
-        if ( arg->has_result() ) {
-                if ( arg->get_result()->get_lvalue() ) {
+        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

src/SynTree/ApplicationExpr.cc

@@ -55 +55 @@
         set_result( ResolvExpr::extractResultType( function ) );
 
-        assert( has_result() );
+        assert( result );
 }
 

src/SynTree/Expression.h

@@ -45 +45 @@
         const Type * get_result() const { return result; }
         void set_result( Type * newValue ) { result = newValue; }
-        bool has_result() const { return result != nullptr; }
 
         TypeSubstitution * get_env() const { return env; }