Changeset b048dc3


Ignore:
Timestamp:
May 25, 2018, 9:46:23 AM (4 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, with_gc
Children:
cc2eda7
Parents:
251454a0
Message:

additional intermediate changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/Parser/parser.yy

    r251454a0 rb048dc3  
    1010// Created On       : Sat Sep  1 20:22:55 2001
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Thu May 24 16:49:58 2018
    13 // Update Count     : 3367
     12// Last Modified On : Thu May 24 18:11:59 2018
     13// Update Count     : 3369
    1414//
    1515
     
    12651265
    12661266declaration_list_opt:                                                                   // used at beginning of switch statement
    1267         pop
     1267        pop     // empty
    12681268                { $$ = nullptr; }
    12691269        | declaration_list
     
    14071407                { $$ = DeclarationNode::newTuple( $3 ); }
    14081408        | '[' push cfa_parameter_list pop ',' push cfa_abstract_parameter_list pop ']'
    1409                 // To obtain LR(1 ), the last cfa_abstract_parameter_list is added into this flattened rule to lookahead to the
    1410                 // ']'.
     1409                // To obtain LR(1 ), the last cfa_abstract_parameter_list is added into this flattened rule to lookahead to the ']'.
    14111410                { $$ = DeclarationNode::newTuple( $3->appendList( $7 ) ); }
    14121411        ;
     
    22582257        TRAIT no_attr_identifier_or_type_name '(' push type_parameter_list pop ')' '{' '}'
    22592258                { $$ = DeclarationNode::newTrait( $2, $5, 0 ); }
    2260         | TRAIT no_attr_identifier_or_type_name '(' push type_parameter_list pop ')' '{'
    2261                 { typedefTable.enterScope(); }
    2262           trait_declaration_list '}'
     2259        | TRAIT no_attr_identifier_or_type_name '(' push type_parameter_list pop ')' '{' push trait_declaration_list '}'
    22632260                { $$ = DeclarationNode::newTrait( $2, $5, $10 ); }
    22642261        ;
Note: See TracChangeset for help on using the changeset viewer.