mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(tvix/eval): rename Locals to Scope

Browse source 
This name is much more sensible actually; its more than just a
collection of locals as it tracks additional scope information in the
case of Nix.

Change-Id: Ia2739bbd39aab222b1c4355e9248828973b0db43
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6216
Reviewed-by: sterni <sternenseemann@systemli.org>
Reviewed-by: grfn <grfn@gws.fyi>
Tested-by: BuildkiteCI
This commit is contained in:
Vincent Ambo 2022-08-14 23:14:37 +03:00 committed by tazjin
parent f173161f4c
commit ec7db0235f
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
tvix/eval/src/compiler.rs
View file

@ -42,14 +42,14 @@ struct Local {
depth: usize, depth: usize,
} }
/// Represents locals known during compilation, which can be resolved /// Represents a scope known during compilation, which can be resolved
/// directly to stack indices. /// directly to stack indices.
/// ///
/// TODO(tazjin): `with`-stack /// TODO(tazjin): `with`-stack
/// TODO(tazjin): flag "specials" (e.g. note depth if builtins are /// TODO(tazjin): flag "specials" (e.g. note depth if builtins are
/// overridden) /// overridden)
#[derive(Default)] #[derive(Default)]
struct Locals { struct Scope {
locals: Vec<Local>, locals: Vec<Local>,
// How many scopes "deep" are these locals? // How many scopes "deep" are these locals?
@ -58,7 +58,7 @@ struct Locals {
struct Compiler { struct Compiler {
chunk: Chunk, chunk: Chunk,
locals: Locals, scope: Scope,
warnings: Vec<EvalWarning>, warnings: Vec<EvalWarning>,
root_dir: PathBuf, root_dir: PathBuf,
@ -709,9 +709,9 @@ impl Compiler {
Some(_) => { Some(_) => {
for ident in inherit.idents() { for ident in inherit.idents() {
self.locals.locals.push(Local { self.scope.locals.push(Local {
name: ident.as_str().to_string(), name: ident.as_str().to_string(),
depth: self.locals.scope_depth, depth: self.scope.scope_depth,
}); });
} }
from_inherits.push(inherit); from_inherits.push(inherit);
@ -733,9 +733,9 @@ impl Compiler {
entries.push(entry.value().unwrap()); entries.push(entry.value().unwrap());
self.locals.locals.push(Local { self.scope.locals.push(Local {
name: path.pop().unwrap(), name: path.pop().unwrap(),
depth: self.locals.scope_depth, depth: self.scope.scope_depth,
}); });
} }
@ -792,11 +792,11 @@ impl Compiler {
} }
fn begin_scope(&mut self) { fn begin_scope(&mut self) {
self.locals.scope_depth += 1; self.scope.scope_depth += 1;
} }
fn end_scope(&mut self) { fn end_scope(&mut self) {
let mut scope = &mut self.locals; let mut scope = &mut self.scope;
debug_assert!(scope.scope_depth != 0, "can not end top scope"); debug_assert!(scope.scope_depth != 0, "can not end top scope");
scope.scope_depth -= 1; scope.scope_depth -= 1;
@ -820,7 +820,7 @@ impl Compiler {
} }
fn resolve_local(&mut self, name: &str) -> Option<usize> { fn resolve_local(&mut self, name: &str) -> Option<usize> {
let scope = &self.locals; let scope = &self.scope;
for (idx, local) in scope.locals.iter().enumerate().rev() { for (idx, local) in scope.locals.iter().enumerate().rev() {
if local.name == name { if local.name == name {
@ -892,7 +892,7 @@ pub fn compile(ast: rnix::AST, location: Option<PathBuf>) -> EvalResult<Compilat
root_dir, root_dir,
chunk: Chunk::default(), chunk: Chunk::default(),
warnings: vec![], warnings: vec![],
locals: Default::default(), scope: Default::default(),
}; };
c.compile(ast.node())?; c.compile(ast.node())?;