maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(tazjin/rlox): Include static globals in resolution

Browse source 
Change-Id: Id377ce1fe4c9b9cd65395d15873399d9b6d38af8
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2408
Reviewed-by: tazjin <mail@tazj.in>
Tested-by: BuildkiteCI
This commit is contained in:
Vincent Ambo 2021-01-17 12:05:16 +03:00 • committed by tazjin
parent 06a6aa5dc0
commit 052f8976bb
2 changed files with 51 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

61
users/tazjin/rlox/src/interpreter.rs
View file

@ -223,8 +223,39 @@ impl Interpreter {
// Interpreter itself
pub fn interpret(&mut self, mut program: Block) -> Result<Value, Error> {
resolver::resolve(&mut program)?;
self.interpret_block(&program)
let globals = self.env.read()
.expect("static globals lock poisoned")
.values.keys().map(Clone::clone)
.collect::<Vec<String>>();
resolver::resolve(&globals, &mut program)?;
self.interpret_block_with_env(None, &program)
}
/// Interpret the block in the supplied environment. If no
/// environment is supplied, a new one is created using the
/// current one as its parent.
fn interpret_block_with_env(
&mut self,
env: Option<Rc<RwLock<Environment>>>,
block: &parser::Block,
) -> Result<Value, Error> {
let env = match env {
Some(env) => env,
None => {
let env: Rc<RwLock<Environment>> = Default::default();
set_enclosing_env(&env, self.env.clone());
env
}
};
let previous = std::mem::replace(&mut self.env, env);
let result = self.interpret_block(block);
// Swap it back, discarding the child env.
self.env = previous;
return result;
}
fn interpret_block(&mut self, program: &Block) -> Result<Value, Error> {
@ -272,32 +303,6 @@ impl Interpreter {
Ok(value)
}
/// Interpret the block in the supplied environment. If no
/// environment is supplied, a new one is created using the
/// current one as its parent.
fn interpret_block_with_env(
&mut self,
env: Option<Rc<RwLock<Environment>>>,
block: &parser::Block,
) -> Result<Value, Error> {
let env = match env {
Some(env) => env,
None => {
let env: Rc<RwLock<Environment>> = Default::default();
set_enclosing_env(&env, self.env.clone());
env
}
};
let previous = std::mem::replace(&mut self.env, env);
let result = self.interpret_block(block);
// Swap it back, discarding the child env.
self.env = previous;
return result;
}
fn interpret_if(&mut self, if_stmt: &parser::If) -> Result<Value, Error> {
let condition = self.eval(&if_stmt.condition)?;