diff options
author | Edwin Cheng <[email protected]> | 2019-04-18 21:03:22 +0100 |
---|---|---|
committer | Edwin Cheng <[email protected]> | 2019-04-18 21:03:22 +0100 |
commit | a6d51e09610989821aaf79871bcab0661c9b0f74 (patch) | |
tree | 0647a51eb3c1cf28466c44884da21fc98bc51f19 /crates/ra_mbe/src/syntax_bridge.rs | |
parent | c0f19d70056fada5f381019694d893e0ffe8360a (diff) |
Return Result for token_tree_to_xx functions
Diffstat (limited to 'crates/ra_mbe/src/syntax_bridge.rs')
-rw-r--r-- | crates/ra_mbe/src/syntax_bridge.rs | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/crates/ra_mbe/src/syntax_bridge.rs b/crates/ra_mbe/src/syntax_bridge.rs index 6af3b1995..5844d3f12 100644 --- a/crates/ra_mbe/src/syntax_bridge.rs +++ b/crates/ra_mbe/src/syntax_bridge.rs | |||
@@ -5,6 +5,7 @@ use ra_syntax::{ | |||
5 | }; | 5 | }; |
6 | 6 | ||
7 | use crate::subtree_source::{SubtreeTokenSource, Querier}; | 7 | use crate::subtree_source::{SubtreeTokenSource, Querier}; |
8 | use crate::ExpandError; | ||
8 | 9 | ||
9 | /// Maps `tt::TokenId` to the relative range of the original token. | 10 | /// Maps `tt::TokenId` to the relative range of the original token. |
10 | #[derive(Default)] | 11 | #[derive(Default)] |
@@ -45,48 +46,54 @@ pub fn syntax_node_to_token_tree(node: &SyntaxNode) -> Option<(tt::Subtree, Toke | |||
45 | // | 46 | // |
46 | 47 | ||
47 | /// Parses the token tree (result of macro expansion) to an expression | 48 | /// Parses the token tree (result of macro expansion) to an expression |
48 | pub fn token_tree_to_expr(tt: &tt::Subtree) -> TreeArc<ast::Expr> { | 49 | pub fn token_tree_to_expr(tt: &tt::Subtree) -> Result<TreeArc<ast::Expr>, ExpandError> { |
49 | let token_source = SubtreeTokenSource::new(tt); | 50 | let token_source = SubtreeTokenSource::new(tt); |
50 | let mut tree_sink = TtTreeSink::new(token_source.querier()); | 51 | let mut tree_sink = TtTreeSink::new(token_source.querier()); |
51 | ra_parser::parse_expr(&token_source, &mut tree_sink); | 52 | ra_parser::parse_expr(&token_source, &mut tree_sink); |
52 | let syntax = tree_sink.inner.finish(); | 53 | let syntax = tree_sink.inner.finish(); |
53 | ast::Expr::cast(&syntax).unwrap().to_owned() | 54 | ast::Expr::cast(&syntax) |
55 | .map(|m| m.to_owned()) | ||
56 | .ok_or_else(|| crate::ExpandError::ConversionError) | ||
54 | } | 57 | } |
55 | 58 | ||
56 | /// Parses the token tree (result of macro expansion) to a Pattern | 59 | /// Parses the token tree (result of macro expansion) to a Pattern |
57 | pub fn token_tree_to_pat(tt: &tt::Subtree) -> TreeArc<ast::Pat> { | 60 | pub fn token_tree_to_pat(tt: &tt::Subtree) -> Result<TreeArc<ast::Pat>, ExpandError> { |
58 | let token_source = SubtreeTokenSource::new(tt); | 61 | let token_source = SubtreeTokenSource::new(tt); |
59 | let mut tree_sink = TtTreeSink::new(token_source.querier()); | 62 | let mut tree_sink = TtTreeSink::new(token_source.querier()); |
60 | ra_parser::parse_pat(&token_source, &mut tree_sink); | 63 | ra_parser::parse_pat(&token_source, &mut tree_sink); |
61 | let syntax = tree_sink.inner.finish(); | 64 | let syntax = tree_sink.inner.finish(); |
62 | ast::Pat::cast(&syntax).unwrap().to_owned() | 65 | ast::Pat::cast(&syntax).map(|m| m.to_owned()).ok_or_else(|| ExpandError::ConversionError) |
63 | } | 66 | } |
64 | 67 | ||
65 | /// Parses the token tree (result of macro expansion) to a Type | 68 | /// Parses the token tree (result of macro expansion) to a Type |
66 | pub fn token_tree_to_ty(tt: &tt::Subtree) -> TreeArc<ast::TypeRef> { | 69 | pub fn token_tree_to_ty(tt: &tt::Subtree) -> Result<TreeArc<ast::TypeRef>, ExpandError> { |
67 | let token_source = SubtreeTokenSource::new(tt); | 70 | let token_source = SubtreeTokenSource::new(tt); |
68 | let mut tree_sink = TtTreeSink::new(token_source.querier()); | 71 | let mut tree_sink = TtTreeSink::new(token_source.querier()); |
69 | ra_parser::parse_ty(&token_source, &mut tree_sink); | 72 | ra_parser::parse_ty(&token_source, &mut tree_sink); |
70 | let syntax = tree_sink.inner.finish(); | 73 | let syntax = tree_sink.inner.finish(); |
71 | ast::TypeRef::cast(&syntax).unwrap().to_owned() | 74 | ast::TypeRef::cast(&syntax).map(|m| m.to_owned()).ok_or_else(|| ExpandError::ConversionError) |
72 | } | 75 | } |
73 | 76 | ||
74 | /// Parses the token tree (result of macro expansion) as a sequence of stmts | 77 | /// Parses the token tree (result of macro expansion) as a sequence of stmts |
75 | pub fn token_tree_to_macro_stmts(tt: &tt::Subtree) -> TreeArc<ast::MacroStmts> { | 78 | pub fn token_tree_to_macro_stmts( |
79 | tt: &tt::Subtree, | ||
80 | ) -> Result<TreeArc<ast::MacroStmts>, ExpandError> { | ||
76 | let token_source = SubtreeTokenSource::new(tt); | 81 | let token_source = SubtreeTokenSource::new(tt); |
77 | let mut tree_sink = TtTreeSink::new(token_source.querier()); | 82 | let mut tree_sink = TtTreeSink::new(token_source.querier()); |
78 | ra_parser::parse_macro_stmts(&token_source, &mut tree_sink); | 83 | ra_parser::parse_macro_stmts(&token_source, &mut tree_sink); |
79 | let syntax = tree_sink.inner.finish(); | 84 | let syntax = tree_sink.inner.finish(); |
80 | ast::MacroStmts::cast(&syntax).unwrap().to_owned() | 85 | ast::MacroStmts::cast(&syntax).map(|m| m.to_owned()).ok_or_else(|| ExpandError::ConversionError) |
81 | } | 86 | } |
82 | 87 | ||
83 | /// Parses the token tree (result of macro expansion) as a sequence of items | 88 | /// Parses the token tree (result of macro expansion) as a sequence of items |
84 | pub fn token_tree_to_macro_items(tt: &tt::Subtree) -> TreeArc<ast::MacroItems> { | 89 | pub fn token_tree_to_macro_items( |
90 | tt: &tt::Subtree, | ||
91 | ) -> Result<TreeArc<ast::MacroItems>, ExpandError> { | ||
85 | let token_source = SubtreeTokenSource::new(tt); | 92 | let token_source = SubtreeTokenSource::new(tt); |
86 | let mut tree_sink = TtTreeSink::new(token_source.querier()); | 93 | let mut tree_sink = TtTreeSink::new(token_source.querier()); |
87 | ra_parser::parse_macro_items(&token_source, &mut tree_sink); | 94 | ra_parser::parse_macro_items(&token_source, &mut tree_sink); |
88 | let syntax = tree_sink.inner.finish(); | 95 | let syntax = tree_sink.inner.finish(); |
89 | ast::MacroItems::cast(&syntax).unwrap().to_owned() | 96 | ast::MacroItems::cast(&syntax).map(|m| m.to_owned()).ok_or_else(|| ExpandError::ConversionError) |
90 | } | 97 | } |
91 | 98 | ||
92 | /// Parses the token tree (result of macro expansion) as a sequence of items | 99 | /// Parses the token tree (result of macro expansion) as a sequence of items |