diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-02-04 12:40:24 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-02-04 12:40:24 +0000 |
commit | b86e87c8885895e5b3fcec021ee65003d64c4cbe (patch) | |
tree | 0495db2ec299fd7d617f84febffa5ea954f2d513 /src/parser/mod.rs | |
parent | aa36ad008eae28d1251a4bf276b1d13398fcf89f (diff) | |
parent | 852543212ba5c68b3428a80187087cc641de612c (diff) |
Merge #42
42: Extract parser input into a separate struct r=matklad a=matklad
bors r+
Diffstat (limited to 'src/parser/mod.rs')
-rw-r--r-- | src/parser/mod.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/parser/mod.rs b/src/parser/mod.rs index f17ffbf3a..49a69900f 100644 --- a/src/parser/mod.rs +++ b/src/parser/mod.rs | |||
@@ -4,6 +4,7 @@ use syntax_kinds::*; | |||
4 | 4 | ||
5 | #[macro_use] | 5 | #[macro_use] |
6 | mod parser; | 6 | mod parser; |
7 | mod input; | ||
7 | mod event; | 8 | mod event; |
8 | mod grammar; | 9 | mod grammar; |
9 | use self::event::Event; | 10 | use self::event::Event; |
@@ -11,7 +12,8 @@ use self::event::Event; | |||
11 | /// Parse a sequence of tokens into the representative node tree | 12 | /// Parse a sequence of tokens into the representative node tree |
12 | pub fn parse(text: String, tokens: &[Token]) -> File { | 13 | pub fn parse(text: String, tokens: &[Token]) -> File { |
13 | let events = { | 14 | let events = { |
14 | let mut parser = parser::Parser::new(&text, tokens); | 15 | let input = input::ParserInput::new(&text, tokens); |
16 | let mut parser = parser::Parser::new(&input); | ||
15 | grammar::file(&mut parser); | 17 | grammar::file(&mut parser); |
16 | parser.into_events() | 18 | parser.into_events() |
17 | }; | 19 | }; |