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

chore(tvix/eval): thread a codemap::File reference to the compiler

Browse source 
This instantiates a codemap outside of the compiler and passes a
reference to the file currently under compilation to it. Note that the
"file" might just be a REPL line.

Change-Id: I131ae1ddb6d718e1374750da9ba0b99608c6058d
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6378
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
This commit is contained in:
Vincent Ambo 2022-09-01 16:38:05 +03:00 • committed by tazjin
parent b9566da5c9
commit c5a8b93eaf
2 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
tvix/eval/src/compiler/mod.rs
View file

@ -59,7 +59,7 @@ impl LambdaCtx {
/// implicitly be resolvable in the global scope.
type GlobalsMap = HashMap<&'static str, Rc<dyn Fn(&mut Compiler)>>;
struct Compiler {
struct Compiler<'code> {
contexts: Vec<LambdaCtx>,
warnings: Vec<EvalWarning>,
errors: Vec<Error>,
@ -72,11 +72,16 @@ struct Compiler {
/// an identifier is resolved against the scope poisoning logic,
/// and a function that should emit code for the token.
globals: GlobalsMap,
/// File reference in the codemap contains all known source code
/// and is used to track the spans from which instructions where
/// derived.
file: &'code codemap::File,
}
// Helper functions for emitting code and metadata to the internal
// structures of the compiler.
impl Compiler {
impl Compiler<'_> {
fn context(&self) -> &LambdaCtx {
&self.contexts[self.contexts.len() - 1]
}
@ -110,7 +115,7 @@ impl Compiler {
}
// Actual code-emitting AST traversal methods.
impl Compiler {
impl Compiler<'_> {
fn compile(&mut self, slot: Option<LocalIdx>, expr: ast::Expr) {
match expr {
ast::Expr::Literal(literal) => self.compile_literal(literal),
@ -1257,9 +1262,10 @@ fn prepare_globals(additional: HashMap<&'static str, Value>) -> GlobalsMap {
globals
}
pub fn compile(
pub fn compile<'code>(
expr: ast::Expr,
location: Option<PathBuf>,
file: &'code codemap::File,
globals: HashMap<&'static str, Value>,
) -> EvalResult<CompilationOutput> {
let mut root_dir = match location {
@ -1278,6 +1284,7 @@ pub fn compile(
let mut c = Compiler {
root_dir,
file,
globals: prepare_globals(globals),
contexts: vec![LambdaCtx::new()],
warnings: vec![],