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

feat(tvix/eval): ${} propagates contexts

Browse source 
We just perform union of contexts of every pieces.

Change-Id: Ief925c1818cd8bbec0503e9c625b0630feebfdda
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10432
Reviewed-by: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
Autosubmit: raitobezarius <tvl@lahfa.xyz>
This commit is contained in:
Ryan Lahfa 2023-12-26 01:04:56 +01:00 committed by clbot
parent 0e6285ec8b
commit e372b1d1a5
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
tvix/eval/src/vm/mod.rs
View file

@ -29,11 +29,12 @@ use crate::{
spans::LightSpan, spans::LightSpan,
upvalues::Upvalues, upvalues::Upvalues,
value::{ value::{
Builtin, BuiltinResult, Closure, CoercionKind, Lambda, NixAttrs, NixList, PointerEquality, Builtin, BuiltinResult, Closure, CoercionKind, Lambda, NixAttrs, NixContext, NixList,
Thunk, Value, PointerEquality, Thunk, Value,
}, },
vm::generators::GenCo, vm::generators::GenCo,
warnings::{EvalWarning, WarningKind}, warnings::{EvalWarning, WarningKind},
NixString,
}; };
use generators::{call_functor, Generator, GeneratorState}; use generators::{call_functor, Generator, GeneratorState};
@ -980,6 +981,8 @@ impl<'o> VM<'o> {
/// the concatenated result string back on the stack. /// the concatenated result string back on the stack.
fn run_interpolate(&mut self, frame: &CallFrame, count: usize) -> EvalResult<()> { fn run_interpolate(&mut self, frame: &CallFrame, count: usize) -> EvalResult<()> {
let mut out = String::new(); let mut out = String::new();
// Interpolation propagates the context and union them.
let mut context: NixContext = NixContext::new();
for i in 0..count { for i in 0..count {
let val = self.stack_pop(); let val = self.stack_pop();
@ -990,10 +993,16 @@ impl<'o> VM<'o> {
self.stack.push(val); self.stack.push(val);
return Ok(()); return Ok(());
} }
out.push_str(val.to_str().with_span(frame, self)?.as_str()); let mut nix_string = val.to_contextful_str().with_span(frame, self)?;
out.push_str(nix_string.as_str());
if let Some(nix_string_ctx) = nix_string.context_mut() {
context = context.join(nix_string_ctx);
}
} }
self.stack.push(Value::String(out.into())); // FIXME: consume immediately here the String.
self.stack
.push(Value::String(NixString::new_context_from(context, &out)));
Ok(()) Ok(())
} }