about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrian Leibig <brian@brianleibig.com>2015-02-28 18:10:41 -0800
committerBrian Leibig <brian@brianleibig.com>2015-03-01 13:59:34 -0800
commite93b2abf37e594110ef15049d957a8dcac9bc977 (patch)
tree5323329149ad946dac2babada654c2f835863389
parent157614249594f187f421cd97f928e64c5ab5c1fa (diff)
Bison grammar: support parsing default trait impls
-rw-r--r--src/grammar/parser-lalr.y8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/grammar/parser-lalr.y b/src/grammar/parser-lalr.y
index 6a6f7e0e9f9..9cff58cf89a 100644
--- a/src/grammar/parser-lalr.y
+++ b/src/grammar/parser-lalr.y
@@ -582,6 +582,14 @@ item_impl
 {
   $$ = mk_node("ItemImplNeg", 7, $1, $3, $5, $7, $8, $10, $11);
 }
+| maybe_unsafe IMPL generic_params trait_ref FOR DOTDOT '{' '}'
+{
+  $$ = mk_node("ItemImplDefault", 3, $1, $3, $4);
+}
+| maybe_unsafe IMPL generic_params '!' trait_ref FOR DOTDOT '{' '}'
+{
+  $$ = mk_node("ItemImplDefaultNeg", 3, $1, $3, $4);
+}
 ;
 
 maybe_impl_items