aboutsummaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2019-05-14 06:41:23 +0100
committerbors[bot] <bors[bot]@users.noreply.github.com>2019-05-14 06:41:23 +0100
commitee0ab7c00b4b8c5375c14b44e3d7288ebf0d732d (patch)
tree42e6ed535a135f8c6487e8370443b802daed68a2 /crates
parentbebc5c71664a144b9addd357eb503f776f2cf416 (diff)
parent10ecb11ff569e37c588b35861065191ad607b0bb (diff)
Merge #1272
1272: Error out non single root token tree conversion r=matklad a=edwin0cheng This PR add a check to prevent non single root token tree conversion between token trees and syntax tree. It should prevent the assert produced in #1267. Co-authored-by: Edwin Cheng <[email protected]>
Diffstat (limited to 'crates')
-rw-r--r--crates/ra_mbe/src/syntax_bridge.rs46
1 files changed, 46 insertions, 0 deletions
diff --git a/crates/ra_mbe/src/syntax_bridge.rs b/crates/ra_mbe/src/syntax_bridge.rs
index 73a0780da..5e6a6f2a1 100644
--- a/crates/ra_mbe/src/syntax_bridge.rs
+++ b/crates/ra_mbe/src/syntax_bridge.rs
@@ -50,6 +50,10 @@ pub fn token_tree_to_expr(tt: &tt::Subtree) -> Result<TreeArc<ast::Expr>, Expand
50 let token_source = SubtreeTokenSource::new(tt); 50 let token_source = SubtreeTokenSource::new(tt);
51 let mut tree_sink = TtTreeSink::new(token_source.querier()); 51 let mut tree_sink = TtTreeSink::new(token_source.querier());
52 ra_parser::parse_expr(&token_source, &mut tree_sink); 52 ra_parser::parse_expr(&token_source, &mut tree_sink);
53 if tree_sink.roots.len() != 1 {
54 return Err(ExpandError::ConversionError);
55 }
56
53 let syntax = tree_sink.inner.finish(); 57 let syntax = tree_sink.inner.finish();
54 ast::Expr::cast(&syntax) 58 ast::Expr::cast(&syntax)
55 .map(|m| m.to_owned()) 59 .map(|m| m.to_owned())
@@ -61,6 +65,10 @@ pub fn token_tree_to_pat(tt: &tt::Subtree) -> Result<TreeArc<ast::Pat>, ExpandEr
61 let token_source = SubtreeTokenSource::new(tt); 65 let token_source = SubtreeTokenSource::new(tt);
62 let mut tree_sink = TtTreeSink::new(token_source.querier()); 66 let mut tree_sink = TtTreeSink::new(token_source.querier());
63 ra_parser::parse_pat(&token_source, &mut tree_sink); 67 ra_parser::parse_pat(&token_source, &mut tree_sink);
68 if tree_sink.roots.len() != 1 {
69 return Err(ExpandError::ConversionError);
70 }
71
64 let syntax = tree_sink.inner.finish(); 72 let syntax = tree_sink.inner.finish();
65 ast::Pat::cast(&syntax).map(|m| m.to_owned()).ok_or_else(|| ExpandError::ConversionError) 73 ast::Pat::cast(&syntax).map(|m| m.to_owned()).ok_or_else(|| ExpandError::ConversionError)
66} 74}
@@ -70,6 +78,9 @@ pub fn token_tree_to_ty(tt: &tt::Subtree) -> Result<TreeArc<ast::TypeRef>, Expan
70 let token_source = SubtreeTokenSource::new(tt); 78 let token_source = SubtreeTokenSource::new(tt);
71 let mut tree_sink = TtTreeSink::new(token_source.querier()); 79 let mut tree_sink = TtTreeSink::new(token_source.querier());
72 ra_parser::parse_ty(&token_source, &mut tree_sink); 80 ra_parser::parse_ty(&token_source, &mut tree_sink);
81 if tree_sink.roots.len() != 1 {
82 return Err(ExpandError::ConversionError);
83 }
73 let syntax = tree_sink.inner.finish(); 84 let syntax = tree_sink.inner.finish();
74 ast::TypeRef::cast(&syntax).map(|m| m.to_owned()).ok_or_else(|| ExpandError::ConversionError) 85 ast::TypeRef::cast(&syntax).map(|m| m.to_owned()).ok_or_else(|| ExpandError::ConversionError)
75} 86}
@@ -81,6 +92,9 @@ pub fn token_tree_to_macro_stmts(
81 let token_source = SubtreeTokenSource::new(tt); 92 let token_source = SubtreeTokenSource::new(tt);
82 let mut tree_sink = TtTreeSink::new(token_source.querier()); 93 let mut tree_sink = TtTreeSink::new(token_source.querier());
83 ra_parser::parse_macro_stmts(&token_source, &mut tree_sink); 94 ra_parser::parse_macro_stmts(&token_source, &mut tree_sink);
95 if tree_sink.roots.len() != 1 {
96 return Err(ExpandError::ConversionError);
97 }
84 let syntax = tree_sink.inner.finish(); 98 let syntax = tree_sink.inner.finish();
85 ast::MacroStmts::cast(&syntax).map(|m| m.to_owned()).ok_or_else(|| ExpandError::ConversionError) 99 ast::MacroStmts::cast(&syntax).map(|m| m.to_owned()).ok_or_else(|| ExpandError::ConversionError)
86} 100}
@@ -92,6 +106,9 @@ pub fn token_tree_to_macro_items(
92 let token_source = SubtreeTokenSource::new(tt); 106 let token_source = SubtreeTokenSource::new(tt);
93 let mut tree_sink = TtTreeSink::new(token_source.querier()); 107 let mut tree_sink = TtTreeSink::new(token_source.querier());
94 ra_parser::parse_macro_items(&token_source, &mut tree_sink); 108 ra_parser::parse_macro_items(&token_source, &mut tree_sink);
109 if tree_sink.roots.len() != 1 {
110 return Err(ExpandError::ConversionError);
111 }
95 let syntax = tree_sink.inner.finish(); 112 let syntax = tree_sink.inner.finish();
96 ast::MacroItems::cast(&syntax).map(|m| m.to_owned()).ok_or_else(|| ExpandError::ConversionError) 113 ast::MacroItems::cast(&syntax).map(|m| m.to_owned()).ok_or_else(|| ExpandError::ConversionError)
97} 114}
@@ -268,6 +285,10 @@ struct TtTreeSink<'a, Q: Querier> {
268 text_pos: TextUnit, 285 text_pos: TextUnit,
269 token_pos: usize, 286 token_pos: usize,
270 inner: SyntaxTreeBuilder, 287 inner: SyntaxTreeBuilder,
288
289 // Number of roots
290 // Use for detect ill-form tree which is not single root
291 roots: smallvec::SmallVec<[usize; 1]>,
271} 292}
272 293
273impl<'a, Q: Querier> TtTreeSink<'a, Q> { 294impl<'a, Q: Querier> TtTreeSink<'a, Q> {
@@ -278,6 +299,7 @@ impl<'a, Q: Querier> TtTreeSink<'a, Q> {
278 text_pos: 0.into(), 299 text_pos: 0.into(),
279 token_pos: 0, 300 token_pos: 0,
280 inner: SyntaxTreeBuilder::default(), 301 inner: SyntaxTreeBuilder::default(),
302 roots: smallvec::SmallVec::new(),
281 } 303 }
282 } 304 }
283} 305}
@@ -323,10 +345,16 @@ impl<'a, Q: Querier> TreeSink for TtTreeSink<'a, Q> {
323 345
324 fn start_node(&mut self, kind: SyntaxKind) { 346 fn start_node(&mut self, kind: SyntaxKind) {
325 self.inner.start_node(kind); 347 self.inner.start_node(kind);
348
349 match self.roots.last_mut() {
350 None | Some(0) => self.roots.push(1),
351 Some(ref mut n) => **n += 1,
352 };
326 } 353 }
327 354
328 fn finish_node(&mut self) { 355 fn finish_node(&mut self) {
329 self.inner.finish_node(); 356 self.inner.finish_node();
357 *self.roots.last_mut().unwrap() -= 1;
330 } 358 }
331 359
332 fn error(&mut self, error: ParseError) { 360 fn error(&mut self, error: ParseError) {
@@ -375,4 +403,22 @@ mod tests {
375 assert_eq!(query.token(2 + 15 + 3).1, "\"rust1\""); 403 assert_eq!(query.token(2 + 15 + 3).1, "\"rust1\"");
376 assert_eq!(query.token(2 + 15 + 3).0, STRING); 404 assert_eq!(query.token(2 + 15 + 3).0, STRING);
377 } 405 }
406
407 #[test]
408 fn stmts_token_trees_to_expr_is_err() {
409 let rules = create_rules(
410 r#"
411 macro_rules! stmts {
412 () => {
413 let a = 0;
414 let b = 0;
415 let c = 0;
416 let d = 0;
417 }
418 }
419 "#,
420 );
421 let expansion = expand(&rules, "stmts!()");
422 assert!(token_tree_to_expr(&expansion).is_err());
423 }
378} 424}