From 86956c2b673e092a10a300da21159d7fc4d578d7 Mon Sep 17 00:00:00 2001 From: Markus Westerlind Date: Fri, 28 Feb 2020 20:17:41 +0100 Subject: [PATCH] Update lrgrammar --- lalrpop-test/src/lib.rs | 1 - lalrpop/src/parser/lrgrammar.rs | 74 ++++++++++++++++----------------- update_lrgrammar.sh | 1 - 3 files changed, 37 insertions(+), 39 deletions(-) diff --git a/lalrpop-test/src/lib.rs b/lalrpop-test/src/lib.rs index 47923f3..3f94b0b 100644 --- a/lalrpop-test/src/lib.rs +++ b/lalrpop-test/src/lib.rs @@ -964,7 +964,6 @@ fn generics_issue_417() { } #[test] -#[ignore] fn verify_lalrpop_generates_itself() { let out_dir = "../target"; let lrgrammar = "lrgrammar.lalrpop"; diff --git a/lalrpop/src/parser/lrgrammar.rs b/lalrpop/src/parser/lrgrammar.rs index f1c744f..1df0f56 100644 --- a/lalrpop/src/parser/lrgrammar.rs +++ b/lalrpop/src/parser/lrgrammar.rs @@ -20118,7 +20118,7 @@ text: &'input str, (_, ___0, _): (usize, Top, usize), ) -> Top { -(___0) +___0 } #[allow(unused_variables)] @@ -20221,7 +20221,7 @@ text: &'input str, (_, _, _): (usize, Tok<'input>, usize), ) -> Vec { -(___0) +___0 } #[allow(unused_variables)] @@ -20255,7 +20255,7 @@ text: &'input str, (_, ___0, _): (usize, Vec>, usize), ) -> Vec> { -(___0) +___0 } #[allow(unused_variables)] @@ -20296,7 +20296,7 @@ text: &'input str, (_, _, _): (usize, Tok<'input>, usize), ) -> Vec { -(___0) +___0 } #[allow(unused_variables)] @@ -20318,7 +20318,7 @@ text: &'input str, (_, ___0, _): (usize, Vec>, usize), ) -> Vec> { -(___0) +___0 } #[allow(unused_variables)] @@ -20406,7 +20406,7 @@ text: &'input str, (_, _, _): (usize, Tok<'input>, usize), ) -> Vec { -(___0) +___0 } #[allow(unused_variables)] @@ -20430,7 +20430,7 @@ text: &'input str, (_, ___0, _): (usize, GrammarItem, usize), ) -> GrammarItem { -(___0) +___0 } #[allow(unused_variables)] @@ -20441,7 +20441,7 @@ text: &'input str, (_, ___0, _): (usize, GrammarItem, usize), ) -> GrammarItem { -(___0) +___0 } #[allow(unused_variables)] @@ -20452,7 +20452,7 @@ text: &'input str, (_, ___0, _): (usize, GrammarItem, usize), ) -> GrammarItem { -(___0) +___0 } #[allow(unused_variables)] @@ -20463,7 +20463,7 @@ text: &'input str, (_, ___0, _): (usize, GrammarItem, usize), ) -> GrammarItem { -(___0) +___0 } #[allow(unused_variables)] @@ -20633,7 +20633,7 @@ text: &'input str, (_, _, _): (usize, ::std::option::Option>, usize), ) -> Vec { -(___0) +___0 } #[allow(unused_variables)] @@ -20837,7 +20837,7 @@ text: &'input str, (_, ___0, _): (usize, Symbol, usize), ) -> Symbol { -(___0) +___0 } #[allow(unused_variables)] @@ -20848,7 +20848,7 @@ text: &'input str, (_, ___0, _): (usize, Symbol, usize), ) -> Symbol { -(___0) +___0 } #[allow(unused_variables)] @@ -21128,7 +21128,7 @@ text: &'input str, (_, ___0, _): (usize, TypeRef, usize), ) -> TypeRef { -(___0) +___0 } #[allow(unused_variables)] @@ -21309,7 +21309,7 @@ text: &'input str, (_, ___0, _): (usize, TerminalLiteral, usize), ) -> TerminalLiteral { -(___0) +___0 } #[allow(unused_variables)] @@ -21320,7 +21320,7 @@ text: &'input str, (_, ___0, _): (usize, TerminalString, usize), ) -> TerminalString { -(___0) +___0 } #[allow(unused_variables)] @@ -21607,7 +21607,7 @@ text: &'input str, (_, ___0, _): (usize, TerminalString, usize), ) -> TerminalString { -(___0) +___0 } #[allow(unused_variables)] @@ -21747,7 +21747,7 @@ text: &'input str, (_, _, _): (usize, Tok<'input>, usize), ) -> FieldPattern { -(___0) +___0 } #[allow(unused_variables)] @@ -21841,7 +21841,7 @@ text: &'input str, (_, _, _): (usize, Tok<'input>, usize), ) -> Atom { -(___0) +___0 } #[allow(unused_variables)] @@ -22015,7 +22015,7 @@ text: &'input str, (_, ___0, _): (usize, Condition, usize), ) -> Condition { -(___0) +___0 } #[allow(unused_variables)] @@ -22143,7 +22143,7 @@ text: &'input str, (_, ___0, _): (usize, TypeRef, usize), ) -> TypeRef { -(___0) +___0 } #[allow(unused_variables)] @@ -22191,7 +22191,7 @@ text: &'input str, (_, _, _): (usize, Tok<'input>, usize), ) -> Vec> { -(___0) +___0 } #[allow(unused_variables)] @@ -22238,7 +22238,7 @@ text: &'input str, (_, ___0, _): (usize, TypeRef, usize), ) -> TypeRef { -(___0) +___0 } #[allow(unused_variables)] @@ -22651,7 +22651,7 @@ text: &'input str, (_, _, _): (usize, Tok<'input>, usize), ) -> TypeParameter { -(___0) +___0 } #[allow(unused_variables)] @@ -22709,7 +22709,7 @@ text: &'input str, (_, _, _): (usize, Tok<'input>, usize), ) -> WhereClause { -(___0) +___0 } #[allow(unused_variables)] @@ -22744,7 +22744,7 @@ text: &'input str, (_, _, _): (usize, Tok<'input>, usize), ) -> Lifetime { -(___0) +___0 } #[allow(unused_variables)] @@ -22802,7 +22802,7 @@ text: &'input str, (_, _, _): (usize, Tok<'input>, usize), ) -> TypeBound { -(___0) +___0 } #[allow(unused_variables)] @@ -22860,7 +22860,7 @@ text: &'input str, (_, _, _): (usize, Tok<'input>, usize), ) -> TypeRef { -(___0) +___0 } #[allow(unused_variables)] @@ -22918,7 +22918,7 @@ text: &'input str, (_, _, _): (usize, Tok<'input>, usize), ) -> TypeBoundParameter { -(___0) +___0 } #[allow(unused_variables)] @@ -22976,7 +22976,7 @@ text: &'input str, (_, _, _): (usize, Tok<'input>, usize), ) -> Parameter { -(___0) +___0 } #[allow(unused_variables)] @@ -23034,7 +23034,7 @@ text: &'input str, (_, _, _): (usize, Tok<'input>, usize), ) -> NonterminalString { -(___0) +___0 } #[allow(unused_variables)] @@ -23092,7 +23092,7 @@ text: &'input str, (_, _, _): (usize, Tok<'input>, usize), ) -> Alternative { -(___0) +___0 } #[allow(unused_variables)] @@ -23150,7 +23150,7 @@ text: &'input str, (_, _, _): (usize, Tok<'input>, usize), ) -> Symbol { -(___0) +___0 } #[allow(unused_variables)] @@ -23208,7 +23208,7 @@ text: &'input str, (_, _, _): (usize, Tok<'input>, usize), ) -> TypeRef { -(___0) +___0 } #[allow(unused_variables)] @@ -23312,7 +23312,7 @@ text: &'input str, (_, _, _): (usize, Tok<'input>, usize), ) -> MatchItem { -(___0) +___0 } #[allow(unused_variables)] @@ -23370,7 +23370,7 @@ text: &'input str, (_, _, _): (usize, Tok<'input>, usize), ) -> Conversion { -(___0) +___0 } #[allow(unused_variables)] @@ -23428,7 +23428,7 @@ text: &'input str, (_, _, _): (usize, Tok<'input>, usize), ) -> Pattern { -(___0) +___0 } #[allow(unused_variables)] diff --git a/update_lrgrammar.sh b/update_lrgrammar.sh index b108a59..e6fcbc4 100644 --- a/update_lrgrammar.sh +++ b/update_lrgrammar.sh @@ -2,4 +2,3 @@ cp -f lalrpop/src/parser/lrgrammar.rs lalrpop/src/parser/lrgrammar.rs.bak cargo run -p lalrpop -- --force --no-whitespace --out-dir . lalrpop/src/parser/lrgrammar.lalrpop || exit 1 -mv -f target/debug/lrgrammar.rs lalrpop/src/parser/lrgrammar.rs