Fix for issue #61

jsinger67 · Mar 7, 2023 · 22b2a44 · 22b2a44
1 parent ef21ec5
commit 22b2a44
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 64 deletions.
diff --git a/crates/parol-ls/Cargo.toml b/crates/parol-ls/Cargo.toml
@@ -34,3 +34,17 @@ thiserror = { workspace = true }
 
 [build-dependencies]
 parol = { path = "../parol", version = "0.19.0" }
+
+[features]
+max_level_off   = ["log/max_level_off"]
+max_level_error = ["log/max_level_error"]
+max_level_warn  = ["log/max_level_warn"]
+max_level_info  = ["log/max_level_info"]
+max_level_debug = ["log/max_level_debug"]
+max_level_trace = ["log/max_level_trace"]
+release_max_level_off   = ["log/release_max_level_off"]
+release_max_level_error = ["log/release_max_level_error"]
+release_max_level_warn  = ["log/release_max_level_warn"]
+release_max_level_info  = ["log/release_max_level_info"]
+release_max_level_debug = ["log/release_max_level_debug"]
+release_max_level_trace = ["log/release_max_level_trace"]
diff --git a/crates/parol-ls/src/parol_ls_grammar_trait.rs b/crates/parol-ls/src/parol_ls_grammar_trait.rs
@@ -1171,15 +1171,11 @@ impl<'t, 'u> ParolLsGrammarAuto<'t, 'u> {
 
     #[allow(dead_code)]
     fn pop(&mut self, context: &str) -> Option<ASTType> {
-        if !self.item_stack.is_empty() {
-            let item = self.item_stack.pop();
-            if let Some(ref item) = item {
-                trace!("pop     {}: {:?}", context, item);
-            }
-            item
-        } else {
-            None
+        let item = self.item_stack.pop();
+        if let Some(ref item) = item {
+            trace!("pop     {}: {:?}", context, item);
         }
+        item
     }
 
     #[allow(dead_code)]

diff --git a/crates/parol/src/generators/template_data.rs b/crates/parol/src/generators/template_data.rs
@@ -312,15 +312,11 @@ impl std::fmt::Display for UserTraitData<'_> {
                     #blank_line
                     #[allow(dead_code)]
                     fn pop(&mut self, context: &str) -> Option<ASTType #lifetime> {
-                        if !self.item_stack.is_empty() {
-                            let item = self.item_stack.pop();
-                            if let Some(ref item) = item {
-                                trace!("pop     {}: {:?}", context, item);
-                            }
-                            item
-                        } else {
-                            None
+                        let item = self.item_stack.pop();
+                        if let Some(ref item) = item {
+                            trace!("pop     {}: {:?}", context, item);
                         }
+                        item
                     }
                     #blank_line
                     #[allow(dead_code)]

diff --git a/examples/basic_interpreter/src/basic_grammar_trait.rs b/examples/basic_interpreter/src/basic_grammar_trait.rs
@@ -1171,15 +1171,11 @@ impl<'t, 'u> BasicGrammarAuto<'t, 'u> {
 
     #[allow(dead_code)]
     fn pop(&mut self, context: &str) -> Option<ASTType<'t>> {
-        if !self.item_stack.is_empty() {
-            let item = self.item_stack.pop();
-            if let Some(ref item) = item {
-                trace!("pop     {}: {:?}", context, item);
-            }
-            item
-        } else {
-            None
+        let item = self.item_stack.pop();
+        if let Some(ref item) = item {
+            trace!("pop     {}: {:?}", context, item);
         }
+        item
     }
 
     #[allow(dead_code)]

diff --git a/examples/calc_auto/calc_grammar_trait.rs b/examples/calc_auto/calc_grammar_trait.rs
@@ -843,15 +843,11 @@ impl<'t, 'u> CalcGrammarAuto<'t, 'u> {
 
     #[allow(dead_code)]
     fn pop(&mut self, context: &str) -> Option<ASTType<'t>> {
-        if !self.item_stack.is_empty() {
-            let item = self.item_stack.pop();
-            if let Some(ref item) = item {
-                trace!("pop     {}: {:?}", context, item);
-            }
-            item
-        } else {
-            None
+        let item = self.item_stack.pop();
+        if let Some(ref item) = item {
+            trace!("pop     {}: {:?}", context, item);
         }
+        item
     }
 
     #[allow(dead_code)]

diff --git a/examples/json_parser_auto/src/json_grammar_trait.rs b/examples/json_parser_auto/src/json_grammar_trait.rs
@@ -363,15 +363,11 @@ impl<'t, 'u> JsonGrammarAuto<'t, 'u> {
 
     #[allow(dead_code)]
     fn pop(&mut self, context: &str) -> Option<ASTType<'t>> {
-        if !self.item_stack.is_empty() {
-            let item = self.item_stack.pop();
-            if let Some(ref item) = item {
-                trace!("pop     {}: {:?}", context, item);
-            }
-            item
-        } else {
-            None
+        let item = self.item_stack.pop();
+        if let Some(ref item) = item {
+            trace!("pop     {}: {:?}", context, item);
         }
+        item
     }
 
     #[allow(dead_code)]

diff --git a/examples/list_auto/list_grammar_trait.rs b/examples/list_auto/list_grammar_trait.rs
@@ -176,15 +176,11 @@ impl<'t, 'u> ListGrammarAuto<'t, 'u> {
 
     #[allow(dead_code)]
     fn pop(&mut self, context: &str) -> Option<ASTType> {
-        if !self.item_stack.is_empty() {
-            let item = self.item_stack.pop();
-            if let Some(ref item) = item {
-                trace!("pop     {}: {:?}", context, item);
-            }
-            item
-        } else {
-            None
+        let item = self.item_stack.pop();
+        if let Some(ref item) = item {
+            trace!("pop     {}: {:?}", context, item);
         }
+        item
     }
 
     #[allow(dead_code)]

diff --git a/examples/oberon2/src/oberon2_grammar_trait.rs b/examples/oberon2/src/oberon2_grammar_trait.rs
@@ -2620,15 +2620,11 @@ impl<'t, 'u> Oberon2GrammarAuto<'t, 'u> {
 
     #[allow(dead_code)]
     fn pop(&mut self, context: &str) -> Option<ASTType<'t>> {
-        if !self.item_stack.is_empty() {
-            let item = self.item_stack.pop();
-            if let Some(ref item) = item {
-                trace!("pop     {}: {:?}", context, item);
-            }
-            item
-        } else {
-            None
+        let item = self.item_stack.pop();
+        if let Some(ref item) = item {
+            trace!("pop     {}: {:?}", context, item);
         }
+        item
     }
 
     #[allow(dead_code)]

diff --git a/examples/toml/src/parol_toml_grammar_trait.rs b/examples/toml/src/parol_toml_grammar_trait.rs
@@ -2484,15 +2484,11 @@ impl<'t, 'u> ParolTomlGrammarAuto<'t, 'u> {
 
     #[allow(dead_code)]
     fn pop(&mut self, context: &str) -> Option<ASTType<'t>> {
-        if !self.item_stack.is_empty() {
-            let item = self.item_stack.pop();
-            if let Some(ref item) = item {
-                trace!("pop     {}: {:?}", context, item);
-            }
-            item
-        } else {
-            None
+        let item = self.item_stack.pop();
+        if let Some(ref item) = item {
+            trace!("pop     {}: {:?}", context, item);
         }
+        item
     }
 
     #[allow(dead_code)]