Changeset c2051e10 for src/SynTree

Timestamp:

Sep 10, 2019, 2:48:01 PM (6 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, stuck-waitfor-destruct

Children:

81e60f7

Parents:

17bc05b (diff), 216597d (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' into distcc

Location:

src/SynTree

Files:

• Expression.cc (modified) (2 diffs)
• Expression.h (modified) (2 diffs)
• Type.h (modified) (2 diffs)

src/SynTree/Expression.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Tue Aug 13 11:31:00 2019
-// Update Count     : 63
+// Last Modified On : Thr Aug 15 13:43:00 2019
+// Update Count     : 64
 //
 
@@ -646 +646 @@
                 result = new VoidType( Type::Qualifiers() );
         }
+}
+bool StmtExpr::get_lvalue() const {
+        return result->get_lvalue();
 }
 void StmtExpr::print( std::ostream & os, Indenter indent ) const {

src/SynTree/Expression.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed Aug 14 14:24:00 2019
-// Update Count     : 53
+// Last Modified On : Thr Aug 15 13:46:00 2019
+// Update Count     : 54
 //
 
@@ -777 +777 @@
         virtual ~StmtExpr();
 
+        bool get_lvalue() const final;
+
         CompoundStmt * get_statements() const { return statements; }
         StmtExpr * set_statements( CompoundStmt * newValue ) { statements = newValue; return this; }

src/SynTree/Type.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 Feb 14 17:11:24 2019
-// Update Count     : 169
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Sep  4 09:58:00 2019
+// Update Count     : 170
 //
 
@@ -131 +131 @@
                 bool operator>( Qualifiers other ) const { return *this != other && *this >= other; }
                 BFCommon( Qualifiers, NumTypeQualifier )
+
+                Qualifiers unify( Qualifiers const & other ) const {
+                        int or_flags = Mask & (val | other.val);
+                        int and_flags = val & other.val;
+                        return Qualifiers( or_flags | and_flags );
+                }
         }; // Qualifiers