Changeset df6cc9d for src/Parser/parser.yy

Timestamp:

Oct 19, 2022, 4:43:26 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, master

Children:

1a45263

Parents:

9cd5bd2 (diff), 135143ba (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' into pthread-emulation

File:

• src/Parser/parser.yy (modified) (16 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 : Sat Aug 27 13:21:28 2022
-// Update Count     : 5661
+// Last Modified On : Fri Oct 14 14:04:43 2022
+// Update Count     : 5751
 //
 
@@ -103 +103 @@
         // 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 );
+        // 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;
+        // 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() ) ) {
@@ -112 +112 @@
         } // for
         declList->addType( cl );
-//      printf( "distAttr3 declList %p\n", declList ); declList->print( std::cout, 0 );
+        // printf( "distAttr3 declList %p\n", declList ); declList->print( std::cout, 0 );
         return declList;
 } // distAttr
@@ -248 +248 @@
 } // forCtrl
 
+static void IdentifierBeforeIdentifier( string & identifier1, string & identifier2, const char * kind ) {
+        SemanticError( yylloc, ::toString( "Adjacent identifiers \"", identifier1, "\" and \"", identifier2, "\" are not meaningful in a", kind, ".\n"
+                                   "Possible cause is misspelled type name or missing generic parameter." ) );
+} // IdentifierBeforeIdentifier
+
+static void IdentifierBeforeType( string & identifier, const char * kind ) {
+        SemanticError( yylloc, ::toString( "Identifier \"", identifier, "\" cannot appear before a ", kind, ".\n"
+                                   "Possible cause is misspelled storage/CV qualifier, misspelled typename, or missing generic parameter." ) );
+} // IdentifierBeforeType
+
 bool forall = false;                                                                    // aggregate have one or more forall qualifiers ?
 
@@ -295 +305 @@
 %token TYPEDEF
 %token EXTERN STATIC AUTO REGISTER
-%token THREADLOCALGCC THREADLOCALC11                                            // GCC, C11
+%token THREADLOCALGCC THREADLOCALC11                                    // GCC, C11
 %token INLINE FORTRAN                                                                   // C99, extension ISO/IEC 9899:1999 Section J.5.9(1)
 %token NORETURN                                                                                 // C11
@@ -308 +318 @@
 %token DECIMAL32 DECIMAL64 DECIMAL128                                   // GCC
 %token ZERO_T ONE_T                                                                             // CFA
-%token SIZEOF TYPEOF VALIST AUTO_TYPE                                   // GCC
+%token SIZEOF TYPEOF VA_LIST VA_ARG AUTO_TYPE                   // GCC
 %token OFFSETOF BASETYPEOF TYPEID                                               // CFA
 %token ENUM STRUCT UNION
@@ -399 +409 @@
 // declarations
 %type<decl> abstract_declarator abstract_ptr abstract_array abstract_function array_dimension multi_array_dimension
-%type<decl> abstract_parameter_declarator abstract_parameter_ptr abstract_parameter_array abstract_parameter_function array_parameter_dimension array_parameter_1st_dimension
+%type<decl> abstract_parameter_declarator_opt abstract_parameter_declarator abstract_parameter_ptr abstract_parameter_array abstract_parameter_function array_parameter_dimension array_parameter_1st_dimension
 %type<decl> abstract_parameter_declaration
 
@@ -651 +661 @@
         //      { SemanticError( yylloc, "Resume expression is currently unimplemented." ); $$ = nullptr; }
         | IDENTIFIER IDENTIFIER                                                         // syntax error
-                {
-                        SemanticError( yylloc, ::toString( "Adjacent identifiers are not meaningful in an expression. "
-                                                                                           "Possible problem is identifier \"", *$1.str,
-                                                                                           "\" is a misspelled typename or an incorrectly specified type name, "
-                                                                                           "e.g., missing generic parameter or missing struct/union/enum before typename." ) );
-                        $$ = nullptr;
-                }
-        | IDENTIFIER direct_type                                                        // syntax error
-                {
-                        SemanticError( yylloc, ::toString( "Identifier \"", *$1.str, "\" cannot appear before a type. "
-                                                                                           "Possible problem is misspelled storage or CV qualifier." ) );
-                        $$ = nullptr;
-                }
+                { IdentifierBeforeIdentifier( *$1.str, *$2.str, "n expression" ); $$ = nullptr; }
+        | IDENTIFIER type_qualifier                                                     // syntax error
+                { IdentifierBeforeType( *$1.str, "type qualifier" ); $$ = nullptr; }
+        | IDENTIFIER storage_class                                                      // syntax error
+                { IdentifierBeforeType( *$1.str, "storage class" ); $$ = nullptr; }
+        | IDENTIFIER basic_type_name                                            // syntax error
+                { IdentifierBeforeType( *$1.str, "type" ); $$ = nullptr; }
+        | IDENTIFIER TYPEDEFname                                                        // syntax error
+                { IdentifierBeforeType( *$1.str, "type" ); $$ = nullptr; }
+        | IDENTIFIER TYPEGENname                                                        // syntax error
+                { IdentifierBeforeType( *$1.str, "type" ); $$ = nullptr; }
         ;
 
@@ -690 +698 @@
         primary_expression
         | postfix_expression '[' assignment_expression ',' tuple_expression_list ']'
-                        // Historic, transitional: Disallow commas in subscripts.
-                        // Switching to this behaviour may help check if a C compatibilty case uses comma-exprs in subscripts.
-                        // Current: Commas in subscripts make tuples.
+                // Historic, transitional: Disallow commas in subscripts.
+                // Switching to this behaviour may help check if a C compatibilty case uses comma-exprs in subscripts.
+                // Current: Commas in subscripts make tuples.
                 { $$ = new ExpressionNode( build_binary_val( OperKinds::Index, $1, new ExpressionNode( build_tuple( (ExpressionNode *)($3->set_last( $5 ) ) )) ) ); }
         | postfix_expression '[' assignment_expression ']'
@@ -712 +720 @@
         | postfix_expression '(' argument_expression_list_opt ')'
                 { $$ = new ExpressionNode( build_func( $1, $3 ) ); }
+        | VA_ARG '(' primary_expression ',' declaration_specifier_nobody abstract_parameter_declarator_opt ')'
+                // { SemanticError( yylloc, "va_arg is currently unimplemented." ); $$ = nullptr; }
+                { $$ = new ExpressionNode( build_func( new ExpressionNode( build_varref( new string( "__builtin_va_arg") ) ),
+                                                                                           (ExpressionNode *)($3->set_last( (ExpressionNode *)($6 ? $6->addType( $5 ) : $5) )) ) ); }
         | postfix_expression '`' identifier                                     // CFA, postfix call
                 { $$ = new ExpressionNode( build_func( new ExpressionNode( build_varref( build_postfix_name( $3 ) ) ), $1 ) ); }
@@ -2148 +2160 @@
         | LONG
                 { $$ = DeclarationNode::newLength( DeclarationNode::Long ); }
-        | VALIST                                                                                        // GCC, __builtin_va_list
+        | VA_LIST                                                                                       // GCC, __builtin_va_list
                 { $$ = DeclarationNode::newBuiltinType( DeclarationNode::Valist ); }
         | AUTO_TYPE
@@ -2593 +2605 @@
                 { $$ = DeclarationNode::newEnumValueGeneric( $1, $2 ); }
         | INLINE type_name
-                { $$ = DeclarationNode::newEnumValueGeneric( new string("inline"), nullptr ); }
+                { $$ = DeclarationNode::newEnumInLine( *$2->type->symbolic.name ); }
         | enumerator_list ',' identifier_or_type_name enumerator_value_opt
                 { $$ = $1->appendList( DeclarationNode::newEnumValueGeneric( $3, $4 ) ); }
@@ -2993 +3005 @@
                 { $$ = DeclarationNode::newDirectiveStmt( new StatementNode( build_directive( $1 ) ) ); }
         | declaration
+        | IDENTIFIER IDENTIFIER
+                { IdentifierBeforeIdentifier( *$1.str, *$2.str, " declaration" ); $$ = nullptr; }
+        | IDENTIFIER type_qualifier                                                     // syntax error
+                { IdentifierBeforeType( *$1.str, "type qualifier" ); $$ = nullptr; }
+        | IDENTIFIER storage_class                                                      // syntax error
+                { IdentifierBeforeType( *$1.str, "storage class" ); $$ = nullptr; }
+        | IDENTIFIER basic_type_name                                            // syntax error
+                { IdentifierBeforeType( *$1.str, "type" ); $$ = nullptr; }
+        | IDENTIFIER TYPEDEFname                                                        // syntax error
+                { IdentifierBeforeType( *$1.str, "type" ); $$ = nullptr; }
+        | IDENTIFIER TYPEGENname                                                        // syntax error
+                { IdentifierBeforeType( *$1.str, "type" ); $$ = nullptr; }
         | external_function_definition
         | EXTENSION external_definition                                         // GCC, multiple __extension__ allowed, meaning unknown
@@ -3023 +3047 @@
                         $$ = $6;
                 }
+        // global distribution
         | type_qualifier_list
                 {
@@ -3047 +3072 @@
         | declaration_qualifier_list type_qualifier_list
                 {
-                        if ( ($1->type && $1->type->qualifiers.val) || $2->type->qualifiers.val ) { SemanticError( yylloc, "CV qualifiers cannot be distributed; only storage-class and forall qualifiers." ); }
-                        if ( ($1->type && $1->type->forall) || $2->type->forall ) forall = true; // remember generic type
+                        if ( ($1->type && $1->type->qualifiers.val) || ($2->type && $2->type->qualifiers.val) ) { SemanticError( yylloc, "CV qualifiers cannot be distributed; only storage-class and forall qualifiers." ); }
+                        if ( ($1->type && $1->type->forall) || ($2->type && $2->type->forall) ) forall = true; // remember generic type
                 }
           '{' up external_definition_list_opt down '}'          // CFA, namespace
@@ -3655 +3680 @@
 // functions.
 
+abstract_parameter_declarator_opt:
+        // empty
+                { $$ = nullptr; }
+        | abstract_parameter_declarator
+        ;
+
 abstract_parameter_declarator:
         abstract_parameter_ptr