23 files changed, 77 insertions, 78 deletions

diff --git a/src/parser/grammar/attributes.rs b/src/grammar/attributes.rs
index c411d4d7f..c411d4d7f 100644
--- a/src/parser/grammar/attributes.rs
+++ b/src/grammar/attributes.rs
diff --git a/src/parser/grammar/expressions.rs b/src/grammar/expressions.rs
index 06f9105c6..06f9105c6 100644
--- a/src/parser/grammar/expressions.rs
+++ b/src/grammar/expressions.rs
diff --git a/src/parser/grammar/items/consts.rs b/src/grammar/items/consts.rs
index ca26a7814..ca26a7814 100644
--- a/src/parser/grammar/items/consts.rs
+++ b/src/grammar/items/consts.rs
diff --git a/src/parser/grammar/items/mod.rs b/src/grammar/items/mod.rs
index d5f75f13d..d5f75f13d 100644
--- a/src/parser/grammar/items/mod.rs
+++ b/src/grammar/items/mod.rs
diff --git a/src/parser/grammar/items/structs.rs b/src/grammar/items/structs.rs
index 7ced542a4..7ced542a4 100644
--- a/src/parser/grammar/items/structs.rs
+++ b/src/grammar/items/structs.rs
diff --git a/src/parser/grammar/items/traits.rs b/src/grammar/items/traits.rs
index bda13e565..bda13e565 100644
--- a/src/parser/grammar/items/traits.rs
+++ b/src/grammar/items/traits.rs
diff --git a/src/parser/grammar/items/use_item.rs b/src/grammar/items/use_item.rs
index a3f7f0da8..a3f7f0da8 100644
--- a/src/parser/grammar/items/use_item.rs
+++ b/src/grammar/items/use_item.rs
diff --git a/src/parser/grammar/mod.rs b/src/grammar/mod.rs
index d4f9b80cf..b558da477 100644
--- a/src/parser/grammar/mod.rs
+++ b/src/grammar/mod.rs
@@ -24,18 +24,15 @@
 mod attributes;
 mod expressions;
 mod items;
+mod params;
 mod paths;
 mod patterns;
-mod params;
-mod type_params;
 mod type_args;
+mod type_params;
 mod types;
 
 use {
-    parser::{
-        parser::{CompletedMarker, Parser},
-        token_set::TokenSet,
-    },
+    parser_api::{CompletedMarker, Parser, TokenSet},
     SyntaxKind::{self, *},
 };
 
diff --git a/src/parser/grammar/params.rs b/src/grammar/params.rs
index efa882394..be985c80f 100644
--- a/src/parser/grammar/params.rs
+++ b/src/grammar/params.rs
@@ -68,4 +68,3 @@ fn self_param(p: &mut Parser) {
         p.expect(COMMA);
     }
 }
-
diff --git a/src/parser/grammar/paths.rs b/src/grammar/paths.rs
index fe69db096..fe69db096 100644
--- a/src/parser/grammar/paths.rs
+++ b/src/grammar/paths.rs
diff --git a/src/parser/grammar/patterns.rs b/src/grammar/patterns.rs
index 7216807fd..7216807fd 100644
--- a/src/parser/grammar/patterns.rs
+++ b/src/grammar/patterns.rs
diff --git a/src/parser/grammar/type_args.rs b/src/grammar/type_args.rs
index 5b960f10b..5b960f10b 100644
--- a/src/parser/grammar/type_args.rs
+++ b/src/grammar/type_args.rs
diff --git a/src/parser/grammar/type_params.rs b/src/grammar/type_params.rs
index b31bf52b6..1227482ad 100644
--- a/src/parser/grammar/type_params.rs
+++ b/src/grammar/type_params.rs
@@ -83,7 +83,6 @@ pub(super) fn bounds_without_colon(p: &mut Parser) {
     }
 }
 
-
 pub(super) fn where_clause(p: &mut Parser) {
     if p.at(WHERE_KW) {
         let m = p.start();
diff --git a/src/parser/grammar/types.rs b/src/grammar/types.rs
index 565037cb0..565037cb0 100644
--- a/src/parser/grammar/types.rs
+++ b/src/grammar/types.rs
diff --git a/src/lib.rs b/src/lib.rs
index a72d9e3cb..8f25de9a4 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -27,7 +27,11 @@ extern crate unicode_xid;
 pub mod algo;
 pub mod ast;
 mod lexer;
-mod parser;
+#[macro_use]
+mod parser_api;
+mod grammar;
+mod parser_impl;
+
 mod syntax_kinds;
 /// Utilities for simple uses of the parser.
 pub mod utils;
@@ -43,5 +47,5 @@ pub use {
 
 pub fn parse(text: String) -> SyntaxNode {
     let tokens = tokenize(&text);
-    parser::parse::<yellow::GreenBuilder>(text, &tokens)
+    parser_impl::parse::<yellow::GreenBuilder>(text, &tokens)
 }
diff --git a/src/parser/mod.rs b/src/parser/mod.rs
deleted file mode 100644
index 8631baa2e..000000000
--- a/src/parser/mod.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-#[macro_use]
-mod token_set;
-mod event;
-mod grammar;
-mod input;
-mod parser;
-
-use {lexer::Token, parser::event::process};
-
-pub(crate) use self::event::Sink;
-
-/// Parse a sequence of tokens into the representative node tree
-pub(crate) fn parse<S: Sink>(text: String, tokens: &[Token]) -> S::Tree {
-    let events = {
-        let input = input::ParserInput::new(&text, tokens);
-        let parser_impl = parser::imp::ParserImpl::new(&input);
-        let mut parser = parser::Parser(parser_impl);
-        grammar::file(&mut parser);
-        parser.0.into_events()
-    };
-    let mut sink = S::new(text);
-    process(&mut sink, tokens, events);
-    sink.finish()
-}
diff --git a/src/parser/token_set.rs b/src/parser/token_set.rs
deleted file mode 100644
index a800f200d..000000000
--- a/src/parser/token_set.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-use SyntaxKind;
-
-pub(crate) struct TokenSet {
-    pub tokens: &'static [SyntaxKind],
-}
-
-impl TokenSet {
-    pub fn contains(&self, kind: SyntaxKind) -> bool {
-        self.tokens.contains(&kind)
-    }
-}
-
-#[macro_export]
-macro_rules! token_set {
-    ($($t:ident),*) => {
-        TokenSet {
-            tokens: &[$($t),*],
-        }
-    };
-
-    ($($t:ident),* ,) => {
-        token_set!($($t),*)
-    };
-}
diff --git a/src/parser/parser/mod.rs b/src/parser_api.rs
index 0930ff9e4..5a0da32c9 100644
--- a/src/parser/parser/mod.rs
+++ b/src/parser_api.rs
@@ -1,7 +1,30 @@
-use SyntaxKind::{self, ERROR};
+use {
+    parser_impl::ParserImpl,
+    SyntaxKind::{self, ERROR},
+};
 
-pub(super) mod imp;
-use self::imp::ParserImpl;
+pub(crate) struct TokenSet {
+    pub tokens: &'static [SyntaxKind],
+}
+
+impl TokenSet {
+    pub fn contains(&self, kind: SyntaxKind) -> bool {
+        self.tokens.contains(&kind)
+    }
+}
+
+#[macro_export]
+macro_rules! token_set {
+    ($($t:ident),*) => {
+        TokenSet {
+            tokens: &[$($t),*],
+        }
+    };
+
+    ($($t:ident),* ,) => {
+        token_set!($($t),*)
+    };
+}
 
 /// `Parser` struct provides the low-level API for
 /// navigating through the stream of tokens and
diff --git a/src/parser/event.rs b/src/parser_impl/event.rs
index 0086d32ea..eb5d0a4be 100644
--- a/src/parser/event.rs
+++ b/src/parser_impl/event.rs
@@ -9,22 +9,10 @@
 //! this stream to a real tree.
 use {
     lexer::Token,
+    parser_impl::Sink,
     SyntaxKind::{self, TOMBSTONE},
-    TextUnit,
 };
 
-pub(crate) trait Sink {
-    type Tree;
-
-    fn new(text: String) -> Self;
-
-    fn leaf(&mut self, kind: SyntaxKind, len: TextUnit);
-    fn start_internal(&mut self, kind: SyntaxKind);
-    fn finish_internal(&mut self);
-    fn error(&mut self, err: String);
-    fn finish(self) -> Self::Tree;
-}
-
 /// `Parser` produces a flat list of `Event`s.
 /// They are converted to a tree-structure in
 /// a separate pass, via `TreeBuilder`.
diff --git a/src/parser/input.rs b/src/parser_impl/input.rs
index db76364b2..db76364b2 100644
--- a/src/parser/input.rs
+++ b/src/parser_impl/input.rs
diff --git a/src/parser/parser/imp.rs b/src/parser_impl/mod.rs
index c653e3524..b58094be3 100644
--- a/src/parser/parser/imp.rs
+++ b/src/parser_impl/mod.rs
@@ -1,8 +1,45 @@
-use parser::event::Event;
-use parser::input::{InputPosition, ParserInput};
+mod event;
+mod input;
+
+use {
+    grammar,
+    lexer::Token,
+    parser_api::Parser,
+    parser_impl::{
+        event::{process, Event},
+        input::{InputPosition, ParserInput},
+    },
+    TextUnit,
+};
 
 use SyntaxKind::{self, EOF, TOMBSTONE};
 
+pub(crate) trait Sink {
+    type Tree;
+
+    fn new(text: String) -> Self;
+
+    fn leaf(&mut self, kind: SyntaxKind, len: TextUnit);
+    fn start_internal(&mut self, kind: SyntaxKind);
+    fn finish_internal(&mut self);
+    fn error(&mut self, err: String);
+    fn finish(self) -> Self::Tree;
+}
+
+/// Parse a sequence of tokens into the representative node tree
+pub(crate) fn parse<S: Sink>(text: String, tokens: &[Token]) -> S::Tree {
+    let events = {
+        let input = input::ParserInput::new(&text, tokens);
+        let parser_impl = ParserImpl::new(&input);
+        let mut parser_api = Parser(parser_impl);
+        grammar::file(&mut parser_api);
+        parser_api.0.into_events()
+    };
+    let mut sink = S::new(text);
+    process(&mut sink, tokens, events);
+    sink.finish()
+}
+
 /// Implementation details of `Parser`, extracted
 /// to a separate struct in order not to pollute
 /// the public API of the `Parser`.
diff --git a/src/yellow/builder.rs b/src/yellow/builder.rs
index 0f7ca45d7..b68ba789e 100644
--- a/src/yellow/builder.rs
+++ b/src/yellow/builder.rs
@@ -1,5 +1,5 @@
 use {
-    parser::Sink,
+    parser_impl::Sink,
     yellow::{GreenNode, GreenNodeBuilder, SyntaxError, SyntaxNode, SyntaxRoot},
     SyntaxKind, TextRange, TextUnit,
 };
diff --git a/tools/src/main.rs b/tools/src/main.rs
index 7c6c7a1aa..714158f55 100644
--- a/tools/src/main.rs
+++ b/tools/src/main.rs
@@ -18,7 +18,7 @@ use tools::{collect_tests, Test};
 
 type Result<T> = ::std::result::Result<T, failure::Error>;
 
-const GRAMMAR_DIR: &str = "./src/parser/grammar";
+const GRAMMAR_DIR: &str = "./src/grammar";
 const INLINE_TESTS_DIR: &str = "tests/data/parser/inline";
 const GRAMMAR: &str = "./src/grammar.ron";
 const SYNTAX_KINDS: &str = "./src/syntax_kinds/generated.rs";