From 5b79af6e852a3e60d8dbf40bcb83dc5bd4e02bee Mon Sep 17 00:00:00 2001 From: Jeff Date: Thu, 14 Mar 2024 11:49:10 -0400 Subject: [PATCH] Rename and clean up --- src/abstract_tree/assignment.rs | 10 +++++----- src/abstract_tree/identifier.rs | 4 ++-- src/context.rs | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/abstract_tree/assignment.rs b/src/abstract_tree/assignment.rs index 5dc0ac4..c691950 100644 --- a/src/abstract_tree/assignment.rs +++ b/src/abstract_tree/assignment.rs @@ -70,7 +70,7 @@ impl AbstractTree for Assignment { context.set_value(self.identifier, value)?; } AssignmentOperator::AddAssign => { - if let Some(previous_value) = context.get_value(&self.identifier)? { + if let Some(previous_value) = context.use_value(&self.identifier)? { let new_value = previous_value.add(&value)?; context.set_value(self.identifier, new_value)?; @@ -81,7 +81,7 @@ impl AbstractTree for Assignment { } } AssignmentOperator::SubAssign => { - if let Some(previous_value) = context.get_value(&self.identifier)? { + if let Some(previous_value) = context.use_value(&self.identifier)? { let new_value = previous_value.subtract(&value)?; context.set_value(self.identifier, new_value)?; @@ -121,7 +121,7 @@ mod tests { .unwrap(); assert_eq!( - context.get_value(&Identifier::new("foobar")), + context.use_value(&Identifier::new("foobar")), Ok(Some(Value::integer(42))) ) } @@ -144,7 +144,7 @@ mod tests { .unwrap(); assert_eq!( - context.get_value(&Identifier::new("foobar")), + context.use_value(&Identifier::new("foobar")), Ok(Some(Value::integer(42))) ) } @@ -167,7 +167,7 @@ mod tests { .unwrap(); assert_eq!( - context.get_value(&Identifier::new("foobar")), + context.use_value(&Identifier::new("foobar")), Ok(Some(Value::integer(42))) ) } diff --git a/src/abstract_tree/identifier.rs b/src/abstract_tree/identifier.rs index 9c6449b..0c5627a 100644 --- a/src/abstract_tree/identifier.rs +++ b/src/abstract_tree/identifier.rs @@ -25,7 +25,7 @@ impl Identifier { impl AbstractTree for Identifier { fn expected_type(&self, context: &Context) -> Result { - if let Some(r#type) = context.get_type(self)? { + if let Some(r#type) = context.use_type(self)? { Ok(r#type) } else { Err(ValidationError::VariableNotFound(self.clone())) @@ -41,7 +41,7 @@ impl AbstractTree for Identifier { } fn run(self, context: &Context) -> Result { - let return_action = context.get_value(&self)?.map(|value| Action::Return(value)); + let return_action = context.use_value(&self)?.map(|value| Action::Return(value)); if let Some(action) = return_action { Ok(action) diff --git a/src/context.rs b/src/context.rs index 188fb0d..43fbdac 100644 --- a/src/context.rs +++ b/src/context.rs @@ -94,7 +94,7 @@ impl Context { } } - pub fn get_data( + pub fn use_data( &self, identifier: &Identifier, ) -> Result, RwLockPoisonError> { @@ -129,7 +129,7 @@ impl Context { Ok(Some(value_data)) } - pub fn get_type(&self, identifier: &Identifier) -> Result, RwLockPoisonError> { + pub fn use_type(&self, identifier: &Identifier) -> Result, RwLockPoisonError> { if let Some((ValueData::Type(r#type), usage_data)) = self.inner.read()?.get(identifier) { log::trace!("Adding use for variable: {identifier}"); @@ -146,7 +146,7 @@ impl Context { Ok(Some(r#type)) } - pub fn get_value(&self, identifier: &Identifier) -> Result, RwLockPoisonError> { + pub fn use_value(&self, identifier: &Identifier) -> Result, RwLockPoisonError> { let should_remove = if let Some((ValueData::Value(value), usage_data)) = self.inner.read()?.get(identifier) {