From 36e60e0a7ab1578dce06731e93e7ff2e26400059 Mon Sep 17 00:00:00 2001
From: Phodal Huang <h@phodal.com>
Date: Mon, 24 Aug 2020 21:11:54 +0800
Subject: [PATCH] refactor: rename rules

---
 scie-grammar/src/grammar/grammar/mod.rs |  3 ++-
 scie-grammar/src/rule.rs                | 16 ++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/scie-grammar/src/grammar/grammar/mod.rs b/scie-grammar/src/grammar/grammar/mod.rs
index 90bace7..d26ac55 100644
--- a/scie-grammar/src/grammar/grammar/mod.rs
+++ b/scie-grammar/src/grammar/grammar/mod.rs
@@ -120,6 +120,7 @@ impl Grammar {
         if let None = prev_state {
             is_first_line = true
         } else {
+
         }
 
         let lineText = format!("{:?}\n", line_text);
@@ -209,7 +210,7 @@ mod tests {
 
     #[test]
     fn should_enable_run_grammar() {
-        let path = Path::new("test-cases/first-mate/fixtures/java.json");
+        let path = Path::new("test-cases/first-mate/fixtures/c.json");
         let mut file = File::open(path).unwrap();
         let mut data = String::new();
         file.read_to_string(&mut data).unwrap();
diff --git a/scie-grammar/src/rule.rs b/scie-grammar/src/rule.rs
index 8b4d6c4..9e08bd2 100644
--- a/scie-grammar/src/rule.rs
+++ b/scie-grammar/src/rule.rs
@@ -85,7 +85,7 @@ impl RuleFactory {
                     helper,
                     repository.clone(),
                 );
-                let rule = MatchRule::new(
+                let match_rule = MatchRule::new(
                     desc.location.clone(),
                     id.clone(),
                     desc.name.clone(),
@@ -93,7 +93,7 @@ impl RuleFactory {
                     rule_factory,
                 );
 
-                helper.register_rule(Box::new(rule));
+                helper.register_rule(Box::new(match_rule));
                 return desc.id.unwrap();
             };
 
@@ -115,14 +115,14 @@ impl RuleFactory {
                     Box::new(helper),
                     repository.clone(),
                 );
-                let rule = IncludeOnlyRule::new(
+                let include_only_rule = IncludeOnlyRule::new(
                     desc.location.clone(),
                     desc.id.unwrap().clone(),
                     desc.name.clone(),
                     desc.content_name.clone(),
                     rule_factory,
                 );
-                helper.register_rule(Box::new(rule));
+                helper.register_rule(Box::new(include_only_rule));
                 return desc.id.unwrap();
             }
 
@@ -137,7 +137,7 @@ impl RuleFactory {
                     repository.clone(),
                 );
 
-                let rule = BeginWhileRule::new(
+                let begin_while_rule = BeginWhileRule::new(
                     desc.location.clone(),
                     desc.id.unwrap(),
                     desc.name.clone(),
@@ -149,7 +149,7 @@ impl RuleFactory {
                     pattern_factory,
                 );
 
-                helper.register_rule(Box::new(rule));
+                helper.register_rule(Box::new(begin_while_rule));
                 return desc.id.unwrap();
             }
 
@@ -163,7 +163,7 @@ impl RuleFactory {
                 repository.clone(),
             );
 
-            let rule = BeginEndRule::new(
+            let begin_end_rule = BeginEndRule::new(
                 desc.location.clone(),
                 desc.id.unwrap(),
                 desc.name.clone(),
@@ -176,7 +176,7 @@ impl RuleFactory {
                 pattern_factory,
             );
 
-            helper.register_rule(Box::new(rule));
+            helper.register_rule(Box::new(begin_end_rule));
             return desc.id.unwrap();
         }
 
-- 
GitLab