Merge pull request #51 from mystor/truefalse_lit

true and false should not be parsed as literals, and should instead be parsed as terms

Author: dtolnay

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) {

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)*)) {