diff options
Diffstat (limited to 'tvix/eval/src/compiler')
-rw-r--r-- | tvix/eval/src/compiler/attrs.rs | 2 | ||||
-rw-r--r-- | tvix/eval/src/compiler/mod.rs | 11 | ||||
-rw-r--r-- | tvix/eval/src/compiler/spans.rs | 4 |
3 files changed, 9 insertions, 8 deletions
diff --git a/tvix/eval/src/compiler/attrs.rs b/tvix/eval/src/compiler/attrs.rs index f1441cff68d2..1584d5017aa2 100644 --- a/tvix/eval/src/compiler/attrs.rs +++ b/tvix/eval/src/compiler/attrs.rs @@ -3,7 +3,7 @@ use super::*; -impl Compiler<'_, '_> { +impl Compiler<'_> { pub(super) fn compile_attr(&mut self, slot: LocalIdx, node: ast::Attr) { match node { ast::Attr::Dynamic(dynamic) => { diff --git a/tvix/eval/src/compiler/mod.rs b/tvix/eval/src/compiler/mod.rs index 4d6728b6d6c3..160433904dc7 100644 --- a/tvix/eval/src/compiler/mod.rs +++ b/tvix/eval/src/compiler/mod.rs @@ -24,6 +24,7 @@ use smol_str::SmolStr; use std::collections::HashMap; use std::path::{Path, PathBuf}; use std::rc::Rc; +use std::sync::Arc; use crate::chunk::Chunk; use crate::errors::{Error, ErrorKind, EvalResult}; @@ -73,7 +74,7 @@ impl LambdaCtx { /// implicitly be resolvable in the global scope. type GlobalsMap = HashMap<&'static str, Rc<dyn Fn(&mut Compiler, rnix::ast::Ident)>>; -struct Compiler<'code, 'observer> { +struct Compiler<'observer> { contexts: Vec<LambdaCtx>, warnings: Vec<EvalWarning>, errors: Vec<Error>, @@ -90,7 +91,7 @@ struct Compiler<'code, 'observer> { /// 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, + file: Arc<codemap::File>, /// Carry an observer for the compilation process, which is called /// whenever a chunk is emitted. @@ -99,7 +100,7 @@ struct Compiler<'code, 'observer> { // 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] } @@ -137,7 +138,7 @@ impl Compiler<'_, '_> { } // Actual code-emitting AST traversal methods. -impl Compiler<'_, '_> { +impl Compiler<'_> { fn compile(&mut self, slot: LocalIdx, expr: ast::Expr) { match expr { ast::Expr::Literal(literal) => self.compile_literal(literal), @@ -1386,7 +1387,7 @@ fn prepare_globals(additional: HashMap<&'static str, Value>) -> GlobalsMap { pub fn compile( expr: ast::Expr, location: Option<PathBuf>, - file: &codemap::File, + file: Arc<codemap::File>, globals: HashMap<&'static str, Value>, observer: &mut dyn Observer, ) -> EvalResult<CompilationOutput> { diff --git a/tvix/eval/src/compiler/spans.rs b/tvix/eval/src/compiler/spans.rs index a972a17eddb3..6c11961e0eae 100644 --- a/tvix/eval/src/compiler/spans.rs +++ b/tvix/eval/src/compiler/spans.rs @@ -77,8 +77,8 @@ expr_to_span!(ast::Str); expr_to_span!(ast::UnaryOp); expr_to_span!(ast::With); -impl Compiler<'_, '_> { +impl Compiler<'_> { pub(super) fn span_for<S: ToSpan>(&self, to_span: &S) -> Span { - to_span.span_for(self.file) + to_span.span_for(&self.file) } } |