diff options
author | Vincent Ambo <mail@tazj.in> | 2022-09-24T12·54+0300 |
---|---|---|
committer | tazjin <tazjin@tvl.su> | 2022-09-29T11·47+0000 |
commit | 3f2160627895e7d1fe3236812b83bddc5d3049f5 (patch) | |
tree | a3bb11b512bb72176467db8a5444ad2f7baa0860 /tvix/eval/src/tests | |
parent | 949897651e826598f2011611e0cc03619426fcc2 (diff) |
refactor(tvix/eval): merge all bindings creation logic r/4989
As of this commit, all three types of bindings scopes are compiled the same way (i.e. compilation of non-recursive attribute sets has been switched over to the new code paths). This sets us up for doing the final implementation of nested attribute sets. HOWEVER, this breaks the existing implementation of nested attributes in non-recursive attribute sets. That implementation is flawed and unworkable in practice, so we need to do this dance to be able to implement it correctly. Change-Id: Iba2545c0d1d6b51f5e1a31a5d005b8d01da546d3 Reviewed-on: https://cl.tvl.fyi/c/depot/+/6782 Reviewed-by: sterni <sternenseemann@systemli.org> Tested-by: BuildkiteCI
Diffstat (limited to 'tvix/eval/src/tests')
-rw-r--r-- | tvix/eval/src/tests/tvix_tests/disabled-eval-okay-contains-nested-non-set.nix (renamed from tvix/eval/src/tests/tvix_tests/eval-okay-contains-nested-non-set.nix) | 0 | ||||
-rw-r--r-- | tvix/eval/src/tests/tvix_tests/disabled-eval-okay-deeply-nested-attrs.nix (renamed from tvix/eval/src/tests/tvix_tests/eval-okay-deeply-nested-attrs.nix) | 0 | ||||
-rw-r--r-- | tvix/eval/src/tests/tvix_tests/disabled-eval-okay-multiple-nested-attrs.nix (renamed from tvix/eval/src/tests/tvix_tests/eval-okay-multiple-nested-attrs.nix) | 0 | ||||
-rw-r--r-- | tvix/eval/src/tests/tvix_tests/disabled-eval-okay-nested-has-attrs.nix (renamed from tvix/eval/src/tests/tvix_tests/eval-okay-nested-has-attrs.nix) | 0 | ||||
-rw-r--r-- | tvix/eval/src/tests/tvix_tests/disabled-eval-okay-or-operator-nested-default.nix (renamed from tvix/eval/src/tests/tvix_tests/eval-okay-or-operator-nested-default.nix) | 0 | ||||
-rw-r--r-- | tvix/eval/src/tests/tvix_tests/disabled-eval-okay-or-operator-nested.nix (renamed from tvix/eval/src/tests/tvix_tests/eval-okay-or-operator-nested.nix) | 0 | ||||
-rw-r--r-- | tvix/eval/src/tests/tvix_tests/disabled-eval-okay-or-operator-non-set.nix (renamed from tvix/eval/src/tests/tvix_tests/eval-okay-or-operator-non-set.nix) | 0 | ||||
-rw-r--r-- | tvix/eval/src/tests/tvix_tests/disabled-eval-okay-overlapping-nested-attrs.nix (renamed from tvix/eval/src/tests/tvix_tests/eval-okay-overlapping-nested-attrs.nix) | 0 | ||||
-rw-r--r-- | tvix/eval/src/tests/tvix_tests/disabled-eval-okay-simple-nested-attrs.nix (renamed from tvix/eval/src/tests/tvix_tests/eval-okay-simple-nested-attrs.nix) | 0 | ||||
-rw-r--r-- | tvix/eval/src/tests/tvix_tests/eval-okay-builtins-type-of.exp | 2 | ||||
-rw-r--r-- | tvix/eval/src/tests/tvix_tests/eval-okay-builtins-type-of.nix | 2 |
11 files changed, 2 insertions, 2 deletions
diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-contains-nested-non-set.nix b/tvix/eval/src/tests/tvix_tests/disabled-eval-okay-contains-nested-non-set.nix index 361ba91445..361ba91445 100644 --- a/tvix/eval/src/tests/tvix_tests/eval-okay-contains-nested-non-set.nix +++ b/tvix/eval/src/tests/tvix_tests/disabled-eval-okay-contains-nested-non-set.nix diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-deeply-nested-attrs.nix b/tvix/eval/src/tests/tvix_tests/disabled-eval-okay-deeply-nested-attrs.nix index 91649d0c6d..91649d0c6d 100644 --- a/tvix/eval/src/tests/tvix_tests/eval-okay-deeply-nested-attrs.nix +++ b/tvix/eval/src/tests/tvix_tests/disabled-eval-okay-deeply-nested-attrs.nix diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-multiple-nested-attrs.nix b/tvix/eval/src/tests/tvix_tests/disabled-eval-okay-multiple-nested-attrs.nix index 5d611930ca..5d611930ca 100644 --- a/tvix/eval/src/tests/tvix_tests/eval-okay-multiple-nested-attrs.nix +++ b/tvix/eval/src/tests/tvix_tests/disabled-eval-okay-multiple-nested-attrs.nix diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-nested-has-attrs.nix b/tvix/eval/src/tests/tvix_tests/disabled-eval-okay-nested-has-attrs.nix index 47dcec7a95..47dcec7a95 100644 --- a/tvix/eval/src/tests/tvix_tests/eval-okay-nested-has-attrs.nix +++ b/tvix/eval/src/tests/tvix_tests/disabled-eval-okay-nested-has-attrs.nix diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-or-operator-nested-default.nix b/tvix/eval/src/tests/tvix_tests/disabled-eval-okay-or-operator-nested-default.nix index ceffd0697b..ceffd0697b 100644 --- a/tvix/eval/src/tests/tvix_tests/eval-okay-or-operator-nested-default.nix +++ b/tvix/eval/src/tests/tvix_tests/disabled-eval-okay-or-operator-nested-default.nix diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-or-operator-nested.nix b/tvix/eval/src/tests/tvix_tests/disabled-eval-okay-or-operator-nested.nix index 1a76594546..1a76594546 100644 --- a/tvix/eval/src/tests/tvix_tests/eval-okay-or-operator-nested.nix +++ b/tvix/eval/src/tests/tvix_tests/disabled-eval-okay-or-operator-nested.nix diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-or-operator-non-set.nix b/tvix/eval/src/tests/tvix_tests/disabled-eval-okay-or-operator-non-set.nix index fd09bfee64..fd09bfee64 100644 --- a/tvix/eval/src/tests/tvix_tests/eval-okay-or-operator-non-set.nix +++ b/tvix/eval/src/tests/tvix_tests/disabled-eval-okay-or-operator-non-set.nix diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-overlapping-nested-attrs.nix b/tvix/eval/src/tests/tvix_tests/disabled-eval-okay-overlapping-nested-attrs.nix index 4154ff9da2..4154ff9da2 100644 --- a/tvix/eval/src/tests/tvix_tests/eval-okay-overlapping-nested-attrs.nix +++ b/tvix/eval/src/tests/tvix_tests/disabled-eval-okay-overlapping-nested-attrs.nix diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-simple-nested-attrs.nix b/tvix/eval/src/tests/tvix_tests/disabled-eval-okay-simple-nested-attrs.nix index a97394d165..a97394d165 100644 --- a/tvix/eval/src/tests/tvix_tests/eval-okay-simple-nested-attrs.nix +++ b/tvix/eval/src/tests/tvix_tests/disabled-eval-okay-simple-nested-attrs.nix diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-type-of.exp b/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-type-of.exp index 0e22da8d56..1ea054fc2d 100644 --- a/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-type-of.exp +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-type-of.exp @@ -1 +1 @@ -[ "null" "bool" "bool" "int" "int" "float" "string" "string" "set" "set" "set" "list" "lambda" "path" ] +[ "null" "bool" "bool" "int" "int" "float" "string" "string" "set" "set" "list" "lambda" "path" ] diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-type-of.nix b/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-type-of.nix index 38d7ffee61..a3cb659ecf 100644 --- a/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-type-of.nix +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-type-of.nix @@ -13,7 +13,7 @@ fix (self: (builtins.typeOf "foo") (builtins.typeOf "${"foo" + "bar"}baz") (builtins.typeOf {}) - (builtins.typeOf { foo.bar = 32; }.foo) + # (builtins.typeOf { foo.bar = 32; }.foo) # TODO: re-enable when nested keys are done (builtins.typeOf ({ name = "foo"; value = 13; } // { name = "bar"; })) (builtins.typeOf self) (builtins.typeOf fix) |