Changes in src/SynTree/Expression.cc [ea6332d:5ccb10d]

File:

• src/SynTree/Expression.cc (modified) (8 diffs)

src/SynTree/Expression.cc

@@ -14 +14 @@
 //
 
-#include "SynTree/Expression.h"
-
-#include <cassert>                   // for assert, assertf
-#include <iostream>                  // for ostream, operator<<, basic_ostream
-#include <list>                      // for list, _List_iterator, list<>::co...
-
-#include "Common/utility.h"          // for maybeClone, cloneAll, deleteAll
-#include "Declaration.h"             // for ObjectDecl, DeclarationWithType
-#include "Expression.h"              // for Expression, ImplicitCopyCtorExpr
-#include "InitTweak/InitTweak.h"     // for getCallArg, getPointerBase
-#include "Initializer.h"             // for Designation, Initializer
-#include "Statement.h"               // for CompoundStmt, ExprStmt, Statement
-#include "SynTree/BaseSyntaxNode.h"  // for BaseSyntaxNode
-#include "SynTree/Constant.h"        // for Constant
-#include "Type.h"                    // for Type, BasicType, Type::Qualifiers
-#include "TypeSubstitution.h"        // for TypeSubstitution
-
+#include <iostream>
+#include <cassert>
+#include <list>
+#include <algorithm>
+
+#include <iterator>
+
+#include "Declaration.h"
+#include "Expression.h"
+#include "Initializer.h"
+#include "Statement.h"
+#include "Type.h"
+#include "TypeSubstitution.h"
+#include "VarExprReplacer.h"
+
+#include "Common/utility.h"
+#include "Common/PassVisitor.h"
+
+#include "InitTweak/InitTweak.h"
+
+#include "GenPoly/Lvalue.h"
 
 Expression::Expression( Expression *_aname ) : result( 0 ), env( 0 ), argName( _aname ) {}
@@ -89 +93 @@
 }
 
+VariableExpr * VariableExpr::functionPointer( FunctionDecl * func ) {
+        VariableExpr * funcExpr = new VariableExpr( func );
+        funcExpr->set_result( new PointerType( Type::Qualifiers(), funcExpr->get_result() ) );
+        return funcExpr;
+}
+
 void VariableExpr::print( std::ostream &os, int indent ) const {
         os << "Variable Expression: ";
@@ -149 +159 @@
 
 void AlignofExpr::print( std::ostream &os, int indent) const {
-        os << std::string( indent, ' ' ) << "Alignof Expression on: ";
+        os << "Alignof Expression on: ";
 
         if (isType)
@@ -258 +268 @@
 
 void AttrExpr::print( std::ostream &os, int indent) const {
-        os << std::string( indent, ' ' ) << "Attr ";
+        os << "Attr ";
         attr->print( os, indent + 2 );
         if ( isType || expr ) {
@@ -357 +367 @@
 namespace {
         TypeSubstitution makeSub( Type * t ) {
-                if ( StructInstType * aggInst = dynamic_cast< StructInstType * >( t ) ) {
+                if ( ReferenceType * refType = dynamic_cast< ReferenceType * >( t ) ) {
+                        return makeSub( refType->get_base() );
+                } else if ( StructInstType * aggInst = dynamic_cast< StructInstType * >( t ) ) {
                         return TypeSubstitution( aggInst->get_baseParameters()->begin(), aggInst->get_baseParameters()->end(), aggInst->get_parameters().begin() );
                 } else if ( UnionInstType * aggInst = dynamic_cast< UnionInstType * >( t ) ) {
@@ -422 +434 @@
         if ( Type * type = expr->get_result() ) {
                 Type * base = InitTweak::getPointerBase( type );
-                if ( ! base ) {
-                        std::cerr << type << std::endl;
+                assertf( base, "expected pointer type in dereference (type was %s)", toString( type ).c_str() );
+                ret->set_result( base->clone() );
+                if ( GenPoly::referencesPermissable() ) {
+                        // if references are still allowed in the AST, dereference returns a reference
+                        ret->set_result( new ReferenceType( Type::Qualifiers(), ret->get_result() ) );
+                } else {
+                        // references have been removed, in which case dereference returns an lvalue of the base type.
+                        ret->get_result()->set_lvalue( true );
                 }
-                assertf( base, "expected pointer type in dereference\n" );
-                ret->set_result( maybeClone( base ) );
         }
         return ret;
@@ -490 +506 @@
 
 void LogicalExpr::print( std::ostream &os, int indent )const {
-        os << std::string( indent, ' ' ) << "Short-circuited operation (" << (isAnd?"and":"or") << ") on: ";
+        os << "Short-circuited operation (" << (isAnd?"and":"or") << ") on: ";
         arg1->print(os);
         os << " and ";
@@ -595 +611 @@
 CompoundLiteralExpr::CompoundLiteralExpr( Type * type, Initializer * initializer ) : initializer( initializer ) {
         assert( type && initializer );
+        type->set_lvalue( true );
         set_result( type );
 }