From 03cc48c38ddd3bbdf7f928dede249e7c8527edd0 Mon Sep 17 00:00:00 2001 From: Brian Leibig Date: Tue, 10 Feb 2015 16:51:02 -0800 Subject: [PATCH] Bison grammar: refactor items to allow "extern crate" in stmts --- src/grammar/parser-lalr.y | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/grammar/parser-lalr.y b/src/grammar/parser-lalr.y index 26168f6f5cb..2788476ebfe 100644 --- a/src/grammar/parser-lalr.y +++ b/src/grammar/parser-lalr.y @@ -258,11 +258,7 @@ mod_item // items that can appear outside of a fn block item -: item_static -| item_const -| item_type -| block_item -| view_item +: stmt_item | item_macro ; @@ -272,8 +268,7 @@ stmt_item | item_const | item_type | block_item -| use_item -| extern_fn_item +| view_item ; item_static @@ -295,7 +290,6 @@ view_item : use_item | extern_fn_item | EXTERN CRATE ident ';' { $$ = mk_node("ViewItemExternCrate", 1, $3); } -| EXTERN CRATE ident '=' str ';' { $$ = mk_node("ViewItemExternCrate", 2, $3, $5); } | EXTERN CRATE str AS ident ';' { $$ = mk_node("ViewItemExternCrate", 2, $3, $5); } ;