Changeset 98399b2 for src/SynTree

Timestamp:

Aug 9, 2019, 11:09:43 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:

4f5a8a2

Parents:

8c63bb4 (diff), 0f19f5e5 (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

Location:

src/SynTree

Files:

• AddressExpr.cc (modified) (1 diff)
• Expression.cc (modified) (2 diffs)
• Expression.h (modified) (2 diffs)

src/SynTree/AddressExpr.cc

@@ -42 +42 @@
 AddressExpr::AddressExpr( Expression *arg ) : Expression(), arg( arg ) {
         if ( arg->result ) {
-                if ( arg->result->get_lvalue() ) {
+                if ( arg->get_lvalue() ) {
                         // lvalue, retains all layers of reference and gains a pointer inside the references
                         set_result( addrType( arg->result ) );

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 : Thu Jul 25 22:21:48 2019
-// Update Count     : 61
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Aug  7 17:03:00 2019
+// Update Count     : 62
 //
 
@@ -61 +61 @@
         delete env;
         delete result;
+}
+
+bool Expression::get_lvalue() const {
+        return result->get_lvalue();
 }
 

src/SynTree/Expression.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 25 22:21:44 2019
-// Update Count     : 50
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Aug  7 16:56:00 2019
+// Update Count     : 51
 //
 
@@ -71 +71 @@
         const Type * get_result() const { return result; }
         void set_result( Type * newValue ) { result = newValue; }
+        bool get_lvalue() const;
 
         TypeSubstitution * get_env() const { return env; }