rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixed parsing of negative number literals in macros.

Browse Source
This commit is contained in:
Tim
2020-10-06 22:10:55 +02:00
parent bf1043cac2
commit 8cf9362984
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
crates/mbe/src/subtree_source.rs
View File

@@ -2,7 +2,7 @@
use parser::{Token, TokenSource}; use parser::{Token, TokenSource};
use std::cell::{Cell, Ref, RefCell}; use std::cell::{Cell, Ref, RefCell};
use syntax::{lex_single_syntax_kind, SmolStr, SyntaxKind, SyntaxKind::*, T}; use syntax::{tokenize, SmolStr, SyntaxKind, SyntaxKind::*, T};
use tt::buffer::{Cursor, TokenBuffer}; use tt::buffer::{Cursor, TokenBuffer};
#[derive(Debug, Clone, Eq, PartialEq)] #[derive(Debug, Clone, Eq, PartialEq)]
@@ -155,9 +155,16 @@ fn convert_delim(d: Option<tt::DelimiterKind>, closing: bool) -> TtToken {
} }
fn convert_literal(l: &tt::Literal) -> TtToken { fn convert_literal(l: &tt::Literal) -> TtToken {
let kind = lex_single_syntax_kind(&l.text) let mut kinds = tokenize(&l.text).0.into_iter().map(|token| token.kind);
.map(|(kind, _error)| kind)
.filter(|kind| kind.is_literal()) let kind = match kinds.next() {
Some(kind) if kind.is_literal() => Some(kind),
Some(SyntaxKind::MINUS) => match kinds.next() {
Some(kind) if kind.is_literal() => Some(kind),
_ => None,
},
_ => None,
}
.unwrap_or_else(|| panic!("Fail to convert given literal {:#?}", &l)); .unwrap_or_else(|| panic!("Fail to convert given literal {:#?}", &l));
TtToken { kind, is_joint_to_next: false, text: l.text.clone() } TtToken { kind, is_joint_to_next: false, text: l.text.clone() }