Changeset b048dc3

Timestamp:

May 25, 2018, 9:46:23 AM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, with_gc

Children:

cc2eda7

Parents:

251454a0

Message:

additional intermediate changes

File:

• src/Parser/parser.yy (modified) (4 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 : Thu May 24 16:49:58 2018
-// Update Count     : 3367
+// Last Modified On : Thu May 24 18:11:59 2018
+// Update Count     : 3369
 //
 
@@ -1265 +1265 @@
 
 declaration_list_opt:                                                                   // used at beginning of switch statement
-        pop
+        pop     // empty
                 { $$ = nullptr; }
         | declaration_list
@@ -1407 +1407 @@
                 { $$ = DeclarationNode::newTuple( $3 ); }
         | '[' push cfa_parameter_list pop ',' push cfa_abstract_parameter_list pop ']'
-                // To obtain LR(1 ), the last cfa_abstract_parameter_list is added into this flattened rule to lookahead to the
-                // ']'.
+                // To obtain LR(1 ), the last cfa_abstract_parameter_list is added into this flattened rule to lookahead to the ']'.
                 { $$ = DeclarationNode::newTuple( $3->appendList( $7 ) ); }
         ;
@@ -2258 +2257 @@
         TRAIT no_attr_identifier_or_type_name '(' push type_parameter_list pop ')' '{' '}'
                 { $$ = DeclarationNode::newTrait( $2, $5, 0 ); }
-        | TRAIT no_attr_identifier_or_type_name '(' push type_parameter_list pop ')' '{'
-                { typedefTable.enterScope(); }
-          trait_declaration_list '}'
+        | TRAIT no_attr_identifier_or_type_name '(' push type_parameter_list pop ')' '{' push trait_declaration_list '}'
                 { $$ = DeclarationNode::newTrait( $2, $5, $10 ); }
         ;