Changeset 099e202 for src/Parser/DeclarationNode.cc

Timestamp:

May 16, 2018, 1:32:01 PM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, 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, with_gc

Children:

c1ec14f

Parents:

bd6e226 (diff), e9a7e90b (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:/u/cforall/software/cfa/cfa-cc

File:

• src/Parser/DeclarationNode.cc (modified) (3 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 : Thu Apr 26 13:45:10 2018
-// Update Count     : 1064
+// Last Modified On : Wed May 16 09:37:17 2018
+// Update Count     : 1070
 //
 
@@ -529 +529 @@
 
 DeclarationNode * DeclarationNode::addQualifiers( DeclarationNode * q ) {
-        if ( ! q ) { delete q; return this; }                           // empty qualifier
+        if ( ! q ) { return this; }                                                     // empty qualifier
 
         checkSpecifiers( q );
@@ -563 +563 @@
 
         checkQualifiers( type, q->type );
-        if ( (builtin == Zero || builtin == One) && error.length() == 0 ) {
+        if ( (builtin == Zero || builtin == One) && q->type->qualifiers.val != 0 && error.length() == 0 ) {
                 SemanticWarning( yylloc, Warning::BadQualifiersZeroOne, Type::QualifiersNames[ilog2( q->type->qualifiers.val )], builtinTypeNames[builtin] );
-//              appendError( error, string( "questionable qualifiers" ) );
         } // if
         addQualifiersToType( q->type, type );