From 7b3bb04f3e7e66caa21426d19e0a2ffe3a7daf9f Mon Sep 17 00:00:00 2001 From: Nika Layzell Date: Mon, 8 Jan 2018 17:01:56 -0500 Subject: [PATCH] true and false should not be parsed as literals, and should instead be parsed as terms --- src/stable.rs | 8 -------- src/strnom.rs | 19 ------------------- 2 files changed, 27 deletions(-) diff --git a/src/stable.rs b/src/stable.rs index 8bf3a9f4..6312aceb 100644 --- a/src/stable.rs +++ b/src/stable.rs @@ -718,8 +718,6 @@ named!(literal_nocapture -> (), alt!( | int | - boolean - | doc_comment )); @@ -1142,12 +1140,6 @@ fn digits(mut input: Cursor) -> PResult<()> { } } -named!(boolean -> (), alt!( - keyword!("true") => { |_| () } - | - keyword!("false") => { |_| () } -)); - fn op(input: Cursor) -> PResult<(char, Spacing)> { let input = skip_whitespace(input); match op_char(input) { diff --git a/src/strnom.rs b/src/strnom.rs index 35acff72..1bf9f236 100644 --- a/src/strnom.rs +++ b/src/strnom.rs @@ -374,25 +374,6 @@ pub fn punct<'a>(input: Cursor<'a>, token: &'static str) -> PResult<'a, &'a str> } } -macro_rules! keyword { - ($i:expr, $keyword:expr) => { - $crate::strnom::keyword($i, $keyword) - }; -} - -/// Do not use directly. Use `keyword!`. -pub fn keyword<'a>(input: Cursor<'a>, token: &'static str) -> PResult<'a, &'a str> { - match punct(input, token) { - Ok((rest, _)) => { - match word_break(rest) { - Ok((_, _)) => Ok((rest, token)), - Err(LexError) => Err(LexError), - } - } - Err(LexError) => Err(LexError), - } -} - macro_rules! preceded { ($i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => { match tuple!($i, $submac!($($args)*), $submac2!($($args2)*)) {