Changeset f841241 for src/Parser/DeclarationNode.cc

Timestamp:

Mar 15, 2017, 11:23:48 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

9243cc91, ecc7752

Parents:

3831b58 (diff), e61a35e (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

File:

• src/Parser/DeclarationNode.cc (modified) (11 diffs)

src/Parser/DeclarationNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 12:34:05 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar 14 10:19:38 2017
-// Update Count     : 964
+// Last Modified On : Tue Mar 14 14:45:52 2017
+// Update Count     : 973
 //
 
@@ -202 +202 @@
 
 
-DeclarationNode * DeclarationNode::newStorageClass( DeclarationNode::StorageClasses sc ) {
+DeclarationNode * DeclarationNode::newStorageClass( StorageClasses sc ) {
         DeclarationNode * newnode = new DeclarationNode;
         newnode->storageClasses = sc;
@@ -208 +208 @@
 } // DeclarationNode::newStorageClass
 
-DeclarationNode * DeclarationNode::newFuncSpecifier( DeclarationNode::FuncSpecifiers fs ) {
+DeclarationNode * DeclarationNode::newFuncSpecifier( FuncSpecifiers fs ) {
         DeclarationNode * newnode = new DeclarationNode;
         newnode->funcSpecs = fs;
@@ -214 +214 @@
 } // DeclarationNode::newFuncSpecifier
 
-DeclarationNode * DeclarationNode::newTypeQualifier( TypeQualifier tq ) {
+DeclarationNode * DeclarationNode::newTypeQualifier( TypeQualifiers tq ) {
         DeclarationNode * newnode = new DeclarationNode;
         newnode->type = new TypeData();
-        newnode->type->typeQualifiers[ tq ] = true;
+        newnode->type->typeQualifiers = tq;
         return newnode;
 } // DeclarationNode::newQualifier
@@ -457 +457 @@
 
 void DeclarationNode::checkQualifiers( const TypeData * src, const TypeData * dst ) {
-        const TypeData::TypeQualifiers qsrc = src->typeQualifiers, qdst = dst->typeQualifiers; // optimization
-
-        if ( (qsrc & qdst).any() ) {                                            // duplicates ?
+        const TypeQualifiers qsrc = src->typeQualifiers, qdst = dst->typeQualifiers; // optimization
+
+        if ( (qsrc.val & qdst.val) != 0 ) {                                     // duplicates ?
                 for ( unsigned int i = 0; i < NoTypeQualifier; i += 1 ) { // find duplicates
                         if ( qsrc[i] && qdst[i] ) {
@@ -520 +520 @@
                 src = nullptr;
         } else {
-                dst->typeQualifiers |= src->typeQualifiers;
+                dst->typeQualifiers.val |= src->typeQualifiers.val;
         } // if
 } // addQualifiersToType
@@ -578 +578 @@
                 switch ( dst->kind ) {
                   case TypeData::Unknown:
-                        src->typeQualifiers |= dst->typeQualifiers;
+                        src->typeQualifiers.val |= dst->typeQualifiers.val;
                         dst = src;
                         src = nullptr;
                         break;
                   case TypeData::Basic:
-                        dst->typeQualifiers |= src->typeQualifiers;
+                        dst->typeQualifiers.val |= src->typeQualifiers.val;
                         if ( src->kind != TypeData::Unknown ) {
                                 assert( src->kind == TypeData::Basic );
@@ -619 +619 @@
                                         dst->base->aggInst.params = maybeClone( src->aggregate.actuals );
                                 } // if
-                                dst->base->typeQualifiers |= src->typeQualifiers;
+                                dst->base->typeQualifiers.val |= src->typeQualifiers.val;
                                 src = nullptr;
                                 break;
@@ -651 +651 @@
                                                 type->aggInst.hoistType = o->type->enumeration.body;
                                         } // if
-                                        type->typeQualifiers |= o->type->typeQualifiers;
+                                        type->typeQualifiers.val |= o->type->typeQualifiers.val;
                                 } else {
                                         type = o->type;
@@ -807 +807 @@
                                         p->type->base->aggInst.params = maybeClone( type->aggregate.actuals );
                                 } // if
-                                p->type->base->typeQualifiers |= type->typeQualifiers;
+                                p->type->base->typeQualifiers.val |= type->typeQualifiers.val;
                                 break;
 
@@ -844 +844 @@
                                         lastArray->base->aggInst.params = maybeClone( type->aggregate.actuals );
                                 } // if
-                                lastArray->base->typeQualifiers |= type->typeQualifiers;
+                                lastArray->base->typeQualifiers.val |= type->typeQualifiers.val;
                                 break;
                           default: