diff options
| author | Vincent Ambo <mail@tazj.in> | 2022-08-10T17·31+0300 |
|---|---|---|
| committer | tazjin <tazjin@tvl.su> | 2022-08-25T11·11+0000 |
| commit | fb3d024d75fe4f6760ef616fe8dfd307b7d7b688 (patch) | |
| tree | 3f86d2c9ed5eac5d7f949424a943249a550c93a3 | |
| parent | 322ce36cea732619c50220fc93f0eba51cf2eb8d (diff) | |
feat(tvix/eval): implement string concatenation r/4472
Change-Id: If61066e59232b2bad42b5cb5f0f2d9b9c416be8b Reviewed-on: https://cl.tvl.fyi/c/depot/+/6137 Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org>
| -rw-r--r-- | tvix/eval/src/tests/tvix_tests/eval-okay-concat-strings.exp | 1 | ||||
| -rw-r--r-- | tvix/eval/src/tests/tvix_tests/eval-okay-concat-strings.nix | 1 | ||||
| -rw-r--r-- | tvix/eval/src/tests/tvix_tests/eval-okay-simple-interpol.exp | 1 | ||||
| -rw-r--r-- | tvix/eval/src/tests/tvix_tests/eval-okay-simple-interpol.nix | 1 | ||||
| -rw-r--r-- | tvix/eval/src/value/string.rs | 6 | ||||
| -rw-r--r-- | tvix/eval/src/vm.rs | 14 |
6 files changed, 23 insertions, 1 deletions
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 0000000000..cd4bc1ab64 --- /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 0000000000..1fc7089299 --- /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 0000000000..cd4bc1ab64 --- /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 0000000000..125b0859ac --- /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 72f1467657..1b4f349f1a 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 3afda7a966..9a65668caa 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, /), |