Changeset 19858f6 for src/SynTree/Expression.cc

Timestamp:

Oct 4, 2019, 9:59:01 AM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

65e10b2

Parents:

970141d (diff), 73fad25 (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/Expression.cc (modified) (16 diffs)

src/SynTree/Expression.cc

@@ -19 +19 @@
 #include <iostream>                  // for ostream, operator<<, basic_ostream
 #include <list>                      // for list, _List_iterator, list<>::co...
+#include <set>                       // for set
 
 #include "Common/utility.h"          // for maybeClone, cloneAll, deleteAll
@@ -64 +65 @@
 
 bool Expression::get_lvalue() const {
-        assert( !result->get_lvalue() );
         return false;
 }
@@ -115 +115 @@
         assert( var->get_type() );
         Type * type = var->get_type()->clone();
-        type->set_lvalue( true );
 
         // xxx - doesn't quite work yet - get different alternatives with the same cost
@@ -125 +124 @@
         //      long long int value;
         //      if ( decl->valueOf( var, value ) ) {
-        //              type->set_lvalue( false );
+        //              type->set_lvalue( false ); // Would have to move to get_lvalue.
         //      }
         // }
@@ -140 +139 @@
 
 bool VariableExpr::get_lvalue() const {
-        return result->get_lvalue();
+        // It isn't always an lvalue, but it is never an rvalue.
+        return true;
 }
 
@@ -277 +277 @@
 
 bool CastExpr::get_lvalue() const {
-        return result->get_lvalue();
+        // This is actually wrong by C, but it works with our current set-up.
+        return arg->get_lvalue();
 }
 
@@ -360 +361 @@
 }
 
+bool UntypedMemberExpr::get_lvalue() const {
+        return aggregate->get_lvalue();
+}
+
 void UntypedMemberExpr::print( std::ostream & os, Indenter indent ) const {
         os << "Untyped Member Expression, with field: " << std::endl << indent+1;
@@ -378 +383 @@
         sub.apply( res );
         result = res;
-        result->set_lvalue( true );
         result->get_qualifiers() |= aggregate->result->get_qualifiers();
 }
@@ -392 +396 @@
 
 bool MemberExpr::get_lvalue() const {
-        assert( result->get_lvalue() );
+        // This is actually wrong by C, but it works with our current set-up.
         return true;
 }
@@ -427 +431 @@
                         // 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->result->set_lvalue( true );
                 }
         }
@@ -447 +448 @@
 
 bool UntypedExpr::get_lvalue() const {
-        return result->get_lvalue();
+        // from src/GenPoly/Lvalue.cc: isIntrinsicReference
+        static std::set<std::string> lvalueFunctions = { "*?", "?[?]" };
+        std::string fname = InitTweak::getFunctionName( const_cast< UntypedExpr * >( this ) );
+        return lvalueFunctions.count(fname);
 }
 
@@ -510 +514 @@
 
 bool ConditionalExpr::get_lvalue() const {
-        return result->get_lvalue();
+        return false;
 }
 
@@ -570 +574 @@
 
 bool ConstructorExpr::get_lvalue() const {
-        return result->get_lvalue();
+        return false;
 }
 
@@ -582 +586 @@
 CompoundLiteralExpr::CompoundLiteralExpr( Type * type, Initializer * initializer ) : initializer( initializer ) {
         assert( type && initializer );
-        type->set_lvalue( true );
         set_result( type );
 }
@@ -593 +596 @@
 
 bool CompoundLiteralExpr::get_lvalue() const {
-        assert( result->get_lvalue() );
         return true;
 }
@@ -648 +650 @@
 }
 bool StmtExpr::get_lvalue() const {
-        return result->get_lvalue();
+        return false;
 }
 void StmtExpr::print( std::ostream & os, Indenter indent ) const {