Changeset 3d5701e for src/SynTree/Type.h

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/Type.h (modified) (6 diffs)

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
 //
 
@@ -102 +102 @@
         }; // StorageClasses
 
-        enum { Const = 1 << 0, Restrict = 1 << 1, Volatile = 1 << 2, Lvalue = 1 << 3, Mutex = 1 << 4, Atomic = 1 << 5, NumTypeQualifier = 6 };
+        enum { Const = 1 << 0, Restrict = 1 << 1, Volatile = 1 << 2, Mutex = 1 << 3, Atomic = 1 << 4, NumTypeQualifier = 5 };
         static const char * QualifiersNames[];
         union Qualifiers {
-                enum { Mask = ~(Restrict | Lvalue) };
+                enum { Mask = ~Restrict };
                 unsigned int val;
                 struct {
@@ -111 +111 @@
                         bool is_restrict : 1;
                         bool is_volatile : 1;
-                        bool is_lvalue : 1;
                         bool is_mutex : 1;
                         bool is_atomic : 1;
@@ -131 +130 @@
                 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
 
@@ -147 +152 @@
         bool get_volatile() const { return tq.is_volatile; }
         bool get_restrict() const { return tq.is_restrict; }
-        bool get_lvalue() const { return tq.is_lvalue; }
         bool get_mutex() const { return tq.is_mutex; }
         bool get_atomic() const { return tq.is_atomic; }
@@ -153 +157 @@
         void set_volatile( bool newValue ) { tq.is_volatile = newValue; }
         void set_restrict( bool newValue ) { tq.is_restrict = newValue; }
-        void set_lvalue( bool newValue ) { tq.is_lvalue = newValue; }
         void set_mutex( bool newValue ) { tq.is_mutex = newValue; }
         void set_atomic( bool newValue ) { tq.is_atomic = newValue; }