dbidwell/stationeers_lang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fixed VariableScope so it stores const values in the var_lookup_table

Browse Source
This commit is contained in:
Devin Bidwell
2025-12-04 21:32:00 -07:00
parent d34ce32d97
commit 759f798fda
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rust_compiler/libs/compiler/src/variable_manager.rs
View File

@@ -51,7 +51,6 @@ pub enum VariableLocation {
pub struct VariableScope<'a> { pub struct VariableScope<'a> {
temporary_vars: VecDeque<u8>, temporary_vars: VecDeque<u8>,
persistant_vars: VecDeque<u8>, persistant_vars: VecDeque<u8>,
constant_vars: HashMap<String, Literal>,
var_lookup_table: HashMap<String, VariableLocation>, var_lookup_table: HashMap<String, VariableLocation>,
stack_offset: u16, stack_offset: u16,
parent: Option<&'a VariableScope<'a>>, parent: Option<&'a VariableScope<'a>>,
@@ -65,7 +64,6 @@ impl<'a> Default for VariableScope<'a> {
persistant_vars: PERSIST.to_vec().into(), persistant_vars: PERSIST.to_vec().into(),
temporary_vars: TEMP.to_vec().into(), temporary_vars: TEMP.to_vec().into(),
var_lookup_table: HashMap::new(), var_lookup_table: HashMap::new(),
constant_vars: HashMap::new(),
} }
} }
} }
@@ -98,7 +96,6 @@ impl<'a> VariableScope<'a> {
parent: Option::Some(parent), parent: Option::Some(parent),
temporary_vars: parent.temporary_vars.clone(), temporary_vars: parent.temporary_vars.clone(),
persistant_vars: parent.persistant_vars.clone(), persistant_vars: parent.persistant_vars.clone(),
constant_vars: parent.constant_vars.clone(),
..Default::default() ..Default::default()
} }
} }
@@ -154,12 +151,14 @@ impl<'a> VariableScope<'a> {
value: Literal, value: Literal,
) -> Result<VariableLocation, Error> { ) -> Result<VariableLocation, Error> {
let var_name = var_name.into(); let var_name = var_name.into();
if self.constant_vars.contains_key(&var_name) { if self.var_lookup_table.contains_key(&var_name) {
return Err(Error::DuplicateVariable(var_name)); return Err(Error::DuplicateVariable(var_name));
} }
self.constant_vars.insert(var_name, value.clone()); let new_value = VariableLocation::Constant(value);
Ok(VariableLocation::Constant(value))
self.var_lookup_table.insert(var_name, new_value.clone());
Ok(new_value)
} }
pub fn get_location_of(&self, var_name: impl Into<String>) -> Result<VariableLocation, Error> { pub fn get_location_of(&self, var_name: impl Into<String>) -> Result<VariableLocation, Error> {