Changeset ff29f08 for src/Parser/DeclarationNode.cc

Timestamp:

May 18, 2018, 2:09:21 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

2472a19

Parents:

f6f0cca3 (diff), c7d8100c (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 remote-tracking branch 'origin/master' into with_gc

File:

• src/Parser/DeclarationNode.cc (modified) (4 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 : Fri Apr 20 22:37:20 2018
-// Update Count     : 1063
+// Last Modified On : Wed May 16 09:37:17 2018
+// Update Count     : 1070
 //
 
@@ -526 +526 @@
 
 DeclarationNode * DeclarationNode::addQualifiers( DeclarationNode * q ) {
-        if ( ! q ) { delete q; return this; }                           // empty qualifier
+        if ( ! q ) { return this; }                                                     // empty qualifier
 
         checkSpecifiers( q );
@@ -560 +560 @@
 
         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 );
@@ -782 +781 @@
 DeclarationNode * DeclarationNode::addPointer( DeclarationNode * p ) {
         if ( p ) {
-                assert( p->type->kind == TypeData::Pointer || TypeData::Reference );
+                assert( p->type->kind == TypeData::Pointer || p->type->kind == TypeData::Reference );
                 setBase( p->type );
                 p->type = nullptr;