diff --git a/scie-grammar/src/grammar/scope_list_element.rs b/scie-grammar/src/grammar/scope_list_element.rs index b947ed4e5aed31c37b0c252d01f4bdd4706db6d5..67606c2e937b2c8853b2e218f7797df6da508920 100644 --- a/scie-grammar/src/grammar/scope_list_element.rs +++ b/scie-grammar/src/grammar/scope_list_element.rs @@ -4,20 +4,14 @@ use crate::grammar::Grammar; pub struct ScopeListElement { pub parent: Option>, pub scope: String, - // todo: remove stringify - pub stringify: String, - // pub metadata: i32, } impl ScopeListElement { pub fn new(parent: Option>, scope: String) -> Self { - let mut list_element = ScopeListElement { + ScopeListElement { parent, scope, - stringify: String::from(""), - }; - list_element.stringify = list_element.clone().stringify(); - list_element + } } pub fn stringify(self) -> String { @@ -75,7 +69,6 @@ impl Default for ScopeListElement { ScopeListElement { parent: None, scope: "".to_string(), - stringify: "".to_string(), } } } diff --git a/scie-grammar/src/grammar/stack_element.rs b/scie-grammar/src/grammar/stack_element.rs index 98247a83c701e4251c871bf1f98ea9ab863ed024..93253401f98534676c167414f87f1f39dd1b674d 100644 --- a/scie-grammar/src/grammar/stack_element.rs +++ b/scie-grammar/src/grammar/stack_element.rs @@ -13,8 +13,6 @@ pub struct StackElement { pub end_rule: Option, pub name_scopes_list: ScopeListElement, pub content_name_scopes_list: ScopeListElement, - // todo: remove stringify - pub stringify: String, } impl StackElement { @@ -29,7 +27,6 @@ impl StackElement { end_rule: None, name_scopes_list: Default::default(), content_name_scopes_list: Default::default(), - stringify: "".to_string(), } } @@ -56,7 +53,8 @@ impl StackElement { if let Some(iparent) = parent.clone() { depth = iparent.depth + 1 } - let mut element = StackElement { + + StackElement { parent, depth, rule_id, @@ -66,11 +64,7 @@ impl StackElement { end_rule, name_scopes_list, content_name_scopes_list, - stringify: "".to_string(), - }; - - element.stringify = element.clone().stringify(); - element + } } pub fn stringify(self) -> String {