Changeset f7e4db27 for src/Parser/parser.yy

Timestamp:

Jul 20, 2018, 3:51:48 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

f2f512ba

Parents:

dea36ee

Message:

improve error messages for useless declarations

File:

• src/Parser/parser.yy (modified) (5 diffs)

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 Jul 19 22:21:56 2018
-// Update Count     : 3827
+// Last Modified On : Fri Jul 20 11:46:46 2018
+// Update Count     : 3837
 //
 
@@ -172 +172 @@
         return new_name;
 } // build_postfix_name
+
+DeclarationNode * fieldDecl( DeclarationNode * typeSpec, DeclarationNode * fieldList ) {
+        if ( ! fieldList ) {                                                            // field declarator ?
+                if ( ! ( typeSpec->type && typeSpec->type->kind == TypeData::Aggregate ) ) {
+                        stringstream ss;
+                        typeSpec->type->print( ss );
+                        SemanticWarning( yylloc, Warning::SuperfluousDecl, ss.str().c_str() );
+                        return nullptr;
+                } // if
+                fieldList = DeclarationNode::newName( nullptr );
+        } // if
+        return distAttr( typeSpec, fieldList );                         // mark all fields in list
+} // fieldDecl
 
 bool forall = false, yyy = false;                                               // aggregate have one or more forall qualifiers ?
@@ -1942 +1955 @@
 field_declaration:
         type_specifier field_declaring_list_opt ';'
-                {
-                        if ( ! $2 ) {                                                           // field declarator ?
-                                $2 = DeclarationNode::newName( nullptr );
-                                if ( ! ( $1->type && $1->type->kind == TypeData::Aggregate ) ) {
-                                        SemanticWarning( yylloc, Warning::SuperfluousDecl, "" );
-                                } // if
-                        } // if
-                        $$ = distAttr( $1, $2 );                                        // mark all fields in list
-                }
+                { $$ = fieldDecl( $1, $2 ); }
         | EXTENSION type_specifier field_declaring_list_opt ';' // GCC
-                {
-                        if ( ! $3 ) {                                                           // field declarator ?
-                                $3 = DeclarationNode::newName( nullptr );
-                                if ( ! ( $2->type && $2->type->kind == TypeData::Aggregate ) ) {
-                                        SemanticWarning( yylloc, Warning::SuperfluousDecl, "" );
-                                } // if
-                        } // if
-                        $$ = distAttr( $2, $3 );                                        // mark all fields in list
-                        distExt( $$ );
-                }
+                { $$ = fieldDecl( $2, $3 ); distExt( $$ ); }
         | INLINE type_specifier field_abstract_list_opt ';'     // CFA
                 {
@@ -2009 +2005 @@
 
 field_abstract:
-        //      no bit fields
+                //      no bit fields
         variable_abstract_declarator
         ;
 
 cfa_field_declaring_list:                                                               // CFA, new style field declaration
+        // bit-fields are handled by C declarations
         cfa_abstract_declarator_tuple no_attr_identifier_or_type_name
                 { $$ = $1->addName( $2 ); }
@@ -2021 +2018 @@
 
 cfa_field_abstract_list:                                                                // CFA, new style field declaration
+        // bit-fields are handled by C declarations
         cfa_abstract_declarator_tuple
         | cfa_field_abstract_list ','