From b4f1dd263e65fe0dabbffcb0e6156ca1fcdc62f4 Mon Sep 17 00:00:00 2001 From: Stefan Ellmauthaler Date: Wed, 23 Jun 2021 17:13:28 +0200 Subject: [PATCH] fixed borrowing issues Signed-off-by: Stefan Ellmauthaler --- src/adf.rs | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/adf.rs b/src/adf.rs index dd8be06..6d9e9b7 100644 --- a/src/adf.rs +++ b/src/adf.rs @@ -58,13 +58,16 @@ impl Adf { self.stmts.len() } - pub fn add_ac(&mut self, statement: &str, ac: &str) { - if let Some(stmt) = self.dict.get(statement) { - let stm = *stmt; - let ac_nmbr = self.parseformula(ac); - self.set_ac(stm, ac_nmbr) - } - } + pub fn add_ac(&mut self, statement: &str, ac: &str) { + if let Some(stmt) = self.dict.get(statement) { + self.add_ac_by_number(*stmt, ac) + } + } + + fn add_ac_by_number(&mut self, st:usize, ac: &str){ + let ac_num = self.parseformula(ac); + self.set_ac(st, ac_num); + } fn set_ac(&mut self, st: usize, ac: usize) { self.stmts[st].ac = Some(ac);