From fb3d024d75fe4f6760ef616fe8dfd307b7d7b688 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Wed, 10 Aug 2022 20:31:35 +0300 Subject: feat(tvix/eval): implement string concatenation Change-Id: If61066e59232b2bad42b5cb5f0f2d9b9c416be8b Reviewed-on: https://cl.tvl.fyi/c/depot/+/6137 Tested-by: BuildkiteCI Reviewed-by: sterni --- .../eval/src/tests/tvix_tests/eval-okay-concat-strings.exp | 1 + .../eval/src/tests/tvix_tests/eval-okay-concat-strings.nix | 1 + .../src/tests/tvix_tests/eval-okay-simple-interpol.exp | 1 + .../src/tests/tvix_tests/eval-okay-simple-interpol.nix | 1 + tvix/eval/src/value/string.rs | 6 ++++++ tvix/eval/src/vm.rs | 14 +++++++++++++- 6 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 tvix/eval/src/tests/tvix_tests/eval-okay-concat-strings.exp create mode 100644 tvix/eval/src/tests/tvix_tests/eval-okay-concat-strings.nix create mode 100644 tvix/eval/src/tests/tvix_tests/eval-okay-simple-interpol.exp create mode 100644 tvix/eval/src/tests/tvix_tests/eval-okay-simple-interpol.nix (limited to 'tvix/eval') diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-concat-strings.exp b/tvix/eval/src/tests/tvix_tests/eval-okay-concat-strings.exp new file mode 100644 index 000000000000..cd4bc1ab64cc --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-concat-strings.exp @@ -0,0 +1 @@ +"hello world" diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-concat-strings.nix b/tvix/eval/src/tests/tvix_tests/eval-okay-concat-strings.nix new file mode 100644 index 000000000000..1fc708929989 --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-concat-strings.nix @@ -0,0 +1 @@ +"hello " + "world" diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-simple-interpol.exp b/tvix/eval/src/tests/tvix_tests/eval-okay-simple-interpol.exp new file mode 100644 index 000000000000..cd4bc1ab64cc --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-simple-interpol.exp @@ -0,0 +1 @@ +"hello world" diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-simple-interpol.nix b/tvix/eval/src/tests/tvix_tests/eval-okay-simple-interpol.nix new file mode 100644 index 000000000000..125b0859ac42 --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-simple-interpol.nix @@ -0,0 +1 @@ +"hello ${"world"}" diff --git a/tvix/eval/src/value/string.rs b/tvix/eval/src/value/string.rs index 72f146765778..1b4f349f1ac5 100644 --- a/tvix/eval/src/value/string.rs +++ b/tvix/eval/src/value/string.rs @@ -63,6 +63,12 @@ impl NixString { Cow::Owned(s) => Cow::Owned(format!("\"{}\"", s)), } } + + pub fn concat(&self, other: &Self) -> Self { + let mut s = self.as_str().to_owned(); + s.push_str(other.as_str()); + NixString::Heap(s) + } } fn nix_escape_char(ch: char) -> Option<&'static str> { diff --git a/tvix/eval/src/vm.rs b/tvix/eval/src/vm.rs index 3afda7a966eb..9a65668caa23 100644 --- a/tvix/eval/src/vm.rs +++ b/tvix/eval/src/vm.rs @@ -67,7 +67,19 @@ impl VM { self.push(c); } - OpCode::OpAdd => arithmetic_op!(self, +), + OpCode::OpAdd => { + let b = self.pop(); + let a = self.pop(); + + let result = if let (Value::String(s1), Value::String(s2)) = (&a, &b) { + Value::String(s1.concat(s2)) + } else { + arithmetic_op!(b, a, +) + }; + + self.push(result) + } + OpCode::OpSub => arithmetic_op!(self, -), OpCode::OpMul => arithmetic_op!(self, *), OpCode::OpDiv => arithmetic_op!(self, /), -- cgit 1.4.1