Index: src/Parser/parser.yy
===================================================================
--- src/Parser/parser.yy	(revision c0a33d2718e90087f8e19043f7cdfa88d48808f8)
+++ src/Parser/parser.yy	(revision cc2eda7f84acf93e9de3777cc9cb3abeb69762bb)
@@ -10,6 +10,6 @@
 // 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,5 +1265,5 @@
 
 declaration_list_opt:									// used at beginning of switch statement
-	pop
+	pop	// empty
 		{ $$ = nullptr; }
 	| declaration_list
@@ -1407,6 +1407,5 @@
 		{ $$ = 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,7 +2257,5 @@
 	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 ); }
 	;