From d94124e3b4a4380ad23c1a317fd3943664b7182a Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Sun, 4 Feb 2018 13:53:47 +0300
Subject: Somewhat more san directory structure

---
 src/parser/mod.rs | 89 ++++++++-----------------------------------------------
 1 file changed, 12 insertions(+), 77 deletions(-)

(limited to 'src/parser/mod.rs')

diff --git a/src/parser/mod.rs b/src/parser/mod.rs
index c5525ff9c..22ccb4921 100644
--- a/src/parser/mod.rs
+++ b/src/parser/mod.rs
@@ -1,88 +1,23 @@
-use {File, FileBuilder, Sink, SyntaxKind, Token};
+use {File, SyntaxKind, Token};
 
 use syntax_kinds::*;
 
-mod event_parser;
-use self::event_parser::Event;
+#[macro_use]
+mod parser;
+mod event;
+mod grammar;
+use self::event::Event;
 
 /// Parse a sequence of tokens into the representative node tree
 pub fn parse(text: String, tokens: &[Token]) -> File {
-    let events = event_parser::parse(&text, tokens);
-    from_events_to_file(text, tokens, events)
+    let events = parse_into_events(&text, tokens);
+    event::to_file(text, tokens, events)
 }
 
-fn from_events_to_file(text: String, tokens: &[Token], events: Vec<Event>) -> File {
-    let mut builder = FileBuilder::new(text);
-    let mut idx = 0;
-
-    let mut holes = Vec::new();
-    let mut forward_parents = Vec::new();
-
-    for (i, event) in events.iter().enumerate() {
-        if holes.last() == Some(&i) {
-            holes.pop();
-            continue;
-        }
-
-        match event {
-            &Event::Start {
-                kind: TOMBSTONE, ..
-            } => (),
-
-            &Event::Start { .. } => {
-                forward_parents.clear();
-                let mut idx = i;
-                loop {
-                    let (kind, fwd) = match events[idx] {
-                        Event::Start {
-                            kind,
-                            forward_parent,
-                        } => (kind, forward_parent),
-                        _ => unreachable!(),
-                    };
-                    forward_parents.push((idx, kind));
-                    if let Some(fwd) = fwd {
-                        idx += fwd as usize;
-                    } else {
-                        break;
-                    }
-                }
-                for &(idx, kind) in forward_parents.iter().into_iter().rev() {
-                    builder.start_internal(kind);
-                    holes.push(idx);
-                }
-                holes.pop();
-            }
-            &Event::Finish => {
-                while idx < tokens.len() {
-                    let token = tokens[idx];
-                    if is_insignificant(token.kind) {
-                        idx += 1;
-                        builder.leaf(token.kind, token.len);
-                    } else {
-                        break;
-                    }
-                }
-                builder.finish_internal()
-            }
-            &Event::Token {
-                kind: _,
-                mut n_raw_tokens,
-            } => loop {
-                let token = tokens[idx];
-                if !is_insignificant(token.kind) {
-                    n_raw_tokens -= 1;
-                }
-                idx += 1;
-                builder.leaf(token.kind, token.len);
-                if n_raw_tokens == 0 {
-                    break;
-                }
-            },
-            &Event::Error { ref message } => builder.error().message(message.clone()).emit(),
-        }
-    }
-    builder.finish()
+pub(crate) fn parse_into_events<'t>(text: &'t str, raw_tokens: &'t [Token]) -> Vec<Event> {
+    let mut parser = parser::Parser::new(text, raw_tokens);
+    grammar::file(&mut parser);
+    parser.into_events()
 }
 
 fn is_insignificant(kind: SyntaxKind) -> bool {
-- 
cgit v1.2.3


From c74eaf1fdfbe027379ab4a4df715a917bcbffef1 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Sun, 4 Feb 2018 13:56:51 +0300
Subject: Simplify

---
 src/parser/mod.rs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'src/parser/mod.rs')

diff --git a/src/parser/mod.rs b/src/parser/mod.rs
index 22ccb4921..f17ffbf3a 100644
--- a/src/parser/mod.rs
+++ b/src/parser/mod.rs
@@ -10,16 +10,14 @@ use self::event::Event;
 
 /// Parse a sequence of tokens into the representative node tree
 pub fn parse(text: String, tokens: &[Token]) -> File {
-    let events = parse_into_events(&text, tokens);
+    let events = {
+        let mut parser = parser::Parser::new(&text, tokens);
+        grammar::file(&mut parser);
+        parser.into_events()
+    };
     event::to_file(text, tokens, events)
 }
 
-pub(crate) fn parse_into_events<'t>(text: &'t str, raw_tokens: &'t [Token]) -> Vec<Event> {
-    let mut parser = parser::Parser::new(text, raw_tokens);
-    grammar::file(&mut parser);
-    parser.into_events()
-}
-
 fn is_insignificant(kind: SyntaxKind) -> bool {
     match kind {
         WHITESPACE | COMMENT => true,
-- 
cgit v1.2.3