Changeset f7e4db27 for src/Parser

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

Location:

src/Parser

Files:

• TypeData.cc (modified) (6 diffs)
• TypeData.h (modified) (3 diffs)
• parser.yy (modified) (5 diffs)

src/Parser/TypeData.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 15:12:51 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jul 18 17:51:18 2018
-// Update Count     : 607
+// Last Modified On : Fri Jul 20 14:39:31 2018
+// Update Count     : 622
 //
 
@@ -271 +271 @@
 
         switch ( kind ) {
-          case Unknown:
-                os << "entity of unknown type ";
+          case Basic:
+                if ( signedness != DeclarationNode::NoSignedness ) os << DeclarationNode::signednessNames[ signedness ] << " ";
+                if ( length != DeclarationNode::NoLength ) os << DeclarationNode::lengthNames[ length ] << " ";
+                if ( complextype == DeclarationNode::NoComplexType ) { // basic type
+                        assert( basictype != DeclarationNode::NoBasicType );
+                        os << DeclarationNode::basicTypeNames[ basictype ] << " ";
+                } else {                                                                                // complex type
+                        // handle double _Complex
+                        if ( basictype != DeclarationNode::NoBasicType ) os << DeclarationNode::basicTypeNames[ basictype ] << " ";
+                        os << DeclarationNode::complexTypeNames[ complextype ] << " ";
+                } // if
                 break;
           case Pointer:
@@ -281 +290 @@
                 } // if
                 break;
-          case EnumConstant:
-                os << "enumeration constant ";
-                break;
-          case Basic:
-                if ( signedness != DeclarationNode::NoSignedness ) os << DeclarationNode::signednessNames[ signedness ] << " ";
-                if ( length != DeclarationNode::NoLength ) os << DeclarationNode::lengthNames[ length ] << " ";
-                assert( basictype != DeclarationNode::NoBasicType );
-                os << DeclarationNode::basicTypeNames[ basictype ] << " ";
-                if ( complextype != DeclarationNode::NoComplexType ) os << DeclarationNode::complexTypeNames[ complextype ] << " ";
+          case Reference:
+                os << "reference ";
+                if ( base ) {
+                        os << "to ";
+                        base->print( os, indent );
+                } // if
                 break;
           case Array:
@@ -375 +381 @@
                 } // if
                 break;
-          case SymbolicInst:
-                os << "instance of type " << *symbolic.name;
-                if ( symbolic.actuals ) {
-                        os << " with parameters" << endl;
-                        symbolic.actuals->printList( os, indent + 2 );
-                } // if
+          case EnumConstant:
+                os << "enumeration constant ";
                 break;
           case Symbolic:
@@ -402 +404 @@
                 } // if
                 break;
+          case SymbolicInst:
+                os << *symbolic.name;
+                if ( symbolic.actuals ) {
+                        os << "(";
+                        symbolic.actuals->printList( os, indent + 2 );
+                        os << ")";
+                } // if
+                break;
           case Tuple:
                 os << "tuple ";
@@ -417 +427 @@
           case Builtin:
                 os << DeclarationNode::builtinTypeNames[builtintype];
+                break;
+          case GlobalScope:
+                break;
+          case Qualified:
+                qualified.parent->print( os );
+                os << ".";
+                qualified.child->print( os );
+                break;
+          case Unknown:
+                os << "entity of unknown type ";
                 break;
           default:

src/Parser/TypeData.h

@@ -10 +10 @@
 // Created On       : Sat May 16 15:18:36 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jul 18 17:31:15 2018
-// Update Count     : 194
+// Last Modified On : Fri Jul 20 13:56:40 2018
+// Update Count     : 195
 //
 
@@ -26 +26 @@
 
 struct TypeData {
-        enum Kind { Basic, Pointer, Array, Reference, Function, Aggregate, AggregateInst, Enum, EnumConstant, Symbolic,
+        enum Kind { Basic, Pointer, Reference, Array, Function, Aggregate, AggregateInst, Enum, EnumConstant, Symbolic,
                                 SymbolicInst, Tuple, Typeof, Builtin, GlobalScope, Qualified, Unknown };
 
@@ -77 +77 @@
         };
 
-        struct Qualified_t { // qualified type S.T
+        struct Qualified_t {                                                            // qualified type S.T
                 TypeData * parent;
                 TypeData * child;

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 ','