From 09ef53930c3c302b2842e12067a1bd96b3fc10b8 Mon Sep 17 00:00:00 2001
From: Phodal Huang <h@phodal.com>
Date: Sun, 30 Aug 2020 17:46:51 +0800
Subject: [PATCH] refactor: inline grammar:grammar

---
 scie-grammar/src/grammar/grammar/mod.rs           | 9 ++++-----
 scie-grammar/src/grammar/grammar/stack_element.rs | 3 +--
 scie-grammar/src/grammar/mod.rs                   | 5 +++++
 scie-grammar/src/rule/rule_convert.rs             | 2 +-
 scie-grammar/src/rule/rule_factory.rs             | 2 +-
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/scie-grammar/src/grammar/grammar/mod.rs b/scie-grammar/src/grammar/grammar/mod.rs
index 3aa6eed..e660f20 100644
--- a/scie-grammar/src/grammar/grammar/mod.rs
+++ b/scie-grammar/src/grammar/grammar/mod.rs
@@ -2,12 +2,11 @@ use std::collections::BTreeMap as Map;
 
 use onig::*;
 
-use crate::grammar::grammar::stack_element::StackElement;
+use crate::grammar::line_tokens::{LineTokens, TokenTypeMatcher};
+use crate::grammar::{ScopeListElement, StackElement};
 use crate::inter::{IRawGrammar, IRawRepository, IRawRepositoryMap, IRawRule};
-use crate::rule::{IGrammarRegistry, IRuleFactoryHelper, IRuleRegistry, EmptyRule, AbstractRule};
+use crate::rule::{AbstractRule, EmptyRule, IGrammarRegistry, IRuleFactoryHelper, IRuleRegistry};
 use crate::rule::rule_factory::RuleFactory;
-use crate::grammar::line_tokens::{LineTokens, TokenTypeMatcher};
-use crate::grammar::grammar::scope_list_element::ScopeListElement;
 
 pub mod scope_list_element;
 pub mod scope_metadata;
@@ -251,7 +250,7 @@ mod tests {
     use std::io::{Read, Write};
     use std::path::Path;
 
-    use crate::grammar::grammar::Grammar;
+    use crate::grammar::Grammar;
     use crate::inter::IRawGrammar;
 
     #[test]
diff --git a/scie-grammar/src/grammar/grammar/stack_element.rs b/scie-grammar/src/grammar/grammar/stack_element.rs
index 29ff2a9..96c97e8 100644
--- a/scie-grammar/src/grammar/grammar/stack_element.rs
+++ b/scie-grammar/src/grammar/grammar/stack_element.rs
@@ -1,6 +1,5 @@
-use crate::grammar::grammar::scope_list_element::ScopeListElement;
 use core::ptr;
-use crate::grammar::grammar::Grammar;
+use crate::grammar::{Grammar, ScopeListElement};
 use crate::grammar::grammar_registry::GrammarRegistry;
 use crate::rule::{IRuleRegistry, AbstractRule};
 
diff --git a/scie-grammar/src/grammar/mod.rs b/scie-grammar/src/grammar/mod.rs
index 5bd58b3..4d5af06 100644
--- a/scie-grammar/src/grammar/mod.rs
+++ b/scie-grammar/src/grammar/mod.rs
@@ -2,3 +2,8 @@ pub mod grammar;
 pub mod grammar_reader;
 pub mod line_tokens;
 pub mod grammar_registry;
+
+pub use self::grammar::Grammar;
+pub use self::grammar::stack_element::StackElement;
+pub use self::grammar::scope_list_element::ScopeListElement;
+pub use self::grammar::scope_metadata::ScopeMetadata;
diff --git a/scie-grammar/src/rule/rule_convert.rs b/scie-grammar/src/rule/rule_convert.rs
index ca0b1b5..57f074e 100644
--- a/scie-grammar/src/rule/rule_convert.rs
+++ b/scie-grammar/src/rule/rule_convert.rs
@@ -50,7 +50,7 @@ fn abstract_rule_to_json(map: Map<i32, Box<dyn AbstractRule>>) {
 
 #[cfg(test)]
 mod tests {
-    use crate::grammar::grammar::Grammar;
+    use crate::grammar::Grammar;
     use std::path::Path;
     use std::fs::File;
     use crate::inter::IRawGrammar;
diff --git a/scie-grammar/src/rule/rule_factory.rs b/scie-grammar/src/rule/rule_factory.rs
index 225ccce..68943a4 100644
--- a/scie-grammar/src/rule/rule_factory.rs
+++ b/scie-grammar/src/rule/rule_factory.rs
@@ -1,4 +1,4 @@
-use crate::grammar::grammar::Grammar;
+use crate::grammar::Grammar;
 use crate::inter::{IRawCaptures, IRawRepository, IRawRule, ILocation};
 use crate::rule::{BeginEndRule, BeginWhileRule, CaptureRule, IRuleRegistry, IncludeOnlyRule, MatchRule, AbstractRule, Rule};
 
-- 
GitLab