Changes in src/SynTree/AddressExpr.cc [c5e3208:ea6332d]

File:

• src/SynTree/AddressExpr.cc (modified) (1 diff)

src/SynTree/AddressExpr.cc

@@ -14 +14 @@
 //
 
-#include "Expression.h"
-#include "Type.h"
-#include "Common/utility.h"
+#include <ostream>           // for ostream, operator<<, basic_ostream, endl
+#include <string>            // for operator<<, string
 
-// Address expressions are typed based on the following inference rules:
-//    E : lvalue T  &..& (n references)
-//   &E :        T *&..& (n references)
-//
-//    E : T  &..&        (m references)
-//   &E : T *&..&        (m-1 references)
-//
-// That is, lvalues becomes
-
-namespace {
-        Type * addrType( Type * type ) {
-                if ( ReferenceType * refType = dynamic_cast< ReferenceType * >( type ) ) {
-                        return new ReferenceType( refType->get_qualifiers(), addrType( refType->get_base() ) );
-                } else {
-                        return new PointerType( Type::Qualifiers(), type->clone() );
-                }
-        }
-}
+#include "Common/utility.h"  // for maybeClone
+#include "Expression.h"      // for AddressExpr, Expression
+#include "Type.h"            // for PointerType, Type, Type::Qualifiers
 
 AddressExpr::AddressExpr( Expression *arg, Expression *_aname ) : Expression( _aname ), arg( arg ) {
         if ( arg->has_result() ) {
-                if ( arg->get_result()->get_lvalue() ) {
-                        // lvalue, retains all layers of reference and gains a pointer inside the references
-                        set_result( addrType( arg->get_result() ) );
-                } else {
-                        // taking address of non-lvalue -- must be a reference, loses one layer of reference
-                        ReferenceType * refType = safe_dynamic_cast< ReferenceType * >( arg->get_result() );
-                        set_result( addrType( refType->get_base() ) );
-                }
-                // result of & is never an lvalue
-                get_result()->set_lvalue( false );
+                set_result( new PointerType( Type::Qualifiers(), arg->get_result()->clone() ) );
         }
 }