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

refactor(tvix/eval): return a lambda from the compiler

Browse source 
Changes the internal compiler plumbing to not just return a chunk of
code, but the same chunk wrapped inside of a lambda value.

This is one more step towards compiling runtime lambdas.

Change-Id: If0035f8e65a2970c5ae123fc068a2396e1d8fd72
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6240
Tested-by: BuildkiteCI
Reviewed-by: grfn <grfn@gws.fyi>
This commit is contained in:
Vincent Ambo 2022-08-23 22:54:25 +03:00 • committed by tazjin
parent 4715f9a3a0
commit 6f31c895ff
5 changed files with 28 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -21,14 +21,14 @@ use std::path::{Path, PathBuf};
use crate::chunk::Chunk;
use crate::errors::{Error, ErrorKind, EvalResult};
use crate::opcode::{CodeIdx, OpCode};
use crate::value::Value;
use crate::value::{Lambda, Value};
use crate::warnings::{EvalWarning, WarningKind};
/// Represents the result of compiling a piece of Nix code. If
/// compilation was successful, the resulting bytecode can be passed
/// to the VM.
pub struct CompilationResult {
pub chunk: Chunk,
pub lambda: Lambda,
pub warnings: Vec<EvalWarning>,
pub errors: Vec<Error>,
}
@ -90,7 +90,7 @@ struct Scope {
}
struct Compiler {
chunk: Chunk,
lambda: Lambda,
scope: Scope,
warnings: Vec<EvalWarning>,
@ -102,7 +102,8 @@ struct Compiler {
// structures of the compiler.
impl Compiler {
fn chunk(&mut self) -> &mut Chunk {
&mut self.chunk
std::rc::Rc::<Chunk>::get_mut(self.lambda.chunk())
.expect("compiler flaw: long-lived chunk reference")
}
fn emit_constant(&mut self, value: Value) {
@ -910,7 +911,7 @@ pub fn compile(expr: ast::Expr, location: Option<PathBuf>) -> EvalResult<Compila
let mut c = Compiler {
root_dir,
chunk: Chunk::default(),
lambda: Lambda::new_anonymous(),
warnings: vec![],
errors: vec![],
scope: Default::default(),
@ -919,7 +920,7 @@ pub fn compile(expr: ast::Expr, location: Option<PathBuf>) -> EvalResult<Compila
c.compile(expr);
Ok(CompilationResult {
chunk: c.chunk,
lambda: c.lambda,
warnings: c.warnings,
errors: c.errors,
})