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

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>

1 files changed, 13 insertions, 4 deletions

diff --git a/tvix/eval/src/vm/mod.rs b/tvix/eval/src/vm/mod.rs
index e366121aba76..057a47bc008c 100644
--- a/tvix/eval/src/vm/mod.rs
+++ b/tvix/eval/src/vm/mod.rs
@@ -29,11 +29,12 @@ use crate::{
     spans::LightSpan,
     upvalues::Upvalues,
     value::{
-        Builtin, BuiltinResult, Closure, CoercionKind, Lambda, NixAttrs, NixList, PointerEquality,
-        Thunk, Value,
+        Builtin, BuiltinResult, Closure, CoercionKind, Lambda, NixAttrs, NixContext, NixList,
+        PointerEquality, Thunk, Value,
     },
     vm::generators::GenCo,
     warnings::{EvalWarning, WarningKind},
+    NixString,
 };
 
 use generators::{call_functor, Generator, GeneratorState};
@@ -980,6 +981,8 @@ impl<'o> VM<'o> {
     /// the concatenated result string back on the stack.
     fn run_interpolate(&mut self, frame: &CallFrame, count: usize) -> EvalResult<()> {
         let mut out = String::new();
+        // Interpolation propagates the context and union them.
+        let mut context: NixContext = NixContext::new();
 
         for i in 0..count {
             let val = self.stack_pop();
@@ -990,10 +993,16 @@ impl<'o> VM<'o> {
                 self.stack.push(val);
                 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(())
     }