From c47f9e2d37d4797550638e2a7a4fd3538e9edae9 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Thu, 21 Feb 2019 13:37:32 +0300
Subject: fix compilation

---
 crates/ra_syntax/src/parsing.rs | 32 +++++---------------------------
 1 file changed, 5 insertions(+), 27 deletions(-)

(limited to 'crates/ra_syntax/src/parsing.rs')

diff --git a/crates/ra_syntax/src/parsing.rs b/crates/ra_syntax/src/parsing.rs
index 7e1b32035..0a11600e1 100644
--- a/crates/ra_syntax/src/parsing.rs
+++ b/crates/ra_syntax/src/parsing.rs
@@ -1,50 +1,28 @@
-#[macro_use]
-mod token_set;
 mod builder;
 mod lexer;
-mod event;
 mod input;
-mod parser;
-mod grammar;
 mod reparsing;
 
+use ra_parser::{parse, ParseError};
+
 use crate::{
     SyntaxKind, SyntaxError,
     parsing::{
         builder::TreeBuilder,
         input::ParserInput,
-        event::process,
-        parser::Parser,
     },
     syntax_node::GreenNode,
 };
 
 pub use self::lexer::{tokenize, Token};
 
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ParseError(pub String);
-
 pub(crate) use self::reparsing::incremental_reparse;
 
 pub(crate) fn parse_text(text: &str) -> (GreenNode, Vec<SyntaxError>) {
     let tokens = tokenize(&text);
-    let tree_sink = TreeBuilder::new(text, &tokens);
-    parse_with(tree_sink, text, &tokens, grammar::root)
-}
-
-fn parse_with<S: TreeSink>(
-    mut tree_sink: S,
-    text: &str,
-    tokens: &[Token],
-    f: fn(&mut Parser),
-) -> S::Tree {
-    let events = {
-        let input = ParserInput::new(text, &tokens);
-        let mut p = Parser::new(&input);
-        f(&mut p);
-        p.finish()
-    };
-    process(&mut tree_sink, events);
+    let token_source = ParserInput::new(text, &tokens);
+    let mut tree_sink = TreeBuilder::new(text, &tokens);
+    parse(&token_source, &mut tree_sink);
     tree_sink.finish()
 }
 
-- 
cgit v1.2.3