Changeset 2a301ff for src/Parser/parser.yy
- Timestamp:
- Aug 31, 2023, 11:31:15 PM (10 months ago)
- Branches:
- master
- Children:
- 950c58e
- Parents:
- 92355883 (diff), 686912c (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. - File:
-
- 1 edited
-
src/Parser/parser.yy (modified) (44 diffs)
Legend:
- Unmodified
- Added
- Removed
-
src/Parser/parser.yy
r92355883 r2a301ff 10 10 // Created On : Sat Sep 1 20:22:55 2001 11 11 // Last Modified By : Peter A. Buhr 12 // Last Modified On : Sat Jun 17 18:53:24202313 // Update Count : 63 4712 // Last Modified On : Tue Jul 18 22:51:30 2023 13 // Update Count : 6391 14 14 // 15 15 … … 385 385 %type<str> string_literal_list 386 386 387 %type<enum_hiding> hide_opt 387 %type<enum_hiding> hide_opt visible_hide_opt 388 388 389 389 // expressions 390 390 %type<expr> constant 391 %type<expr> tuple 391 %type<expr> tuple tuple_expression_list 392 392 %type<oper> ptrref_operator unary_operator assignment_operator simple_assignment_operator compound_assignment_operator 393 393 %type<expr> primary_expression postfix_expression unary_expression 394 %type<expr> cast_expression_list 395 %type<expr> shift_expression 394 %type<expr> cast_expression_list cast_expression exponential_expression multiplicative_expression additive_expression 395 %type<expr> shift_expression relational_expression equality_expression 396 396 %type<expr> AND_expression exclusive_OR_expression inclusive_OR_expression 397 397 %type<expr> logical_AND_expression logical_OR_expression 398 398 %type<expr> conditional_expression constant_expression assignment_expression assignment_expression_opt 399 %type<expr> comma_expression 400 %type<expr> argument_expression_list_opt 399 %type<expr> comma_expression comma_expression_opt 400 %type<expr> argument_expression_list_opt argument_expression_list argument_expression default_initializer_opt 401 401 %type<ifctl> conditional_declaration 402 %type<forctl> for_control_expression 402 %type<forctl> for_control_expression for_control_expression_list 403 403 %type<oper> upupeq updown updowneq downupdowneq 404 404 %type<expr> subrange 405 405 %type<decl> asm_name_opt 406 %type<expr> asm_operands_opt 406 %type<expr> asm_operands_opt asm_operands_list asm_operand 407 407 %type<labels> label_list 408 408 %type<expr> asm_clobbers_list_opt … … 412 412 413 413 // statements 414 %type<stmt> statement 414 %type<stmt> statement labeled_statement compound_statement 415 415 %type<stmt> statement_decl statement_decl_list statement_list_nodecl 416 416 %type<stmt> selection_statement if_statement 417 %type<clause> switch_clause_list_opt 417 %type<clause> switch_clause_list_opt switch_clause_list 418 418 %type<expr> case_value 419 %type<clause> case_clause case_value_list case_label 419 %type<clause> case_clause case_value_list case_label case_label_list 420 420 %type<stmt> iteration_statement jump_statement 421 %type<stmt> expression_statement 421 %type<stmt> expression_statement asm_statement 422 422 %type<stmt> with_statement 423 423 %type<expr> with_clause_opt … … 427 427 %type<stmt> mutex_statement 428 428 %type<expr> when_clause when_clause_opt waitfor waituntil timeout 429 %type<stmt> waitfor_statement 429 %type<stmt> waitfor_statement waituntil_statement 430 430 %type<wfs> wor_waitfor_clause 431 431 %type<wucn> waituntil_clause wand_waituntil_clause wor_waituntil_clause … … 601 601 // around the list separator. 602 602 // 603 // int f( forall(T) T (*f1) T , forall( S ) S (*f2)( S ) );603 // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX 604 604 // push pop push pop 605 605 … … 689 689 // | RESUME '(' comma_expression ')' compound_statement 690 690 // { SemanticError( yylloc, "Resume expression is currently unimplemented." ); $$ = nullptr; } 691 | IDENTIFIER IDENTIFIER // invalid syntax rule s691 | IDENTIFIER IDENTIFIER // invalid syntax rule 692 692 { IdentifierBeforeIdentifier( *$1.str, *$2.str, "n expression" ); $$ = nullptr; } 693 | IDENTIFIER type_qualifier // invalid syntax rule s693 | IDENTIFIER type_qualifier // invalid syntax rule 694 694 { IdentifierBeforeType( *$1.str, "type qualifier" ); $$ = nullptr; } 695 | IDENTIFIER storage_class // invalid syntax rule s695 | IDENTIFIER storage_class // invalid syntax rule 696 696 { IdentifierBeforeType( *$1.str, "storage class" ); $$ = nullptr; } 697 | IDENTIFIER basic_type_name // invalid syntax rule s697 | IDENTIFIER basic_type_name // invalid syntax rule 698 698 { IdentifierBeforeType( *$1.str, "type" ); $$ = nullptr; } 699 | IDENTIFIER TYPEDEFname // invalid syntax rule s699 | IDENTIFIER TYPEDEFname // invalid syntax rule 700 700 { IdentifierBeforeType( *$1.str, "type" ); $$ = nullptr; } 701 | IDENTIFIER TYPEGENname // invalid syntax rule s701 | IDENTIFIER TYPEGENname // invalid syntax rule 702 702 { IdentifierBeforeType( *$1.str, "type" ); $$ = nullptr; } 703 703 ; … … 1275 1275 | DEFAULT ':' { $$ = new ClauseNode( build_default( yylloc ) ); } 1276 1276 // A semantic check is required to ensure only one default clause per switch/choose statement. 1277 | DEFAULT error // invalid syntax rule s1277 | DEFAULT error // invalid syntax rule 1278 1278 { SemanticError( yylloc, "syntax error, colon missing after default." ); $$ = nullptr; } 1279 1279 ; … … 1405 1405 else { SemanticError( yylloc, MISSING_HIGH ); $$ = nullptr; } 1406 1406 } 1407 | comma_expression updowneq comma_expression '~' '@' // CFA, invalid syntax rule s1407 | comma_expression updowneq comma_expression '~' '@' // CFA, invalid syntax rule 1408 1408 { SemanticError( yylloc, MISSING_ANON_FIELD ); $$ = nullptr; } 1409 | '@' updowneq '@' // CFA, invalid syntax rule s1409 | '@' updowneq '@' // CFA, invalid syntax rule 1410 1410 { SemanticError( yylloc, MISSING_ANON_FIELD ); $$ = nullptr; } 1411 | '@' updowneq comma_expression '~' '@' // CFA, invalid syntax rule s1411 | '@' updowneq comma_expression '~' '@' // CFA, invalid syntax rule 1412 1412 { SemanticError( yylloc, MISSING_ANON_FIELD ); $$ = nullptr; } 1413 | comma_expression updowneq '@' '~' '@' // CFA, invalid syntax rule s1413 | comma_expression updowneq '@' '~' '@' // CFA, invalid syntax rule 1414 1414 { SemanticError( yylloc, MISSING_ANON_FIELD ); $$ = nullptr; } 1415 | '@' updowneq '@' '~' '@' // CFA, invalid syntax rule s1415 | '@' updowneq '@' '~' '@' // CFA, invalid syntax rule 1416 1416 { SemanticError( yylloc, MISSING_ANON_FIELD ); $$ = nullptr; } 1417 1417 … … 1434 1434 else $$ = forCtrl( yylloc, $3, $1, $3->clone(), $4, nullptr, NEW_ONE ); 1435 1435 } 1436 | comma_expression ';' '@' updowneq '@' // CFA, invalid syntax rule s1436 | comma_expression ';' '@' updowneq '@' // CFA, invalid syntax rule 1437 1437 { SemanticError( yylloc, "syntax error, missing low/high value for up/down-to range so index is uninitialized." ); $$ = nullptr; } 1438 1438 1439 1439 | comma_expression ';' comma_expression updowneq comma_expression '~' comma_expression // CFA 1440 1440 { $$ = forCtrl( yylloc, $3, $1, UPDOWN( $4, $3->clone(), $5 ), $4, UPDOWN( $4, $5->clone(), $3->clone() ), $7 ); } 1441 | comma_expression ';' '@' updowneq comma_expression '~' comma_expression // CFA, invalid syntax rule s1441 | comma_expression ';' '@' updowneq comma_expression '~' comma_expression // CFA, invalid syntax rule 1442 1442 { 1443 1443 if ( $4 == OperKinds::LThan || $4 == OperKinds::LEThan ) { SemanticError( yylloc, MISSING_LOW ); $$ = nullptr; } … … 1452 1452 | comma_expression ';' comma_expression updowneq comma_expression '~' '@' // CFA 1453 1453 { $$ = forCtrl( yylloc, $3, $1, UPDOWN( $4, $3->clone(), $5 ), $4, UPDOWN( $4, $5->clone(), $3->clone() ), nullptr ); } 1454 | comma_expression ';' '@' updowneq comma_expression '~' '@' // CFA, invalid syntax rule s1454 | comma_expression ';' '@' updowneq comma_expression '~' '@' // CFA, invalid syntax rule 1455 1455 { 1456 1456 if ( $4 == OperKinds::LThan || $4 == OperKinds::LEThan ) { SemanticError( yylloc, MISSING_LOW ); $$ = nullptr; } … … 1511 1511 else $$ = forCtrl( yylloc, $1, $2, $3, nullptr, nullptr ); 1512 1512 } 1513 | declaration '@' updowneq '@' '~' '@' // CFA, invalid syntax rule s1513 | declaration '@' updowneq '@' '~' '@' // CFA, invalid syntax rule 1514 1514 { SemanticError( yylloc, "syntax error, missing low/high value for up/down-to range so index is uninitialized." ); $$ = nullptr; } 1515 1515 … … 1666 1666 { $$ = build_waitfor_timeout( yylloc, $1, $3, $4, maybe_build_compound( yylloc, $5 ) ); } 1667 1667 // "else" must be conditional after timeout or timeout is never triggered (i.e., it is meaningless) 1668 | wor_waitfor_clause wor when_clause_opt timeout statement wor ELSE statement // invalid syntax rule s1668 | wor_waitfor_clause wor when_clause_opt timeout statement wor ELSE statement // invalid syntax rule 1669 1669 { SemanticError( yylloc, "syntax error, else clause must be conditional after timeout or timeout never triggered." ); $$ = nullptr; } 1670 1670 | wor_waitfor_clause wor when_clause_opt timeout statement wor when_clause ELSE statement … … 1708 1708 | wor_waituntil_clause wor when_clause_opt ELSE statement 1709 1709 { $$ = new ast::WaitUntilStmt::ClauseNode( ast::WaitUntilStmt::ClauseNode::Op::LEFT_OR, $1, build_waituntil_else( yylloc, $3, maybe_build_compound( yylloc, $5 ) ) ); } 1710 | wor_waituntil_clause wor when_clause_opt timeout statement %prec THEN1711 { $$ = new ast::WaitUntilStmt::ClauseNode( ast::WaitUntilStmt::ClauseNode::Op::LEFT_OR, $1, build_waituntil_timeout( yylloc, $3, $4, maybe_build_compound( yylloc, $5 ) ) ); }1712 // "else" must be conditional after timeout or timeout is never triggered (i.e., it is meaningless)1713 | wor_waituntil_clause wor when_clause_opt timeout statement wor ELSE statement // invalid syntax rules1714 { SemanticError( yylloc, "syntax error, else clause must be conditional after timeout or timeout never triggered." ); $$ = nullptr; }1715 | wor_waituntil_clause wor when_clause_opt timeout statement wor when_clause ELSE statement1716 { $$ = new ast::WaitUntilStmt::ClauseNode( ast::WaitUntilStmt::ClauseNode::Op::LEFT_OR, $1,1717 new ast::WaitUntilStmt::ClauseNode( ast::WaitUntilStmt::ClauseNode::Op::OR,1718 build_waituntil_timeout( yylloc, $3, $4, maybe_build_compound( yylloc, $5 ) ),1719 build_waituntil_else( yylloc, $7, maybe_build_compound( yylloc, $9 ) ) ) ); }1720 1710 ; 1721 1711 1722 1712 waituntil_statement: 1723 1713 wor_waituntil_clause %prec THEN 1724 // SKULLDUGGERY: create an empty compound statement to test parsing of waituntil statement. 1725 { 1726 $$ = new StatementNode( build_waituntil_stmt( yylloc, $1 ) ); 1727 // $$ = new StatementNode( build_compound( yylloc, nullptr ) ); 1728 } 1714 { $$ = new StatementNode( build_waituntil_stmt( yylloc, $1 ) ); } 1729 1715 ; 1730 1716 … … 1868 1854 1869 1855 KR_parameter_list: 1870 push c_declaration pop';'1871 { $$ = $ 2; }1872 | KR_parameter_list push c_declaration pop';'1873 { $$ = $1->appendList( $ 3); }1856 c_declaration ';' 1857 { $$ = $1; } 1858 | KR_parameter_list c_declaration ';' 1859 { $$ = $1->appendList( $2 ); } 1874 1860 ; 1875 1861 … … 2007 1993 TYPEDEF cfa_variable_specifier 2008 1994 { 2009 typedefTable.addToEnclosingScope( *$2->name, TYPEDEFname, " 1" );1995 typedefTable.addToEnclosingScope( *$2->name, TYPEDEFname, "cfa_typedef_declaration 1" ); 2010 1996 $$ = $2->addTypedef(); 2011 1997 } 2012 1998 | TYPEDEF cfa_function_specifier 2013 1999 { 2014 typedefTable.addToEnclosingScope( *$2->name, TYPEDEFname, " 2" );2000 typedefTable.addToEnclosingScope( *$2->name, TYPEDEFname, "cfa_typedef_declaration 2" ); 2015 2001 $$ = $2->addTypedef(); 2016 2002 } 2017 2003 | cfa_typedef_declaration pop ',' push identifier 2018 2004 { 2019 typedefTable.addToEnclosingScope( *$5, TYPEDEFname, " 3" );2005 typedefTable.addToEnclosingScope( *$5, TYPEDEFname, "cfa_typedef_declaration 3" ); 2020 2006 $$ = $1->appendList( $1->cloneType( $5 ) ); 2021 2007 } … … 2028 2014 TYPEDEF type_specifier declarator 2029 2015 { 2030 typedefTable.addToEnclosingScope( *$3->name, TYPEDEFname, " 4" );2016 typedefTable.addToEnclosingScope( *$3->name, TYPEDEFname, "typedef_declaration 1" ); 2031 2017 if ( $2->type->forall || ($2->type->kind == TypeData::Aggregate && $2->type->aggregate.params) ) { 2032 2018 SemanticError( yylloc, "forall qualifier in typedef is currently unimplemented." ); $$ = nullptr; 2033 2019 } else $$ = $3->addType( $2 )->addTypedef(); // watchout frees $2 and $3 2034 2020 } 2035 | typedef_declaration pop ',' pushdeclarator2036 { 2037 typedefTable.addToEnclosingScope( *$ 5->name, TYPEDEFname, "5" );2038 $$ = $1->appendList( $1->cloneBaseType( $ 5)->addTypedef() );2021 | typedef_declaration ',' declarator 2022 { 2023 typedefTable.addToEnclosingScope( *$3->name, TYPEDEFname, "typedef_declaration 2" ); 2024 $$ = $1->appendList( $1->cloneBaseType( $3 )->addTypedef() ); 2039 2025 } 2040 2026 | type_qualifier_list TYPEDEF type_specifier declarator // remaining OBSOLESCENT (see 2 ) … … 2052 2038 SemanticError( yylloc, "TYPEDEF expression is deprecated, use typeof(...) instead." ); $$ = nullptr; 2053 2039 } 2054 | typedef_expression pop ',' pushidentifier '=' assignment_expression2040 | typedef_expression ',' identifier '=' assignment_expression 2055 2041 { 2056 2042 SemanticError( yylloc, "TYPEDEF expression is deprecated, use typeof(...) instead." ); $$ = nullptr; … … 2465 2451 | aggregate_key attribute_list_opt identifier 2466 2452 { 2467 typedefTable.makeTypedef( *$3, forall || typedefTable.getEnclForall() ? TYPEGENname : TYPEDEFname ); // create typedef2453 typedefTable.makeTypedef( *$3, forall || typedefTable.getEnclForall() ? TYPEGENname : TYPEDEFname, "aggregate_type: 1" ); 2468 2454 forall = false; // reset 2469 2455 } … … 2474 2460 | aggregate_key attribute_list_opt TYPEDEFname // unqualified type name 2475 2461 { 2476 typedefTable.makeTypedef( *$3, forall || typedefTable.getEnclForall() ? TYPEGENname : TYPEDEFname ); // create typedef2462 typedefTable.makeTypedef( *$3, forall || typedefTable.getEnclForall() ? TYPEGENname : TYPEDEFname, "aggregate_type: 2" ); 2477 2463 forall = false; // reset 2478 2464 } … … 2484 2470 | aggregate_key attribute_list_opt TYPEGENname // unqualified type name 2485 2471 { 2486 typedefTable.makeTypedef( *$3, forall || typedefTable.getEnclForall() ? TYPEGENname : TYPEDEFname ); // create typedef2472 typedefTable.makeTypedef( *$3, forall || typedefTable.getEnclForall() ? TYPEGENname : TYPEDEFname, "aggregate_type: 3" ); 2487 2473 forall = false; // reset 2488 2474 } … … 2505 2491 aggregate_key attribute_list_opt identifier 2506 2492 { 2507 typedefTable.makeTypedef( *$3, forall || typedefTable.getEnclForall() ? TYPEGENname : TYPEDEFname );2493 typedefTable.makeTypedef( *$3, forall || typedefTable.getEnclForall() ? TYPEGENname : TYPEDEFname, "aggregate_type_nobody" ); 2508 2494 forall = false; // reset 2509 2495 $$ = DeclarationNode::newAggregate( $1, $3, nullptr, nullptr, false )->addQualifiers( $2 ); … … 2680 2666 ENUM attribute_list_opt '{' enumerator_list comma_opt '}' 2681 2667 { $$ = DeclarationNode::newEnum( nullptr, $4, true, false )->addQualifiers( $2 ); } 2668 | ENUM attribute_list_opt '!' '{' enumerator_list comma_opt '}' // invalid syntax rule 2669 { SemanticError( yylloc, "syntax error, hiding '!' the enumerator names of an anonymous enumeration means the names are inaccessible." ); $$ = nullptr; } 2682 2670 | ENUM attribute_list_opt identifier 2683 { typedefTable.makeTypedef( *$3 ); }2671 { typedefTable.makeTypedef( *$3, "enum_type 1" ); } 2684 2672 hide_opt '{' enumerator_list comma_opt '}' 2685 2673 { $$ = DeclarationNode::newEnum( $3, $7, true, false, nullptr, $5 )->addQualifiers( $2 ); } 2686 | ENUM attribute_list_opt typedef_name // unqualified type name 2687 hide_opt '{' enumerator_list comma_opt '}' 2674 | ENUM attribute_list_opt typedef_name hide_opt '{' enumerator_list comma_opt '}' // unqualified type name 2688 2675 { $$ = DeclarationNode::newEnum( $3->name, $6, true, false, nullptr, $4 )->addQualifiers( $2 ); } 2689 2676 | ENUM '(' cfa_abstract_parameter_declaration ')' attribute_list_opt '{' enumerator_list comma_opt '}' … … 2694 2681 $$ = DeclarationNode::newEnum( nullptr, $7, true, true, $3 )->addQualifiers( $5 ); 2695 2682 } 2683 | ENUM '(' cfa_abstract_parameter_declaration ')' attribute_list_opt '!' '{' enumerator_list comma_opt '}' // unqualified type name 2684 { SemanticError( yylloc, "syntax error, hiding '!' the enumerator names of an anonymous enumeration means the names are inaccessible." ); $$ = nullptr; } 2685 | ENUM '(' ')' attribute_list_opt '{' enumerator_list comma_opt '}' 2686 { 2687 $$ = DeclarationNode::newEnum( nullptr, $6, true, true )->addQualifiers( $4 ); 2688 } 2689 | ENUM '(' ')' attribute_list_opt '!' '{' enumerator_list comma_opt '}' // invalid syntax rule 2690 { SemanticError( yylloc, "syntax error, hiding '!' the enumerator names of an anonymous enumeration means the names are inaccessible." ); $$ = nullptr; } 2696 2691 | ENUM '(' cfa_abstract_parameter_declaration ')' attribute_list_opt identifier attribute_list_opt 2697 2692 { … … 2699 2694 SemanticError( yylloc, "syntax error, storage-class and CV qualifiers are not meaningful for enumeration constants, which are const." ); 2700 2695 } 2701 typedefTable.makeTypedef( *$6 );2696 typedefTable.makeTypedef( *$6, "enum_type 2" ); 2702 2697 } 2703 2698 hide_opt '{' enumerator_list comma_opt '}' … … 2705 2700 $$ = DeclarationNode::newEnum( $6, $11, true, true, $3, $9 )->addQualifiers( $5 )->addQualifiers( $7 ); 2706 2701 } 2707 | ENUM '(' cfa_abstract_parameter_declaration ')' attribute_list_opt typedef_name attribute_list_opt 2708 hide_opt '{' enumerator_list comma_opt '}' 2702 | ENUM '(' ')' attribute_list_opt identifier attribute_list_opt hide_opt '{' enumerator_list comma_opt '}' 2703 { 2704 $$ = DeclarationNode::newEnum( $5, $9, true, true, nullptr, $7 )->addQualifiers( $4 )->addQualifiers( $6 ); 2705 } 2706 | ENUM '(' cfa_abstract_parameter_declaration ')' attribute_list_opt typedef_name attribute_list_opt hide_opt '{' enumerator_list comma_opt '}' 2709 2707 { 2710 2708 $$ = DeclarationNode::newEnum( $6->name, $10, true, true, $3, $8 )->addQualifiers( $5 )->addQualifiers( $7 ); 2709 } 2710 | ENUM '(' ')' attribute_list_opt typedef_name attribute_list_opt hide_opt '{' enumerator_list comma_opt '}' 2711 { 2712 $$ = DeclarationNode::newEnum( $5->name, $9, true, true, nullptr, $7 )->addQualifiers( $4 )->addQualifiers( $6 ); 2711 2713 } 2712 2714 | enum_type_nobody … … 2722 2724 enum_type_nobody: // enum - {...} 2723 2725 ENUM attribute_list_opt identifier 2724 { typedefTable.makeTypedef( *$3 ); $$ = DeclarationNode::newEnum( $3, nullptr, false, false )->addQualifiers( $2 ); } 2726 { 2727 typedefTable.makeTypedef( *$3, "enum_type_nobody 1" ); 2728 $$ = DeclarationNode::newEnum( $3, nullptr, false, false )->addQualifiers( $2 ); 2729 } 2725 2730 | ENUM attribute_list_opt type_name 2726 { typedefTable.makeTypedef( *$3->type->symbolic.name ); $$ = DeclarationNode::newEnum( $3->type->symbolic.name, nullptr, false, false )->addQualifiers( $2 ); } 2731 { 2732 typedefTable.makeTypedef( *$3->type->symbolic.name, "enum_type_nobody 2" ); 2733 $$ = DeclarationNode::newEnum( $3->type->symbolic.name, nullptr, false, false )->addQualifiers( $2 ); 2734 } 2727 2735 ; 2728 2736 … … 2792 2800 { $$ = nullptr; } 2793 2801 | parameter_list 2794 | parameter_list pop ',' pushELLIPSIS2802 | parameter_list ',' ELLIPSIS 2795 2803 { $$ = $1->addVarArgs(); } 2796 2804 ; … … 2799 2807 abstract_parameter_declaration 2800 2808 | parameter_declaration 2801 | parameter_list pop ',' pushabstract_parameter_declaration2802 { $$ = $1->appendList( $ 5); }2803 | parameter_list pop ',' pushparameter_declaration2804 { $$ = $1->appendList( $ 5); }2809 | parameter_list ',' abstract_parameter_declaration 2810 { $$ = $1->appendList( $3 ); } 2811 | parameter_list ',' parameter_declaration 2812 { $$ = $1->appendList( $3 ); } 2805 2813 ; 2806 2814 … … 2969 2977 type_class identifier_or_type_name 2970 2978 { 2971 typedefTable.addToScope( *$2, TYPEDEFname, " 9" );2979 typedefTable.addToScope( *$2, TYPEDEFname, "type_parameter 1" ); 2972 2980 if ( $1 == ast::TypeDecl::Otype ) { SemanticError( yylloc, "otype keyword is deprecated, use T " ); } 2973 2981 if ( $1 == ast::TypeDecl::Dtype ) { SemanticError( yylloc, "dtype keyword is deprecated, use T &" ); } … … 2977 2985 { $$ = DeclarationNode::newTypeParam( $1, $2 )->addTypeInitializer( $4 )->addAssertions( $5 ); } 2978 2986 | identifier_or_type_name new_type_class 2979 { typedefTable.addToScope( *$1, TYPEDEFname, " 9" ); }2987 { typedefTable.addToScope( *$1, TYPEDEFname, "type_parameter 2" ); } 2980 2988 type_initializer_opt assertion_list_opt 2981 2989 { $$ = DeclarationNode::newTypeParam( $2, $1 )->addTypeInitializer( $4 )->addAssertions( $5 ); } 2982 2990 | '[' identifier_or_type_name ']' 2983 2991 { 2984 typedefTable.addToScope( *$2, TYPEDIMname, " 9" );2992 typedefTable.addToScope( *$2, TYPEDIMname, "type_parameter 3" ); 2985 2993 $$ = DeclarationNode::newTypeParam( ast::TypeDecl::Dimension, $2 ); 2986 2994 } … … 3064 3072 identifier_or_type_name 3065 3073 { 3066 typedefTable.addToEnclosingScope( *$1, TYPEDEFname, " 10" );3074 typedefTable.addToEnclosingScope( *$1, TYPEDEFname, "type_declarator_name 1" ); 3067 3075 $$ = DeclarationNode::newTypeDecl( $1, nullptr ); 3068 3076 } 3069 3077 | identifier_or_type_name '(' type_parameter_list ')' 3070 3078 { 3071 typedefTable.addToEnclosingScope( *$1, TYPEGENname, " 11" );3079 typedefTable.addToEnclosingScope( *$1, TYPEGENname, "type_declarator_name 2" ); 3072 3080 $$ = DeclarationNode::newTypeDecl( $1, $3 ); 3073 3081 } … … 3163 3171 | IDENTIFIER IDENTIFIER 3164 3172 { IdentifierBeforeIdentifier( *$1.str, *$2.str, " declaration" ); $$ = nullptr; } 3165 | IDENTIFIER type_qualifier // invalid syntax rule s3173 | IDENTIFIER type_qualifier // invalid syntax rule 3166 3174 { IdentifierBeforeType( *$1.str, "type qualifier" ); $$ = nullptr; } 3167 | IDENTIFIER storage_class // invalid syntax rule s3175 | IDENTIFIER storage_class // invalid syntax rule 3168 3176 { IdentifierBeforeType( *$1.str, "storage class" ); $$ = nullptr; } 3169 | IDENTIFIER basic_type_name // invalid syntax rule s3177 | IDENTIFIER basic_type_name // invalid syntax rule 3170 3178 { IdentifierBeforeType( *$1.str, "type" ); $$ = nullptr; } 3171 | IDENTIFIER TYPEDEFname // invalid syntax rule s3179 | IDENTIFIER TYPEDEFname // invalid syntax rule 3172 3180 { IdentifierBeforeType( *$1.str, "type" ); $$ = nullptr; } 3173 | IDENTIFIER TYPEGENname // invalid syntax rule s3181 | IDENTIFIER TYPEGENname // invalid syntax rule 3174 3182 { IdentifierBeforeType( *$1.str, "type" ); $$ = nullptr; } 3175 3183 | external_function_definition … … 3458 3466 3459 3467 variable_function: 3460 '(' variable_ptr ')' '(' p ush parameter_type_list_opt pop')' // empty parameter list OBSOLESCENT (see 3)3461 { $$ = $2->addParamList( $ 6); }3462 | '(' attribute_list variable_ptr ')' '(' p ush parameter_type_list_opt pop')' // empty parameter list OBSOLESCENT (see 3)3463 { $$ = $3->addQualifiers( $2 )->addParamList( $ 7); }3468 '(' variable_ptr ')' '(' parameter_type_list_opt ')' // empty parameter list OBSOLESCENT (see 3) 3469 { $$ = $2->addParamList( $5 ); } 3470 | '(' attribute_list variable_ptr ')' '(' parameter_type_list_opt ')' // empty parameter list OBSOLESCENT (see 3) 3471 { $$ = $3->addQualifiers( $2 )->addParamList( $6 ); } 3464 3472 | '(' variable_function ')' // redundant parenthesis 3465 3473 { $$ = $2; } … … 3481 3489 3482 3490 function_no_ptr: 3483 paren_identifier '(' p ush parameter_type_list_opt pop')' // empty parameter list OBSOLESCENT (see 3)3484 { $$ = $1->addParamList( $ 4); }3485 | '(' function_ptr ')' '(' p ush parameter_type_list_opt pop')'3486 { $$ = $2->addParamList( $ 6); }3487 | '(' attribute_list function_ptr ')' '(' p ush parameter_type_list_opt pop')'3488 { $$ = $3->addQualifiers( $2 )->addParamList( $ 7); }3491 paren_identifier '(' parameter_type_list_opt ')' // empty parameter list OBSOLESCENT (see 3) 3492 { $$ = $1->addParamList( $3 ); } 3493 | '(' function_ptr ')' '(' parameter_type_list_opt ')' 3494 { $$ = $2->addParamList( $5 ); } 3495 | '(' attribute_list function_ptr ')' '(' parameter_type_list_opt ')' 3496 { $$ = $3->addQualifiers( $2 )->addParamList( $6 ); } 3489 3497 | '(' function_no_ptr ')' // redundant parenthesis 3490 3498 { $$ = $2; } … … 3535 3543 paren_identifier '(' identifier_list ')' // function_declarator handles empty parameter 3536 3544 { $$ = $1->addIdList( $3 ); } 3537 | '(' KR_function_ptr ')' '(' p ush parameter_type_list_opt pop')'3538 { $$ = $2->addParamList( $ 6); }3539 | '(' attribute_list KR_function_ptr ')' '(' p ush parameter_type_list_opt pop')'3540 { $$ = $3->addQualifiers( $2 )->addParamList( $ 7); }3545 | '(' KR_function_ptr ')' '(' parameter_type_list_opt ')' 3546 { $$ = $2->addParamList( $5 ); } 3547 | '(' attribute_list KR_function_ptr ')' '(' parameter_type_list_opt ')' 3548 { $$ = $3->addQualifiers( $2 )->addParamList( $6 ); } 3541 3549 | '(' KR_function_no_ptr ')' // redundant parenthesis 3542 3550 { $$ = $2; } … … 3582 3590 { 3583 3591 // hide type name in enclosing scope by variable name 3584 typedefTable.addToEnclosingScope( *$1->name, IDENTIFIER, " ID" );3592 typedefTable.addToEnclosingScope( *$1->name, IDENTIFIER, "paren_type" ); 3585 3593 } 3586 3594 | '(' paren_type ')' … … 3627 3635 3628 3636 variable_type_function: 3629 '(' variable_type_ptr ')' '(' p ush parameter_type_list_opt pop')' // empty parameter list OBSOLESCENT (see 3)3630 { $$ = $2->addParamList( $ 6); }3631 | '(' attribute_list variable_type_ptr ')' '(' p ush parameter_type_list_opt pop')' // empty parameter list OBSOLESCENT (see 3)3632 { $$ = $3->addQualifiers( $2 )->addParamList( $ 7); }3637 '(' variable_type_ptr ')' '(' parameter_type_list_opt ')' // empty parameter list OBSOLESCENT (see 3) 3638 { $$ = $2->addParamList( $5 ); } 3639 | '(' attribute_list variable_type_ptr ')' '(' parameter_type_list_opt ')' // empty parameter list OBSOLESCENT (see 3) 3640 { $$ = $3->addQualifiers( $2 )->addParamList( $6 ); } 3633 3641 | '(' variable_type_function ')' // redundant parenthesis 3634 3642 { $$ = $2; } … … 3650 3658 3651 3659 function_type_no_ptr: 3652 paren_type '(' p ush parameter_type_list_opt pop')' // empty parameter list OBSOLESCENT (see 3)3653 { $$ = $1->addParamList( $ 4); }3654 | '(' function_type_ptr ')' '(' p ush parameter_type_list_opt pop')'3655 { $$ = $2->addParamList( $ 6); }3656 | '(' attribute_list function_type_ptr ')' '(' p ush parameter_type_list_opt pop')'3657 { $$ = $3->addQualifiers( $2 )->addParamList( $ 7); }3660 paren_type '(' parameter_type_list_opt ')' // empty parameter list OBSOLESCENT (see 3) 3661 { $$ = $1->addParamList( $3 ); } 3662 | '(' function_type_ptr ')' '(' parameter_type_list_opt ')' 3663 { $$ = $2->addParamList( $5 ); } 3664 | '(' attribute_list function_type_ptr ')' '(' parameter_type_list_opt ')' 3665 { $$ = $3->addQualifiers( $2 )->addParamList( $6 ); } 3658 3666 | '(' function_type_no_ptr ')' // redundant parenthesis 3659 3667 { $$ = $2; } … … 3726 3734 3727 3735 identifier_parameter_function: 3728 paren_identifier '(' p ush parameter_type_list_opt pop')' // empty parameter list OBSOLESCENT (see 3)3729 { $$ = $1->addParamList( $ 4); }3730 | '(' identifier_parameter_ptr ')' '(' p ush parameter_type_list_opt pop')' // empty parameter list OBSOLESCENT (see 3)3731 { $$ = $2->addParamList( $ 6); }3736 paren_identifier '(' parameter_type_list_opt ')' // empty parameter list OBSOLESCENT (see 3) 3737 { $$ = $1->addParamList( $3 ); } 3738 | '(' identifier_parameter_ptr ')' '(' parameter_type_list_opt ')' // empty parameter list OBSOLESCENT (see 3) 3739 { $$ = $2->addParamList( $5 ); } 3732 3740 | '(' identifier_parameter_function ')' // redundant parenthesis 3733 3741 { $$ = $2; } … … 3779 3787 3780 3788 type_parameter_function: 3781 typedef_name '(' p ush parameter_type_list_opt pop')' // empty parameter list OBSOLESCENT (see 3)3782 { $$ = $1->addParamList( $ 4); }3783 | '(' type_parameter_ptr ')' '(' p ush parameter_type_list_opt pop')' // empty parameter list OBSOLESCENT (see 3)3784 { $$ = $2->addParamList( $ 6); }3789 typedef_name '(' parameter_type_list_opt ')' // empty parameter list OBSOLESCENT (see 3) 3790 { $$ = $1->addParamList( $3 ); } 3791 | '(' type_parameter_ptr ')' '(' parameter_type_list_opt ')' // empty parameter list OBSOLESCENT (see 3) 3792 { $$ = $2->addParamList( $5 ); } 3785 3793 ; 3786 3794 … … 3829 3837 3830 3838 abstract_function: 3831 '(' p ush parameter_type_list_opt pop')' // empty parameter list OBSOLESCENT (see 3)3832 { $$ = DeclarationNode::newFunction( nullptr, nullptr, $ 3, nullptr ); }3833 | '(' abstract_ptr ')' '(' p ush parameter_type_list_opt pop')' // empty parameter list OBSOLESCENT (see 3)3834 { $$ = $2->addParamList( $ 6); }3839 '(' parameter_type_list_opt ')' // empty parameter list OBSOLESCENT (see 3) 3840 { $$ = DeclarationNode::newFunction( nullptr, nullptr, $2, nullptr ); } 3841 | '(' abstract_ptr ')' '(' parameter_type_list_opt ')' // empty parameter list OBSOLESCENT (see 3) 3842 { $$ = $2->addParamList( $5 ); } 3835 3843 | '(' abstract_function ')' // redundant parenthesis 3836 3844 { $$ = $2; } … … 3952 3960 3953 3961 abstract_parameter_function: 3954 '(' p ush parameter_type_list_opt pop')' // empty parameter list OBSOLESCENT (see 3)3955 { $$ = DeclarationNode::newFunction( nullptr, nullptr, $ 3, nullptr ); }3956 | '(' abstract_parameter_ptr ')' '(' p ush parameter_type_list_opt pop')' // empty parameter list OBSOLESCENT (see 3)3957 { $$ = $2->addParamList( $ 6); }3962 '(' parameter_type_list_opt ')' // empty parameter list OBSOLESCENT (see 3) 3963 { $$ = DeclarationNode::newFunction( nullptr, nullptr, $2, nullptr ); } 3964 | '(' abstract_parameter_ptr ')' '(' parameter_type_list_opt ')' // empty parameter list OBSOLESCENT (see 3) 3965 { $$ = $2->addParamList( $5 ); } 3958 3966 | '(' abstract_parameter_function ')' // redundant parenthesis 3959 3967 { $$ = $2; } … … 3992 4000 // This pattern parses a declaration of an abstract variable, but does not allow "int ()" for a function pointer. 3993 4001 // 3994 // 3995 // 3996 // 3997 // 3998 // 3999 // 4002 // struct S { 4003 // int; 4004 // int *; 4005 // int [10]; 4006 // int (*)(); 4007 // }; 4000 4008 4001 4009 variable_abstract_declarator: … … 4031 4039 4032 4040 variable_abstract_function: 4033 '(' variable_abstract_ptr ')' '(' p ush parameter_type_list_opt pop')' // empty parameter list OBSOLESCENT (see 3)4034 { $$ = $2->addParamList( $ 6); }4041 '(' variable_abstract_ptr ')' '(' parameter_type_list_opt ')' // empty parameter list OBSOLESCENT (see 3) 4042 { $$ = $2->addParamList( $5 ); } 4035 4043 | '(' variable_abstract_function ')' // redundant parenthesis 4036 4044 { $$ = $2; }
Note: See TracChangeset
for help on using the changeset viewer.
