diff options
Diffstat (limited to 'tvix/eval/src/value/mod.rs')
| -rw-r--r-- | tvix/eval/src/value/mod.rs | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/tvix/eval/src/value/mod.rs b/tvix/eval/src/value/mod.rs index 16eb2a66b3fb..b688716d4131 100644 --- a/tvix/eval/src/value/mod.rs +++ b/tvix/eval/src/value/mod.rs @@ -318,15 +318,27 @@ impl Value { // Track if we are coercing the first value of a list to correctly emit // separating white spaces. let mut is_list_head = None; + // FIXME(raitobezarius): as per https://b.tvl.fyi/issues/364 + // we might be interested into more powerful context-related coercion kinds. + let mut context: NixContext = NixContext::new(); + loop { let value = if let Some(v) = vals.pop() { v.force(co, span.clone()).await? } else { - return Ok(Value::String(result.into())); + return Ok(Value::String(NixString::new_context_from( + context, + result.as_str(), + ))); }; let coerced = match (value, kind) { // coercions that are always done - (Value::String(s), _) => Ok(s.as_str().to_owned()), + (Value::String(mut s), _) => { + if let Some(ctx) = s.context_mut() { + context = context.join(ctx); + } + Ok(s.as_str().to_owned()) + } // TODO(sterni): Think about proper encoding handling here. This needs // general consideration anyways, since one current discrepancy between |