Changeset 3f3bfe5a for src/AST

Timestamp:

Oct 11, 2019, 2:23:30 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:

396b830

Parents:

cf32116 (diff), 70b4ea20 (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 from master to new-ast. Removing old lvalue support.

Location:

src/AST

Files:

• CVQualifiers.hpp (modified) (2 diffs)
• Expr.cpp (modified) (8 diffs)
• Type.hpp (modified) (2 diffs)

src/AST/CVQualifiers.hpp

@@ -27 +27 @@
                 Restrict = 1 << 1,
                 Volatile = 1 << 2,
-                Lvalue   = 1 << 3,
-                Mutex    = 1 << 4,
-                Atomic   = 1 << 5,
-                NumQualifiers = 6
+                Mutex    = 1 << 3,
+                Atomic   = 1 << 4,
+                NumQualifiers = 5
         };
 
         /// Mask for equivalence-preserving qualfiers
-        enum { EquivQualifiers = ~(Restrict | Lvalue) };
+        enum { EquivQualifiers = ~Restrict };
 
         /// Underlying data for qualifiers
@@ -44 +43 @@
                                 bool is_restrict : 1;
                                 bool is_volatile : 1;
-                                bool is_lvalue   : 1;
                                 bool is_mutex    : 1;
                                 bool is_atomic   : 1;

src/AST/Expr.cpp

@@ -10 +10 @@
 // Created On       : Wed May 15 17:00:00 2019
 // Last Modified By : Andrew Beach
-// Created On       : Thr Jun 26 12:12:00 2019
-// Update Count     : 3
+// Created On       : Fri Oct  4 15:34:00 2019
+// Update Count     : 4
 //
 
@@ -82 +82 @@
                         // base type
                         ret->result = base;
-                        add_qualifiers( ret->result, CV::Lvalue );
                 }
         }
@@ -131 +130 @@
                         // lvalue, retains all levels of reference, and gains a pointer inside the references
                         Type * res = addrType( arg->result );
-                        res->set_lvalue( false ); // result of & is never an lvalue
                         result = res;
                 } else {
@@ -138 +136 @@
                                         dynamic_cast< const ReferenceType * >( arg->result.get() ) ) {
                                 Type * res = addrType( refType->base );
-                                res->set_lvalue( false ); // result of & is never an lvalue
                                 result = res;
                         } else {
@@ -230 +227 @@
         // substitute aggregate generic parameters into member type
         genericSubstitution( aggregate->result ).apply( result );
-        // ensure lvalue and appropriate restrictions from aggregate type
-        add_qualifiers( result, aggregate->result->qualifiers | CV::Lvalue );
+        // ensure appropriate restrictions from aggregate type
+        add_qualifiers( result, aggregate->result->qualifiers );
 }
 
@@ -257 +254 @@
         assert( var );
         assert( var->get_type() );
-        auto r = shallowCopy( var->get_type() );
-        r->qualifiers |= CV::Lvalue;
-        result = r;
+        result = shallowCopy( var->get_type() );
 }
 
@@ -376 +371 @@
         assert( t && i );
         result = t;
-        add_qualifiers( result, CV::Lvalue );
 }
 
@@ -397 +391 @@
         // like MemberExpr, TupleIndexExpr is always an lvalue
         result = type->types[ index ];
-        add_qualifiers( result, CV::Lvalue );
 }
 

src/AST/Type.hpp

@@ -51 +51 @@
         bool is_volatile() const { return qualifiers.is_volatile; }
         bool is_restrict() const { return qualifiers.is_restrict; }
-        bool is_lvalue() const { return qualifiers.is_lvalue; }
         bool is_mutex() const { return qualifiers.is_mutex; }
         bool is_atomic() const { return qualifiers.is_atomic; }
@@ -58 +57 @@
         Type * set_volatile( bool v ) { qualifiers.is_volatile = v; return this; }
         Type * set_restrict( bool v ) { qualifiers.is_restrict = v; return this; }
-        Type * set_lvalue( bool v ) { qualifiers.is_lvalue = v; return this; }
         Type * set_mutex( bool v ) { qualifiers.is_mutex = v; return this; }
         Type * set_atomic( bool v ) { qualifiers.is_atomic = v; return this; }