diff options
author | Vincent Ambo <mail@tazj.in> | 2022-09-01T16·24+0300 |
---|---|---|
committer | tazjin <tazjin@tvl.su> | 2022-09-07T20·04+0000 |
commit | 80333009008b8a6ee644b7504b65f4c337418a3b (patch) | |
tree | 57d8a7dd85ffbe2024c82512d23eda99d769fe18 /tvix/eval/src | |
parent | 6cbd580ba53885d6c4dff1e3a81406604ae13f3a (diff) |
feat(tvix/eval): track source spans for builtin access r/4736
As of this commit, the source spans of all emitted bytecode are fully tracked. Change-Id: I4c83deee0fc3f5e6fd6acad5a39047aec693b388 Reviewed-on: https://cl.tvl.fyi/c/depot/+/6403 Reviewed-by: sterni <sternenseemann@systemli.org> Tested-by: BuildkiteCI
Diffstat (limited to 'tvix/eval/src')
-rw-r--r-- | tvix/eval/src/chunk.rs | 6 | ||||
-rw-r--r-- | tvix/eval/src/compiler/mod.rs | 29 |
2 files changed, 9 insertions, 26 deletions
diff --git a/tvix/eval/src/chunk.rs b/tvix/eval/src/chunk.rs index fbb9f7c37fec..f3df51f31600 100644 --- a/tvix/eval/src/chunk.rs +++ b/tvix/eval/src/chunk.rs @@ -29,12 +29,6 @@ pub struct Chunk { } impl Chunk { - pub fn push_op_old(&mut self, data: OpCode) -> CodeIdx { - let idx = self.code.len(); - self.code.push(data); - CodeIdx(idx) - } - pub fn push_op(&mut self, data: OpCode, span: codemap::Span) -> CodeIdx { let idx = self.code.len(); self.code.push(data); diff --git a/tvix/eval/src/compiler/mod.rs b/tvix/eval/src/compiler/mod.rs index faeee3dd5723..aaa8f5c9726f 100644 --- a/tvix/eval/src/compiler/mod.rs +++ b/tvix/eval/src/compiler/mod.rs @@ -57,7 +57,7 @@ impl LambdaCtx { /// Alias for the map of globally available functions that should /// implicitly be resolvable in the global scope. -type GlobalsMap = HashMap<&'static str, Rc<dyn Fn(&mut Compiler)>>; +type GlobalsMap = HashMap<&'static str, Rc<dyn Fn(&mut Compiler, rnix::ast::Ident)>>; struct Compiler<'code> { contexts: Vec<LambdaCtx>, @@ -103,11 +103,6 @@ impl Compiler<'_> { &mut self.context_mut().scope } - /// Push a single instruction to the current bytecode chunk. - fn push_op_old(&mut self, data: OpCode) -> CodeIdx { - self.chunk().push_op_old(data) - } - /// Push a single instruction to the current bytecode chunk and /// track the source span from which it was compiled. fn push_op<T: AstNode>(&mut self, data: OpCode, node: &T) -> CodeIdx { @@ -122,12 +117,6 @@ impl Compiler<'_> { self.chunk().push_op(data, span) } - /// Emit a single constant to the current bytecode chunk. - fn emit_constant_old(&mut self, value: Value) { - let idx = self.chunk().push_constant(value); - self.push_op_old(OpCode::OpConstant(idx)); - } - /// Emit a single constant to the current bytecode chunk and track /// the source span from which it was compiled. fn emit_constant<T: AstNode>(&mut self, value: Value, node: &T) { @@ -765,7 +754,7 @@ impl Compiler<'_> { // the global directly. if let Some(global) = self.globals.get(ident.text()) { if !self.scope().is_poisoned(ident.text()) { - global.clone()(self); + global.clone()(self, node.clone()); return; } } @@ -1292,29 +1281,29 @@ fn prepare_globals(additional: HashMap<&'static str, Value>) -> GlobalsMap { globals.insert( "true", - Rc::new(|compiler| { - compiler.chunk().push_op_old(OpCode::OpTrue); + Rc::new(|compiler, node| { + compiler.push_op(OpCode::OpTrue, &node); }), ); globals.insert( "false", - Rc::new(|compiler| { - compiler.chunk().push_op_old(OpCode::OpFalse); + Rc::new(|compiler, node| { + compiler.push_op(OpCode::OpFalse, &node); }), ); globals.insert( "null", - Rc::new(|compiler| { - compiler.chunk().push_op_old(OpCode::OpNull); + Rc::new(|compiler, node| { + compiler.push_op(OpCode::OpNull, &node); }), ); for (ident, value) in additional.into_iter() { globals.insert( ident, - Rc::new(move |compiler| compiler.emit_constant_old(value.clone())), + Rc::new(move |compiler, node| compiler.emit_constant(value.clone(), &node)), ); } |