Changeset 4a60488 for src/SynTree/Expression.cc

Timestamp:

Sep 27, 2019, 3:35:46 PM (6 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

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

Children:

90ce35aa

Parents:

8e1467d (diff), 849720f (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:

Merged from master taking the lvalue changes to expression and everything before that.

File:

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

src/SynTree/Expression.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Feb 19 18:10:55 2019
-// Update Count     : 60
+// Last Modified By : Andrew Beach
+// Last Modified On : Thr Aug 15 13:43:00 2019
+// Update Count     : 64
 //
 
@@ -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
@@ -63 +64 @@
 }
 
+bool Expression::get_lvalue() const {
+        return false;
+}
+
 void Expression::print( std::ostream & os, Indenter indent ) const {
         printInferParams( inferParams, os, indent+1, 0 );
@@ -134 +139 @@
 }
 
+bool VariableExpr::get_lvalue() const {
+        // It isn't always an lvalue, but it is never an rvalue.
+        return true;
+}
+
 VariableExpr * VariableExpr::functionPointer( FunctionDecl * func ) {
         VariableExpr * funcExpr = new VariableExpr( func );
@@ -252 +262 @@
 }
 
-AttrExpr::AttrExpr( Expression * attr, Expression * expr_ ) :
-                Expression(), attr( attr ), expr(expr_), type(0), isType(false) {
-}
-
-AttrExpr::AttrExpr( Expression * attr, Type * type_ ) :
-                Expression(), attr( attr ), expr(0), type(type_), isType(true) {
-}
-
-AttrExpr::AttrExpr( const AttrExpr & other ) :
-                Expression( other ), attr( maybeClone( other.attr ) ), expr( maybeClone( other.expr ) ), type( maybeClone( other.type ) ), isType( other.isType ) {
-}
-
-AttrExpr::~AttrExpr() {
-        delete attr;
-        delete expr;
-        delete type;
-}
-
-void AttrExpr::print( std::ostream & os, Indenter indent) const {
-        os << "Attr ";
-        attr->print( os, indent+1);
-        if ( isType || expr ) {
-                os << "applied to: ";
-                if (isType) type->print(os, indent+1);
-                else expr->print(os, indent+1);
-        } // if
-        Expression::print( os, indent );
-}
-
 CastExpr::CastExpr( Expression * arg, Type * toType, bool isGenerated ) : arg(arg), isGenerated( isGenerated ) {
         set_result(toType);
@@ -294 +275 @@
 CastExpr::~CastExpr() {
         delete arg;
+}
+
+bool CastExpr::get_lvalue() const {
+        // This is actually wrong by C, but it works with our current set-up.
+        return arg->get_lvalue();
 }
 
@@ -376 +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;
@@ -405 +395 @@
         // don't delete the member declaration, since it points somewhere else in the tree
         delete aggregate;
+}
+
+bool MemberExpr::get_lvalue() const {
+        // This is actually wrong by C, but it works with our current set-up.
+        return true;
 }
 
@@ -457 +452 @@
 }
 
+bool UntypedExpr::get_lvalue() const {
+        // 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);
+}
 
 void UntypedExpr::print( std::ostream & os, Indenter indent ) const {
@@ -515 +516 @@
         delete arg2;
         delete arg3;
+}
+
+bool ConditionalExpr::get_lvalue() const {
+        return false;
 }
 
@@ -573 +578 @@
 }
 
+bool ConstructorExpr::get_lvalue() const {
+        return false;
+}
+
 void ConstructorExpr::print( std::ostream & os, Indenter indent ) const {
         os <<  "Constructor Expression: " << std::endl << indent+1;
@@ -590 +599 @@
 CompoundLiteralExpr::~CompoundLiteralExpr() {
         delete initializer;
+}
+
+bool CompoundLiteralExpr::get_lvalue() const {
+        return true;
 }
 
@@ -641 +654 @@
                 result = new VoidType( Type::Qualifiers() );
         }
+}
+bool StmtExpr::get_lvalue() const {
+        return false;
 }
 void StmtExpr::print( std::ostream & os, Indenter indent ) const {