Changeset 946bcca for src/Parser

Timestamp:

Mar 17, 2017, 1:14:44 PM (8 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, resolv-new, with_gc

Children:

14a33790, 7c70089, 89d129c

Parents:

b2f5082 (diff), 615a096 (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

Location:

src/Parser

Files:

• DeclarationNode.cc (modified) (14 diffs)
• TypeData.cc (modified) (2 diffs)
• lex.ll (modified) (2 diffs)
• parser.yy (modified) (5 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 Mar 16 09:10:57 2017
-// Update Count     : 1007
+// Last Modified On : Fri Mar 17 08:46:05 2017
+// Update Count     : 1017
 //
 
@@ -19 +19 @@
 #include <algorithm>
 #include <cassert>
-#include <strings.h>                                                                    // ffs
 
 #include "TypeData.h"
@@ -243 +242 @@
 
 DeclarationNode * DeclarationNode::newAggregate( Aggregate kind, const string * name, ExpressionNode * actuals, DeclarationNode * fields, bool body ) {
+        assert( name );
         DeclarationNode * newnode = new DeclarationNode;
         newnode->type = new TypeData( TypeData::Aggregate );
         newnode->type->aggregate.kind = kind;
-        if ( name ) {
-                newnode->type->aggregate.name = name;
-        } else {                                                                                        // anonymous aggregate ?
-                newnode->type->aggregate.name = new string( anonymous.newName() );
-        } // if
+        newnode->type->aggregate.name = name;
         newnode->type->aggregate.actuals = actuals;
         newnode->type->aggregate.fields = fields;
@@ -258 +254 @@
 
 DeclarationNode * DeclarationNode::newEnum( string * name, DeclarationNode * constants, bool body ) {
+        assert( name );
         DeclarationNode * newnode = new DeclarationNode;
         newnode->type = new TypeData( TypeData::Enum );
-        if ( name ) {
-                newnode->type->enumeration.name = name;
-        } else {                                                                                        // anonymous aggregate ?
-                newnode->type->enumeration.name = new string( anonymous.newName() );
-        } // if
+        newnode->type->enumeration.name = name;
         newnode->type->enumeration.constants = constants;
         newnode->type->enumeration.body = body;
@@ -436 +429 @@
         const Type::Qualifiers qsrc = src->qualifiers, qdst = dst->qualifiers; // optimization
 
-        if ( (qsrc.val & qdst.val) != 0 ) {                                     // duplicates ?
+        if ( (qsrc & qdst).any() ) {                                            // duplicates ?
                 for ( unsigned int i = 0; i < Type::NumTypeQualifier; i += 1 ) { // find duplicates
                         if ( qsrc[i] && qdst[i] ) {
-                                appendError( error, string( "duplicate " ) + Type::Qualifiers::Names[i] );
+                                appendError( error, string( "duplicate " ) + Type::QualifiersNames[i] );
                         } // if
                 } // for
@@ -446 +439 @@
 
 void DeclarationNode::checkSpecifiers( DeclarationNode * src ) {
-        if ( (funcSpecs.val & src->funcSpecs.val) != 0 ) {      // duplicates ?
+        if ( (funcSpecs & src->funcSpecs).any() ) {                     // duplicates ?
                 for ( unsigned int i = 0; i < Type::NumFuncSpecifier; i += 1 ) { // find duplicates
                         if ( funcSpecs[i] && src->funcSpecs[i] ) {
-                                appendError( error, string( "duplicate " ) + Type::FuncSpecifiers::Names[i] );
+                                appendError( error, string( "duplicate " ) + Type::FuncSpecifiersNames[i] );
                         } // if
                 } // for
@@ -455 +448 @@
 
         if ( storageClasses.any() && src->storageClasses.any() ) { // any reason to check ?
-                if ( (storageClasses.val & src->storageClasses.val ) != 0 ) { // duplicates ?
+                if ( (storageClasses & src->storageClasses ).any() ) { // duplicates ?
                         for ( unsigned int i = 0; i < Type::NumStorageClass; i += 1 ) { // find duplicates
                                 if ( storageClasses[i] && src->storageClasses[i] ) {
-                                        appendError( error, string( "duplicate " ) + Type::StorageClasses::Names[i] );
+                                        appendError( error, string( "duplicate " ) + Type::StorageClassesNames[i] );
                                 } // if
                         } // for
                         // src is the new item being added and has a single bit
                 } else if ( ! src->storageClasses.is_threadlocal ) { // conflict ?
-                        appendError( error, string( "conflicting " ) + Type::StorageClasses::Names[ffs( storageClasses.val ) - 1] +
-                                                 " & " + Type::StorageClasses::Names[ffs( src->storageClasses.val ) - 1] );
-                        src->storageClasses.val = 0;                            // FIX to preserve invariant of one basic storage specifier
+                        appendError( error, string( "conflicting " ) + Type::StorageClassesNames[storageClasses.ffs()] +
+                                                 " & " + Type::StorageClassesNames[src->storageClasses.ffs()] );
+                        src->storageClasses.reset();                            // FIX to preserve invariant of one basic storage specifier
                 } // if
         } // if
@@ -473 +466 @@
 
 DeclarationNode * DeclarationNode::copySpecifiers( DeclarationNode * q ) {
-        funcSpecs.val |= q->funcSpecs.val;
-        storageClasses.val |= q->storageClasses.val;
+        funcSpecs |= q->funcSpecs;
+        storageClasses |= q->storageClasses;
 
         for ( Attribute *attr: reverseIterate( q->attributes ) ) {
@@ -497 +490 @@
                 src = nullptr;
         } else {
-                dst->qualifiers += src->qualifiers;
+                dst->qualifiers |= src->qualifiers;
         } // if
 } // addQualifiersToType
@@ -555 +548 @@
                 switch ( dst->kind ) {
                   case TypeData::Unknown:
-                        src->qualifiers += dst->qualifiers;
+                        src->qualifiers |= dst->qualifiers;
                         dst = src;
                         src = nullptr;
                         break;
                   case TypeData::Basic:
-                        dst->qualifiers += src->qualifiers;
+                        dst->qualifiers |= src->qualifiers;
                         if ( src->kind != TypeData::Unknown ) {
                                 assert( src->kind == TypeData::Basic );
@@ -596 +589 @@
                                         dst->base->aggInst.params = maybeClone( src->aggregate.actuals );
                                 } // if
-                                dst->base->qualifiers += src->qualifiers;
+                                dst->base->qualifiers |= src->qualifiers;
                                 src = nullptr;
                                 break;
@@ -628 +621 @@
                                                 type->aggInst.hoistType = o->type->enumeration.body;
                                         } // if
-                                        type->qualifiers += o->type->qualifiers;
+                                        type->qualifiers |= o->type->qualifiers;
                                 } else {
                                         type = o->type;
@@ -784 +777 @@
                                         p->type->base->aggInst.params = maybeClone( type->aggregate.actuals );
                                 } // if
-                                p->type->base->qualifiers += type->qualifiers;
+                                p->type->base->qualifiers |= type->qualifiers;
                                 break;
 
@@ -821 +814 @@
                                 lastArray->base->aggInst.params = maybeClone( type->aggregate.actuals );
                         } // if
-                        lastArray->base->qualifiers += type->qualifiers;
+                        lastArray->base->qualifiers |= type->qualifiers;
                         break;
                   default:

src/Parser/TypeData.cc ¶

@@ -10 +10 @@
 // Created On       : Sat May 16 15:12:51 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar 16 08:32:42 2017
-// Update Count     : 559
+// Last Modified On : Fri Mar 17 08:46:10 2017
+// Update Count     : 560
 //
 
@@ -227 +227 @@
 void TypeData::print( ostream &os, int indent ) const {
         for ( int i = 0; i < Type::NumTypeQualifier; i += 1 ) {
-                if ( qualifiers[i] ) os << Type::Qualifiers::Names[ i ] << ' ';
+                if ( qualifiers[i] ) os << Type::QualifiersNames[ i ] << ' ';
         } // for
 

src/Parser/lex.ll ¶

@@ -10 +10 @@
  * Created On       : Sat Sep 22 08:58:10 2001
  * Last Modified By : Peter A. Buhr
- * Last Modified On : Thu Mar  9 21:38:26 2017
- * Update Count     : 505
+ * Last Modified On : Mon Mar 13 08:36:17 2017
+ * Update Count     : 506
  */
 
@@ -313 +313 @@
 
                                 /* punctuation */
+"@"                             { ASCIIOP_RETURN(); }
 "["                             { ASCIIOP_RETURN(); }
 "]"                             { ASCIIOP_RETURN(); }

src/Parser/parser.yy ¶

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar 16 08:36:17 2017
-// Update Count     : 2310
+// Last Modified On : Thu Mar 16 12:57:03 2017
+// Update Count     : 2316
 //
 
@@ -1612 +1612 @@
 aggregate_type:                                                                                 // struct, union
         aggregate_key attribute_list_opt '{' field_declaration_list '}'
-                { $$ = DeclarationNode::newAggregate( $1, nullptr, nullptr, $4, true )->addQualifiers( $2 ); }
+                { $$ = DeclarationNode::newAggregate( $1, new string( DeclarationNode::anonymous.newName() ), nullptr, $4, true )->addQualifiers( $2 ); }
         | aggregate_key attribute_list_opt no_attr_identifier_or_type_name
                 { typedefTable.makeTypedef( *$3 ); }
@@ -1618 +1618 @@
                 { $$ = DeclarationNode::newAggregate( $1, $3, nullptr, $6, true )->addQualifiers( $2 ); }
         | aggregate_key attribute_list_opt '(' type_name_list ')' '{' field_declaration_list '}' // CFA
-                { $$ = DeclarationNode::newAggregate( $1, nullptr, $4, $7, false )->addQualifiers( $2 ); }
+                { $$ = DeclarationNode::newAggregate( $1, new string( DeclarationNode::anonymous.newName() ), $4, $7, false )->addQualifiers( $2 ); }
         | aggregate_type_nobody
         ;
@@ -1688 +1688 @@
         // empty
                 { $$ = DeclarationNode::newName( 0 ); /* XXX */ } // CFA, no field name
-        // '@' // empty
-        //      { $$ = DeclarationNode::newName( 0 ); /* XXX */ } // CFA, no field name
+        // '@'
+        //      { $$ = DeclarationNode::newName( new string( DeclarationNode::anonymous.newName() ) ); } // CFA, no field name
         | bit_subrange_size                                                                     // no field name
                 { $$ = DeclarationNode::newBitfield( $1 ); }
@@ -1715 +1715 @@
 enum_type:                                                                                              // enum
         ENUM attribute_list_opt '{' enumerator_list comma_opt '}'
-                { $$ = DeclarationNode::newEnum( nullptr, $4, true )->addQualifiers( $2 ); }
+                { $$ = DeclarationNode::newEnum( new string( DeclarationNode::anonymous.newName() ), $4, true )->addQualifiers( $2 ); }
         | ENUM attribute_list_opt no_attr_identifier_or_type_name
                 { typedefTable.makeTypedef( *$3 ); }