Changeset d8454b9

Timestamp:

May 14, 2022, 9:41:03 AM (2 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

032234bd

Parents:

789f279

Message:

add better error message for attributes after "with" clause, commented out print statements that will be removed shortly

File:

• src/Parser/parser.yy (modified) (14 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 : Wed May  4 17:22:48 2022
-// Update Count     : 5279
+// Last Modified On : Sat May 14 09:16:22 2022
+// Update Count     : 5401
 //
 
@@ -54 +54 @@
 #include "Common/SemanticError.h"                                               // error_str
 #include "Common/utility.h"                                                             // for maybeMoveBuild, maybeBuild, CodeLo...
+
+#include "SynTree/Attribute.h"     // for Attribute
 
 extern DeclarationNode * parseTree;
@@ -93 +95 @@
 } // appendStr
 
-DeclarationNode * distAttr( DeclarationNode * specifier, DeclarationNode * declList ) {
-        // distribute declaration_specifier across all declared variables, e.g., static, const, __attribute__.
-        DeclarationNode * cur = declList, * cl = (new DeclarationNode)->addType( specifier );
+DeclarationNode * distAttr( DeclarationNode * typeSpec, DeclarationNode * declList ) {
+        // distribute declaration_specifier across all declared variables, e.g., static, const, but not __attribute__.
+        assert( declList );
+//      printf( "distAttr1 typeSpec %p\n", typeSpec ); typeSpec->print( std::cout );
+        DeclarationNode * cur = declList, * cl = (new DeclarationNode)->addType( typeSpec );
+//      printf( "distAttr2 cl %p\n", cl ); cl->type->print( std::cout );
+//      cl->type->aggregate.name = cl->type->aggInst.aggregate->aggregate.name;
+
         for ( cur = dynamic_cast<DeclarationNode *>( cur->get_next() ); cur != nullptr; cur = dynamic_cast<DeclarationNode *>( cur->get_next() ) ) {
                 cl->cloneBaseType( cur );
         } // for
         declList->addType( cl );
+//      printf( "distAttr3 declList %p\n", declList ); declList->print( std::cout, 0 );
         return declList;
 } // distAttr
@@ -171 +179 @@
                 if ( ! ( typeSpec->type && (typeSpec->type->kind == TypeData::Aggregate || typeSpec->type->kind == TypeData::Enum) ) ) {
                         stringstream ss;
-                        typeSpec->type->print( ss );
+                        // printf( "fieldDecl1 typeSpec %p\n", typeSpec ); typeSpec->type->print( std::cout );
                         SemanticWarning( yylloc, Warning::SuperfluousDecl, ss.str().c_str() );
                         return nullptr;
                 } // if
+                // printf( "fieldDecl2 typeSpec %p\n", typeSpec ); typeSpec->type->print( std::cout );
                 fieldList = DeclarationNode::newName( nullptr );
         } // if
-        return distAttr( typeSpec, fieldList );                         // mark all fields in list
+//      return distAttr( typeSpec, fieldList );                         // mark all fields in list
+
+        // printf( "fieldDecl3 typeSpec %p\n", typeSpec ); typeSpec->print( std::cout, 0 );
+        DeclarationNode * temp = distAttr( typeSpec, fieldList );                               // mark all fields in list
+        // printf( "fieldDecl4 temp %p\n", temp ); temp->print( std::cout, 0 );
+        return temp;
 } // fieldDecl
 
@@ -1620 +1634 @@
 declaration:                                                                                    // old & new style declarations
         c_declaration ';'
+                {
+                        // printf( "C_DECLARATION1 %p %s\n", $$, $$->name ? $$->name->c_str() : "(nil)" );
+                        // for ( Attribute * attr: reverseIterate( $$->attributes ) ) {
+                        //   printf( "\tattr %s\n", attr->name.c_str() );
+                        // } // for
+                }
         | cfa_declaration ';'                                                           // CFA
         | static_assert                                                                         // C11
@@ -1825 +1845 @@
         basic_type_specifier
         | sue_type_specifier
+                {
+                        // printf( "sue_type_specifier2 %p %s\n", $$, $$->type->aggregate.name ? $$->type->aggregate.name->c_str() : "(nil)" );
+                        // for ( Attribute * attr: reverseIterate( $$->attributes ) ) {
+                        //   printf( "\tattr %s\n", attr->name.c_str() );
+                        // } // for
+                }
         | type_type_specifier
         ;
@@ -2041 +2067 @@
 sue_declaration_specifier:                                                              // struct, union, enum + storage class + type specifier
         sue_type_specifier
+                {
+                        // printf( "sue_declaration_specifier %p %s\n", $$, $$->type->aggregate.name ? $$->type->aggregate.name->c_str() : "(nil)" );
+                        // for ( Attribute * attr: reverseIterate( $$->attributes ) ) {
+                        //   printf( "\tattr %s\n", attr->name.c_str() );
+                        // } // for
+                }
         | declaration_qualifier_list sue_type_specifier
                 { $$ = $2->addQualifiers( $1 ); }
@@ -2051 +2083 @@
 sue_type_specifier:                                                                             // struct, union, enum + type specifier
         elaborated_type
+                {
+                        // printf( "sue_type_specifier %p %s\n", $$, $$->type->aggregate.name ? $$->type->aggregate.name->c_str() : "(nil)" );
+                        // for ( Attribute * attr: reverseIterate( $$->attributes ) ) {
+                        //   printf( "\tattr %s\n", attr->name.c_str() );
+                        // } // for
+                }
         | type_qualifier_list
                 { if ( $1->type != nullptr && $1->type->forall ) forall = true; } // remember generic type
@@ -2123 +2161 @@
 elaborated_type:                                                                                // struct, union, enum
         aggregate_type
+                {
+                        // printf( "elaborated_type %p %s\n", $$, $$->type->aggregate.name ? $$->type->aggregate.name->c_str() : "(nil)" );
+                        // for ( Attribute * attr: reverseIterate( $$->attributes ) ) {
+                        //   printf( "\tattr %s\n", attr->name.c_str() );
+                        // } // for
+                }
         | enum_type
         ;
@@ -2142 +2186 @@
                 }
           '{' field_declaration_list_opt '}' type_parameters_opt
-                { $$ = DeclarationNode::newAggregate( $1, $3, $8, $6, true )->addQualifiers( $2 ); }
+                {
+                        // printf( "aggregate_type1 %s\n", $3.str->c_str() );
+                        // if ( $2 )
+                        //      for ( Attribute * attr: reverseIterate( $2->attributes ) ) {
+                        //              printf( "copySpecifiers12 %s\n", attr->name.c_str() );
+                        //      } // for
+                        $$ = DeclarationNode::newAggregate( $1, $3, $8, $6, true )->addQualifiers( $2 );
+                        // printf( "aggregate_type2 %p %s\n", $$, $$->type->aggregate.name ? $$->type->aggregate.name->c_str() : "(nil)" );
+                        // for ( Attribute * attr: reverseIterate( $$->attributes ) ) {
+                        //      printf( "aggregate_type3 %s\n", attr->name.c_str() );
+                        // } // for
+                }
         | aggregate_key attribute_list_opt TYPEDEFname          // unqualified type name
                 {
@@ -2150 +2205 @@
           '{' field_declaration_list_opt '}' type_parameters_opt
                 {
+                        // printf( "AGG3\n" );
                         DeclarationNode::newFromTypedef( $3 );
                         $$ = DeclarationNode::newAggregate( $1, $3, $8, $6, true )->addQualifiers( $2 );
@@ -2160 +2216 @@
           '{' field_declaration_list_opt '}' type_parameters_opt
                 {
+                        // printf( "AGG4\n" );
                         DeclarationNode::newFromTypeGen( $3, nullptr );
                         $$ = DeclarationNode::newAggregate( $1, $3, $8, $6, true )->addQualifiers( $2 );
@@ -2236 +2293 @@
 field_declaration:
         type_specifier field_declaring_list_opt ';'
-                { $$ = fieldDecl( $1, $2 ); }
+                {
+                        // printf( "type_specifier1 %p %s\n", $$, $$->type->aggregate.name ? $$->type->aggregate.name->c_str() : "(nil)" );
+                        $$ = fieldDecl( $1, $2 );
+                        // printf( "type_specifier2 %p %s\n", $$, $$->type->aggregate.name ? $$->type->aggregate.name->c_str() : "(nil)" );
+                        // for ( Attribute * attr: reverseIterate( $$->attributes ) ) {
+                        //   printf( "\tattr %s\n", attr->name.c_str() );
+                        // } // for
+                }
         | EXTENSION type_specifier field_declaring_list_opt ';' // GCC
                 { $$ = fieldDecl( $2, $3 ); distExt( $$ ); }
@@ -2845 +2909 @@
         // empty
                 { $$ = nullptr; forall = false; }
-        | WITH '(' tuple_expression_list ')'
-                { $$ = $3; forall = false; }
+        | WITH '(' tuple_expression_list ')' attribute_list_opt
+                {
+                        $$ = $3; forall = false;
+                        if ( $5 ) {
+                                SemanticError( yylloc, "Attributes cannot be associated with function body. Move attribute(s) before \"with\" clause." );
+                                $$ = nullptr;
+                        } // if
+                }
         ;