nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-04-28 11:07:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #1239

Browse Source 
1239: Fix `$true` and `$false` as $var name error r=matklad a=edwin0cheng

This PR fixed a bug which cannot use `$true` and `$false` as `$var` name in mbe. 

Co-authored-by: Edwin Cheng <edwin0cheng@gmail.com>
This commit is contained in:
bors[bot] 2019-05-04 16:55:53 +00:00
commit b6ffb1d2a3
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
crates/ra_mbe/src/mbe_parser.rs
View File

@ -28,6 +28,16 @@ fn parse_rule(p: &mut TtCursor) -> Result<crate::Rule, ParseError> {
Ok(crate::Rule { lhs, rhs }) Ok(crate::Rule { lhs, rhs })
} }
fn is_boolean_literal(lit: Option<&tt::TokenTree>) -> bool {
if let Some(tt::TokenTree::Leaf(tt::Leaf::Literal(lit))) = lit {
if lit.text == "true" || lit.text == "false" {
return true;
}
}
false
}
fn parse_subtree(tt: &tt::Subtree, transcriber: bool) -> Result<crate::Subtree, ParseError> { fn parse_subtree(tt: &tt::Subtree, transcriber: bool) -> Result<crate::Subtree, ParseError> {
let mut token_trees = Vec::new(); let mut token_trees = Vec::new();
let mut p = TtCursor::new(tt); let mut p = TtCursor::new(tt);
@ -35,7 +45,8 @@ fn parse_subtree(tt: &tt::Subtree, transcriber: bool) -> Result<crate::Subtree,
let child: crate::TokenTree = match tt { let child: crate::TokenTree = match tt {
tt::TokenTree::Leaf(leaf) => match leaf { tt::TokenTree::Leaf(leaf) => match leaf {
tt::Leaf::Punct(tt::Punct { char: '$', spacing }) => { tt::Leaf::Punct(tt::Punct { char: '$', spacing }) => {
if p.at_ident().is_some() { // mbe var can be an ident or keyword, including `true` and `false`
if p.at_ident().is_some() || is_boolean_literal(p.current()) {
crate::Leaf::from(parse_var(&mut p, transcriber)?).into() crate::Leaf::from(parse_var(&mut p, transcriber)?).into()
} else if let Some(tt::TokenTree::Subtree(_)) = p.current() { } else if let Some(tt::TokenTree::Subtree(_)) = p.current() {
parse_repeat(&mut p, transcriber)?.into() parse_repeat(&mut p, transcriber)?.into()
@ -60,8 +71,16 @@ fn parse_subtree(tt: &tt::Subtree, transcriber: bool) -> Result<crate::Subtree,
} }
fn parse_var(p: &mut TtCursor, transcriber: bool) -> Result<crate::Var, ParseError> { fn parse_var(p: &mut TtCursor, transcriber: bool) -> Result<crate::Var, ParseError> {
let text = {
if is_boolean_literal(p.current()) {
let lit = p.eat_literal().unwrap();
lit.text.clone()
} else {
let ident = p.eat_ident().unwrap(); let ident = p.eat_ident().unwrap();
let text = ident.text.clone(); ident.text.clone()
}
};
let kind = if !transcriber && p.at_char(':') { let kind = if !transcriber && p.at_char(':') {
p.bump(); p.bump();
if let Some(ident) = p.eat_ident() { if let Some(ident) = p.eat_ident() {
@ -125,6 +144,8 @@ mod tests {
is_valid("($i:ident) => ()"); is_valid("($i:ident) => ()");
is_valid("($($i:ident)*) => ($_)"); is_valid("($($i:ident)*) => ($_)");
is_valid("($($true:ident)*) => ($true)");
is_valid("($($false:ident)*) => ($false)");
expect_err("$i:ident => ()", "subtree"); expect_err("$i:ident => ()", "subtree");
expect_err("($i:ident) ()", "`=`"); expect_err("($i:ident) ()", "`=`");