Changeset 3d5701e for src/SynTree/Expression.cc

Timestamp:

Feb 25, 2020, 1:17:33 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

7dc2e015

Parents:

9fb8f01 (diff), dd9e1ca (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:

resolve conflict

File:

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

src/SynTree/Expression.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Thr Aug 15 13:43:00 2019
-// Update Count     : 64
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Dec 11 07:55:15 2019
+// Update Count     : 70
 //
 
@@ -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
-#include "Declaration.h"             // for ObjectDecl, DeclarationWithType
 #include "Expression.h"              // for Expression, ImplicitCopyCtorExpr
 #include "InitTweak/InitTweak.h"     // for getCallArg, getPointerBase
@@ -64 +64 @@
 
 bool Expression::get_lvalue() const {
-        assert( !result->get_lvalue() );
         return false;
 }
@@ -115 +114 @@
         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 +123 @@
         //      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 +138 @@
 
 bool VariableExpr::get_lvalue() const {
-        return result->get_lvalue();
+        // It isn't always an lvalue, but it is never an rvalue.
+        return true;
 }
 
@@ -277 +276 @@
 
 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();
 }
 
@@ -293 +293 @@
 }
 
-KeywordCastExpr::KeywordCastExpr( Expression * arg, Target target ) : Expression(), arg(arg), target( target ) {
+KeywordCastExpr::KeywordCastExpr( Expression * arg, AggregateDecl::Aggregate target ) : Expression(), arg(arg), target( target ) {
 }
 
@@ -303 +303 @@
 }
 
-const std::string & KeywordCastExpr::targetString() const {
-        static const std::string targetStrs[] = {
-                "coroutine", "thread", "monitor"
-        };
-        static_assert(
-                (sizeof(targetStrs) / sizeof(targetStrs[0])) == ((unsigned long)NUMBER_OF_TARGETS),
-                "Each KeywordCastExpr::Target should have a corresponding string representation"
-        );
-        return targetStrs[(unsigned long)target];
+const char * KeywordCastExpr::targetString() const {
+        return AggregateDecl::aggrString( target );
 }
 
@@ -360 +353 @@
 }
 
+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 +375 @@
         sub.apply( res );
         result = res;
-        result->set_lvalue( true );
         result->get_qualifiers() |= aggregate->result->get_qualifiers();
 }
@@ -392 +388 @@
 
 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 +423 @@
                         // 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 +440 @@
 
 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 +506 @@
 
 bool ConditionalExpr::get_lvalue() const {
-        return result->get_lvalue();
+        return false;
 }
 
@@ -523 +519 @@
 }
 
-AsmExpr::AsmExpr( const AsmExpr & other ) : Expression( other ), inout( maybeClone( other.inout ) ), constraint( maybeClone( other.constraint ) ), operand( maybeClone( other.operand ) ) {}
+AsmExpr::AsmExpr( const AsmExpr & other ) : Expression( other ), inout( other.inout ), constraint( maybeClone( other.constraint ) ), operand( maybeClone( other.operand ) ) {}
 
 
 void AsmExpr::print( std::ostream & os, Indenter indent ) const {
         os << "Asm Expression: " << std::endl;
-        if ( inout ) inout->print( os, indent+1 );
+        if ( !inout.empty() ) os <<  "[" << inout << "] ";
         if ( constraint ) constraint->print( os, indent+1 );
         if ( operand ) operand->print( os, indent+1 );
@@ -570 +566 @@
 
 bool ConstructorExpr::get_lvalue() const {
-        return result->get_lvalue();
+        return false;
 }
 
@@ -582 +578 @@
 CompoundLiteralExpr::CompoundLiteralExpr( Type * type, Initializer * initializer ) : initializer( initializer ) {
         assert( type && initializer );
-        type->set_lvalue( true );
         set_result( type );
 }
@@ -593 +588 @@
 
 bool CompoundLiteralExpr::get_lvalue() const {
-        assert( result->get_lvalue() );
         return true;
 }
@@ -648 +642 @@
 }
 bool StmtExpr::get_lvalue() const {
-        return result->get_lvalue();
+        return false;
 }
 void StmtExpr::print( std::ostream & os, Indenter indent ) const {