From 023e372583b7bcc71b5c301c49501cc72204068f Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 23 Jan 2024 15:34:38 +0200
Subject: feat(tvix/eval): track pattern binding names

These need to be preserved at least for builtins.toXML.

Also, we incorrectly only wrote an <attrspat> in case ellipsis was true,
but that's not the case.

Change-Id: I6bff9c47c2922f878d5c43e48280cda9c9ddb692
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10686
Tested-by: BuildkiteCI
Autosubmit: flokli <flokli@flokli.de>
Reviewed-by: aspen <root@gws.fyi>
---
 .../eval/src/tests/nix_tests/eval-okay-xml.exp.xml | 52 ++++++++++++++++++++++
 tvix/eval/src/tests/nix_tests/eval-okay-xml.nix    | 21 +++++++++
 .../nix_tests/notyetpassing/eval-okay-xml.exp.xml  | 52 ----------------------
 .../nix_tests/notyetpassing/eval-okay-xml.nix      | 21 ---------
 4 files changed, 73 insertions(+), 73 deletions(-)
 create mode 100644 tvix/eval/src/tests/nix_tests/eval-okay-xml.exp.xml
 create mode 100644 tvix/eval/src/tests/nix_tests/eval-okay-xml.nix
 delete mode 100644 tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-xml.exp.xml
 delete mode 100644 tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-xml.nix

(limited to 'tvix/eval/src/tests')

diff --git a/tvix/eval/src/tests/nix_tests/eval-okay-xml.exp.xml b/tvix/eval/src/tests/nix_tests/eval-okay-xml.exp.xml
new file mode 100644
index 000000000000..20099326cc96
--- /dev/null
+++ b/tvix/eval/src/tests/nix_tests/eval-okay-xml.exp.xml
@@ -0,0 +1,52 @@
+<?xml version='1.0' encoding='utf-8'?>
+<expr>
+  <attrs>
+    <attr name="a">
+      <string value="foo" />
+    </attr>
+    <attr name="at">
+      <function>
+        <attrspat name="args">
+          <attr name="x" />
+          <attr name="y" />
+          <attr name="z" />
+        </attrspat>
+      </function>
+    </attr>
+    <attr name="b">
+      <string value="bar" />
+    </attr>
+    <attr name="c">
+      <string value="foobar" />
+    </attr>
+    <attr name="ellipsis">
+      <function>
+        <attrspat ellipsis="1">
+          <attr name="x" />
+          <attr name="y" />
+          <attr name="z" />
+        </attrspat>
+      </function>
+    </attr>
+    <attr name="f">
+      <function>
+        <attrspat>
+          <attr name="x" />
+          <attr name="y" />
+          <attr name="z" />
+        </attrspat>
+      </function>
+    </attr>
+    <attr name="id">
+      <function>
+        <varpat name="x" />
+      </function>
+    </attr>
+    <attr name="x">
+      <int value="123" />
+    </attr>
+    <attr name="y">
+      <float value="567.89" />
+    </attr>
+  </attrs>
+</expr>
diff --git a/tvix/eval/src/tests/nix_tests/eval-okay-xml.nix b/tvix/eval/src/tests/nix_tests/eval-okay-xml.nix
new file mode 100644
index 000000000000..9ee9f8a0b4f5
--- /dev/null
+++ b/tvix/eval/src/tests/nix_tests/eval-okay-xml.nix
@@ -0,0 +1,21 @@
+rec {
+
+  x = 123;
+
+  y = 567.890;
+
+  a = "foo";
+
+  b = "bar";
+
+  c = "foo" + "bar";
+
+  f = {z, x, y}: if y then x else z;
+
+  id = x: x;
+
+  at = args@{x, y, z}: x;
+
+  ellipsis = {x, y, z, ...}: x;
+
+}
diff --git a/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-xml.exp.xml b/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-xml.exp.xml
deleted file mode 100644
index 20099326cc96..000000000000
--- a/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-xml.exp.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<expr>
-  <attrs>
-    <attr name="a">
-      <string value="foo" />
-    </attr>
-    <attr name="at">
-      <function>
-        <attrspat name="args">
-          <attr name="x" />
-          <attr name="y" />
-          <attr name="z" />
-        </attrspat>
-      </function>
-    </attr>
-    <attr name="b">
-      <string value="bar" />
-    </attr>
-    <attr name="c">
-      <string value="foobar" />
-    </attr>
-    <attr name="ellipsis">
-      <function>
-        <attrspat ellipsis="1">
-          <attr name="x" />
-          <attr name="y" />
-          <attr name="z" />
-        </attrspat>
-      </function>
-    </attr>
-    <attr name="f">
-      <function>
-        <attrspat>
-          <attr name="x" />
-          <attr name="y" />
-          <attr name="z" />
-        </attrspat>
-      </function>
-    </attr>
-    <attr name="id">
-      <function>
-        <varpat name="x" />
-      </function>
-    </attr>
-    <attr name="x">
-      <int value="123" />
-    </attr>
-    <attr name="y">
-      <float value="567.89" />
-    </attr>
-  </attrs>
-</expr>
diff --git a/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-xml.nix b/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-xml.nix
deleted file mode 100644
index 9ee9f8a0b4f5..000000000000
--- a/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-xml.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-rec {
-
-  x = 123;
-
-  y = 567.890;
-
-  a = "foo";
-
-  b = "bar";
-
-  c = "foo" + "bar";
-
-  f = {z, x, y}: if y then x else z;
-
-  id = x: x;
-
-  at = args@{x, y, z}: x;
-
-  ellipsis = {x, y, z, ...}: x;
-
-}
-- 
cgit 1.4.1