language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-27 12:29:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Revert "Fix conversion of float literals in TtTreeSink"

Browse source 
This reverts commit 43a066c5a8.
This commit is contained in:
Jonas Schievink 2022-05-13 15:05:17 +02:00
parent 4fcdb96789
commit bde036b74e
2 changed files with 0 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/hir-def/src/macro_expansion_tests/mbe/tt_conversion.rs
View file

@ -183,22 +183,18 @@ fn float_literal_in_tt() {
macro_rules! constant { macro_rules! constant {
($( $ret:expr; )*) => {}; ($( $ret:expr; )*) => {};
} }
macro_rules! float_const_impl { macro_rules! float_const_impl {
() => ( constant!(0.3; 3.3;); ); () => ( constant!(0.3; 3.3;); );
} }
float_const_impl! {} float_const_impl! {}
"#, "#,
expect![[r#" expect![[r#"
macro_rules! constant { macro_rules! constant {
($( $ret:expr; )*) => {}; ($( $ret:expr; )*) => {};
} }
macro_rules! float_const_impl { macro_rules! float_const_impl {
() => ( constant!(0.3; 3.3;); ); () => ( constant!(0.3; 3.3;); );
} }
constant!(0.3; constant!(0.3;
3.3; 3.3;
); );

50
crates/mbe/src/syntax_bridge.rs
View file

@ -740,7 +740,6 @@ struct TtTreeSink<'a> {
text_pos: TextSize, text_pos: TextSize,
inner: SyntaxTreeBuilder, inner: SyntaxTreeBuilder,
token_map: TokenMap, token_map: TokenMap,
remaining_float_lit_text: String,
} }
impl<'a> TtTreeSink<'a> { impl<'a> TtTreeSink<'a> {
@ -752,7 +751,6 @@ impl<'a> TtTreeSink<'a> {
text_pos: 0.into(), text_pos: 0.into(),
inner: SyntaxTreeBuilder::default(), inner: SyntaxTreeBuilder::default(),
token_map: TokenMap::default(), token_map: TokenMap::default(),
remaining_float_lit_text: String::new(),
} }
} }
@ -779,54 +777,6 @@ impl<'a> TtTreeSink<'a> {
n_tokens = 2; n_tokens = 2;
} }
// We need to split a float `tt::Literal` into up to 3 tokens consumed by the parser.
match self.cursor.token_tree() {
Some(tt::buffer::TokenTreeRef::Subtree(sub, _)) if sub.delimiter.is_none() => {
self.cursor = self.cursor.subtree().unwrap()
}
_ => {}
}
let literal = match self.cursor.token_tree() {
Some(tt::buffer::TokenTreeRef::Leaf(tt::Leaf::Literal(lit), _)) => Some(lit),
_ => None,
};
if matches!(
kind,
FLOAT_NUMBER_PART | FLOAT_NUMBER_START_0 | FLOAT_NUMBER_START_1 | FLOAT_NUMBER_START_2
) {
if self.remaining_float_lit_text.is_empty() {
always!(
literal.is_some(),
"kind={:?}, cursor tt={:?}",
kind,
self.cursor.token_tree()
);
let text = literal.map_or(String::new(), |lit| lit.to_string());
self.cursor = self.cursor.bump();
match text.split_once('.') {
Some((start, end)) => {
self.inner.token(kind, start);
self.remaining_float_lit_text = format!(".{end}");
return;
}
None => {
self.inner.token(kind, &text);
return;
}
}
} else {
self.inner.token(kind, &self.remaining_float_lit_text);
self.remaining_float_lit_text.clear();
return;
}
}
if kind == DOT && !self.remaining_float_lit_text.is_empty() {
always!(self.remaining_float_lit_text.chars().next() == Some('.'));
self.inner.token(kind, ".");
self.remaining_float_lit_text = self.remaining_float_lit_text[1..].to_string();
return;
}
let mut last = self.cursor; let mut last = self.cursor;
for _ in 0..n_tokens { for _ in 0..n_tokens {
let tmp: u8; let tmp: u8;