diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-02-24 10:15:43 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-02-24 10:15:43 +0000 |
commit | f6f160391db945a0dcc2f73b38926d6919f7c566 (patch) | |
tree | 060450b70c09357615f261d8acd032a647615dd7 /crates/ra_syntax/src/parsing.rs | |
parent | c5e74cebdcbade069c0e1e81e298ab7d729e4cd5 (diff) | |
parent | 81bca78349afb9e15994f46401da0cfabfba04a1 (diff) |
Merge #885
885: Parse token trees directy r=matklad a=matklad
This takes advantage of the recent macro refactoring to directly parse token stream into a syntax tree.
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_syntax/src/parsing.rs')
-rw-r--r-- | crates/ra_syntax/src/parsing.rs | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/crates/ra_syntax/src/parsing.rs b/crates/ra_syntax/src/parsing.rs index cf573801c..ad5668a65 100644 --- a/crates/ra_syntax/src/parsing.rs +++ b/crates/ra_syntax/src/parsing.rs | |||
@@ -2,17 +2,13 @@ | |||
2 | //! incremental reparsing. | 2 | //! incremental reparsing. |
3 | 3 | ||
4 | mod lexer; | 4 | mod lexer; |
5 | mod input; | 5 | mod text_token_source; |
6 | mod builder; | 6 | mod text_tree_sink; |
7 | mod reparsing; | 7 | mod reparsing; |
8 | 8 | ||
9 | use crate::{ | 9 | use crate::{ |
10 | SyntaxError, | 10 | SyntaxError, |
11 | syntax_node::GreenNode, | 11 | syntax_node::GreenNode, |
12 | parsing::{ | ||
13 | builder::TreeBuilder, | ||
14 | input::ParserInput, | ||
15 | }, | ||
16 | }; | 12 | }; |
17 | 13 | ||
18 | pub use self::lexer::{tokenize, Token}; | 14 | pub use self::lexer::{tokenize, Token}; |
@@ -21,8 +17,8 @@ pub(crate) use self::reparsing::incremental_reparse; | |||
21 | 17 | ||
22 | pub(crate) fn parse_text(text: &str) -> (GreenNode, Vec<SyntaxError>) { | 18 | pub(crate) fn parse_text(text: &str) -> (GreenNode, Vec<SyntaxError>) { |
23 | let tokens = tokenize(&text); | 19 | let tokens = tokenize(&text); |
24 | let token_source = ParserInput::new(text, &tokens); | 20 | let token_source = text_token_source::TextTokenSource::new(text, &tokens); |
25 | let mut tree_sink = TreeBuilder::new(text, &tokens); | 21 | let mut tree_sink = text_tree_sink::TextTreeSink::new(text, &tokens); |
26 | ra_parser::parse(&token_source, &mut tree_sink); | 22 | ra_parser::parse(&token_source, &mut tree_sink); |
27 | tree_sink.finish() | 23 | tree_sink.finish() |
28 | } | 24 | } |