Changeset 849720f for src/SynTree/Expression.cc

Timestamp:

Sep 23, 2019, 4:59:33 PM (4 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

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

Children:

4a60488, b4f8808

Parents:

abec2f8

Message:

lvalue should now always come directly from the expression.

File:

• src/SynTree/Expression.cc (modified) (11 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;
 }
@@ -140 +140 @@
 
 bool VariableExpr::get_lvalue() const {
-        return result->get_lvalue();
+        // It isn't always an lvalue, but it is never an rvalue.
+        return true;
 }
 
@@ -277 +278 @@
 
 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 +362 @@
 }
 
+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;
@@ -392 +398 @@
 
 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;
 }
@@ -447 +453 @@
 
 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 +519 @@
 
 bool ConditionalExpr::get_lvalue() const {
-        return result->get_lvalue();
+        return false;
 }
 
@@ -570 +579 @@
 
 bool ConstructorExpr::get_lvalue() const {
-        return result->get_lvalue();
+        return false;
 }
 
@@ -593 +602 @@
 
 bool CompoundLiteralExpr::get_lvalue() const {
-        assert( result->get_lvalue() );
         return true;
 }
@@ -648 +656 @@
 }
 bool StmtExpr::get_lvalue() const {
-        return result->get_lvalue();
+        return false;
 }
 void StmtExpr::print( std::ostream & os, Indenter indent ) const {