Changes in src/Parser/parser.yy [0522ebe:4eb3a7c5]
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/Parser/parser.yy
r0522ebe r4eb3a7c5 10 10 // Created On : Sat Sep 1 20:22:55 2001 11 11 // Last Modified By : Peter A. Buhr 12 // Last Modified On : Sun Nov 26 13:18:06 202313 // Update Count : 6 39812 // Last Modified On : Fri Feb 23 18:25:46 2024 13 // Update Count : 6484 14 14 // 15 15 … … 102 102 103 103 DeclarationNode * distAttr( DeclarationNode * typeSpec, DeclarationNode * declList ) { 104 // distribute declaration_specifier across all declared variables, e.g., static, const, but not__attribute__.104 // Distribute type specifier across all declared variables, e.g., static, const, __attribute__. 105 105 assert( declList ); 106 // printf( "distAttr1 typeSpec %p\n", typeSpec ); typeSpec->print( std::cout ); 107 DeclarationNode * cl = (new DeclarationNode)->addType( typeSpec ); 108 // printf( "distAttr2 cl %p\n", cl ); cl->type->print( std::cout ); 109 // cl->type->aggregate.name = cl->type->aggInst.aggregate->aggregate.name; 110 106 107 // Do not distribute attributes for aggregates because the attributes surrounding the aggregate belong it not the 108 // variables in the declaration list, e.g., 109 // 110 // struct __attribute__(( aligned(128) )) S { ... 111 // } v1 __attribute__(( aligned(64) )), v2 __attribute__(( aligned(32) )), v3; 112 // struct S v4; 113 // 114 // v1 => 64, v2 =>32, v3 => 128, v2 => 128 115 // 116 // Anonymous aggregates are a special case because there is no aggregate to bind the attribute to; hence it floats 117 // to the declaration list. 118 // 119 // struct __attribute__(( aligned(128) )) /*anonymous */ { ... } v1; 120 // 121 // v1 => 128 122 123 bool copyattr = ! (typeSpec->type && typeSpec->type->kind == TypeData::Aggregate && ! typeSpec->type->aggregate.anon ); 124 125 // addType copies the type information for the aggregate instances from typeSpec into cl's aggInst.aggregate. 126 DeclarationNode * cl = (new DeclarationNode)->addType( typeSpec ); // typeSpec IS DELETED!!! 127 128 // Start at second variable in declaration list and clone the type specifiers for each variable.. 111 129 for ( DeclarationNode * cur = dynamic_cast<DeclarationNode *>( declList->get_next() ); cur != nullptr; cur = dynamic_cast<DeclarationNode *>( cur->get_next() ) ) { 112 cl->cloneBaseType( cur );130 cl->cloneBaseType( cur, copyattr ); // cur is modified 113 131 } // for 114 declList->addType( cl ); 115 // printf( "distAttr3 declList %p\n", declList ); declList->print( std::cout, 0 ); 132 133 // Add first variable in declaration list with hidden type information in aggInst.aggregate, which is used by 134 // extractType to recover the type for the aggregate instances. 135 declList->addType( cl, copyattr ); // cl IS DELETED!!! 116 136 return declList; 117 137 } // distAttr … … 192 212 fieldList = DeclarationNode::newName( nullptr ); 193 213 } // if 194 // return distAttr( typeSpec, fieldList ); // mark all fields in list195 214 196 215 // printf( "fieldDecl3 typeSpec %p\n", typeSpec ); typeSpec->print( std::cout, 0 ); 197 DeclarationNode * temp = distAttr( typeSpec, fieldList ); 216 DeclarationNode * temp = distAttr( typeSpec, fieldList ); // mark all fields in list 198 217 // printf( "fieldDecl4 temp %p\n", temp ); temp->print( std::cout, 0 ); 199 218 return temp; … … 761 780 | string_literal '`' identifier // CFA, postfix call 762 781 { $$ = new ExpressionNode( build_func( yylloc, new ExpressionNode( build_varref( yylloc, build_postfix_name( $3 ) ) ), $1 ) ); } 782 783 // SKULLDUGGERY: The typedef table used for parsing does not store fields in structures. To parse a qualified 784 // name, it is assumed all name-tokens after the first are identifiers, regardless of how the lexer identifies 785 // them. For example: 786 // 787 // struct S; 788 // forall(T) struct T; 789 // union U; 790 // enum E { S, T, E }; 791 // struct Z { int S, T, Z, E, U; }; 792 // void fred () { 793 // Z z; 794 // z.S; // lexer returns S is TYPEDEFname 795 // z.T; // lexer returns T is TYPEGENname 796 // z.Z; // lexer returns Z is TYPEDEFname 797 // z.U; // lexer returns U is TYPEDEFname 798 // z.E; // lexer returns E is TYPEDEFname 799 // } 763 800 | postfix_expression '.' identifier 764 801 { $$ = new ExpressionNode( build_fieldSel( yylloc, $1, build_varref( yylloc, $3 ) ) ); } 802 | postfix_expression '.' TYPEDEFname // CFA, SKULLDUGGERY 803 { $$ = new ExpressionNode( build_fieldSel( yylloc, $1, build_varref( yylloc, $3 ) ) ); } 804 | postfix_expression '.' TYPEGENname // CFA, SKULLDUGGERY 805 { $$ = new ExpressionNode( build_fieldSel( yylloc, $1, build_varref( yylloc, $3 ) ) ); } 806 765 807 | postfix_expression '.' INTEGERconstant // CFA, tuple index 766 808 { $$ = new ExpressionNode( build_fieldSel( yylloc, $1, build_constantInteger( yylloc, *$3 ) ) ); } … … 1856 1898 declaration_list: 1857 1899 declaration 1858 | declaration_list declaration 1859 { $$ = $1->appendList( $2 ); } 1900 | declaration_list declaration { $$ = $1->appendList( $2 ); } 1860 1901 ; 1861 1902 … … 1890 1931 declaration: // old & new style declarations 1891 1932 c_declaration ';' 1892 {1893 // printf( "C_DECLARATION1 %p %s\n", $$, $$->name ? $$->name->c_str() : "(nil)" );1894 // for ( Attribute * attr: reverseIterate( $$->attributes ) ) {1895 // printf( "\tattr %s\n", attr->name.c_str() );1896 // } // for1897 }1898 1933 | cfa_declaration ';' // CFA 1899 1934 | static_assert // C11 … … 2348 2383 sue_declaration_specifier: // struct, union, enum + storage class + type specifier 2349 2384 sue_type_specifier 2350 {2351 // printf( "sue_declaration_specifier %p %s\n", $$, $$->type->aggregate.name ? $$->type->aggregate.name->c_str() : "(nil)" );2352 // for ( Attribute * attr: reverseIterate( $$->attributes ) ) {2353 // printf( "\tattr %s\n", attr->name.c_str() );2354 // } // for2355 }2356 2385 | declaration_qualifier_list sue_type_specifier 2357 2386 { $$ = $2->addQualifiers( $1 ); } … … 2364 2393 sue_type_specifier: // struct, union, enum + type specifier 2365 2394 elaborated_type 2366 {2367 // printf( "sue_type_specifier %p %s\n", $$, $$->type->aggregate.name ? $$->type->aggregate.name->c_str() : "(nil)" );2368 // for ( Attribute * attr: reverseIterate( $$->attributes ) ) {2369 // printf( "\tattr %s\n", attr->name.c_str() );2370 // } // for2371 }2372 2395 | type_qualifier_list 2373 2396 { if ( $1->type != nullptr && $1->type->forall ) forall = true; } // remember generic type … … 2442 2465 elaborated_type: // struct, union, enum 2443 2466 aggregate_type 2444 {2445 // printf( "elaborated_type %p %s\n", $$, $$->type->aggregate.name ? $$->type->aggregate.name->c_str() : "(nil)" );2446 // for ( Attribute * attr: reverseIterate( $$->attributes ) ) {2447 // printf( "\tattr %s\n", attr->name.c_str() );2448 // } // for2449 }2450 2467 | enum_type 2451 2468 ; … … 2679 2696 { $$ = DeclarationNode::newEnum( nullptr, $4, true, false )->addQualifiers( $2 ); } 2680 2697 | ENUM attribute_list_opt '!' '{' enumerator_list comma_opt '}' // invalid syntax rule 2681 { SemanticError( yylloc, "syntax error, hiding '!'the enumerator names of an anonymous enumeration means the names are inaccessible." ); $$ = nullptr; }2698 { SemanticError( yylloc, "syntax error, hiding ('!') the enumerator names of an anonymous enumeration means the names are inaccessible." ); $$ = nullptr; } 2682 2699 | ENUM attribute_list_opt identifier 2683 2700 { typedefTable.makeTypedef( *$3, "enum_type 1" ); } … … 2694 2711 } 2695 2712 | ENUM '(' cfa_abstract_parameter_declaration ')' attribute_list_opt '!' '{' enumerator_list comma_opt '}' // unqualified type name 2696 { SemanticError( yylloc, "syntax error, hiding '!'the enumerator names of an anonymous enumeration means the names are inaccessible." ); $$ = nullptr; }2713 { SemanticError( yylloc, "syntax error, hiding ('!') the enumerator names of an anonymous enumeration means the names are inaccessible." ); $$ = nullptr; } 2697 2714 | ENUM '(' ')' attribute_list_opt '{' enumerator_list comma_opt '}' 2698 2715 { … … 2700 2717 } 2701 2718 | ENUM '(' ')' attribute_list_opt '!' '{' enumerator_list comma_opt '}' // invalid syntax rule 2702 { SemanticError( yylloc, "syntax error, hiding '!'the enumerator names of an anonymous enumeration means the names are inaccessible." ); $$ = nullptr; }2719 { SemanticError( yylloc, "syntax error, hiding ('!') the enumerator names of an anonymous enumeration means the names are inaccessible." ); $$ = nullptr; } 2703 2720 | ENUM '(' cfa_abstract_parameter_declaration ')' attribute_list_opt identifier attribute_list_opt 2704 2721 { … … 3006 3023 | assertion_list 3007 3024 { $$ = DeclarationNode::newTypeParam( ast::TypeDecl::Dtype, new string( DeclarationNode::anonymous.newName() ) )->addAssertions( $1 ); } 3008 | ENUM '(' identifier_or_type_name ')' identifier_or_type_name new_type_class type_initializer_opt assertion_list_opt3009 {3010 typedefTable.addToScope( *$3, TYPEDIMname, "type_parameter 4" );3011 typedefTable.addToScope( *$5, TYPEDIMname, "type_parameter 5" );3012 $$ = DeclarationNode::newTypeParam( $6, $5 )->addTypeInitializer( $7 )->addAssertions( $8 );3013 }3014 3025 ; 3015 3026 … … 3177 3188 // unit, which is a dubious task, especially because C uses name rather than structural typing; hence it is 3178 3189 // disallowed at the moment. 3179 if ( $1->linkage == ast::Linkage::Cforall && ! $1->storageClasses.is_static && $1->type && $1->type->kind == TypeData::AggregateInst ) { 3190 if ( $1->linkage == ast::Linkage::Cforall && ! $1->storageClasses.is_static && 3191 $1->type && $1->type->kind == TypeData::AggregateInst ) { 3180 3192 if ( $1->type->aggInst.aggregate->kind == TypeData::Enum && $1->type->aggInst.aggregate->enumeration.anon ) { 3181 3193 SemanticError( yylloc, "extern anonymous enumeration is currently unimplemented." ); $$ = nullptr;
Note: See TracChangeset
for help on using the changeset viewer.