Moved ".../dictionary/plist" to ".../list/property".

4 files changed, 21 insertions, 17 deletions

diff --git a/stdlib/source/test/lux.lux b/stdlib/source/test/lux.lux
index 7f9d94809..af6864ce3 100644
--- a/stdlib/source/test/lux.lux
+++ b/stdlib/source/test/lux.lux
@@ -18,10 +18,9 @@
               ["[0]" text (.use "[1]#[0]" equivalence)
                ["%" \\format (.only format)]]
               [collection
-               ["[0]" list (.use "[1]#[0]" functor)]
                ["[0]" set (.only Set) (.use "[1]#[0]" equivalence)]
-               [dictionary
-                ["[0]" plist]]]]
+               ["[0]" list (.use "[1]#[0]" functor)
+                ["[0]" property]]]]
              ["[0]" macro (.only)
               [syntax (.only syntax)]
               ["^" pattern]
@@ -1135,7 +1134,7 @@
                                                          (function (_ is? name)
                                                            (|> captured/2
                                                                (the .#mappings)
-                                                               (plist.value name)
+                                                               (property.value name)
                                                                (maybe#each (|>> product.right is?))
                                                                (maybe.else false))))
 
diff --git a/stdlib/source/test/lux/data/collection.lux b/stdlib/source/test/lux/data/collection.lux
index 83351d7c1..f1fa1792e 100644
--- a/stdlib/source/test/lux/data/collection.lux
+++ b/stdlib/source/test/lux/data/collection.lux
@@ -1,17 +1,17 @@
 (.require
  [library
-  [lux (.except)
+  [lux (.except list)
    ["_" test (.only Test)]]]
  ["[0]" /
   ["[1][0]" array]
   ["[1][0]" bits]
-  ["[1][0]" list]
   ["[1][0]" sequence]
   ["[1][0]" stream]
   ["[1][0]" stack]
+  ["[1][0]" list (.only)
+   ["[1]/[0]" property]]
   ["[1][0]" dictionary (.only)
-   ["[1]/[0]" ordered]
-   ["[1]/[0]" plist]]
+   ["[1]/[0]" ordered]]
   ["[1][0]" queue (.only)
    ["[1]/[0]" priority]]
   ["[1][0]" set (.only)
@@ -21,12 +21,18 @@
    ["[1]/[0]" finger]
    ["[1]/[0]" zipper]]])
 
+(def list
+  Test
+  (all _.and
+       /list.test
+       /list/property.test
+       ))
+
 (def dictionary
   Test
   (all _.and
        /dictionary.test
        /dictionary/ordered.test
-       /dictionary/plist.test
        ))
 
 (def queue
@@ -57,10 +63,10 @@
   (all _.and
        /array.test
        /bits.test
-       /list.test
        /sequence.test
        /stream.test
        /stack.test
+       ..list
        ..dictionary
        ..queue
        ..set
diff --git a/stdlib/source/test/lux/data/collection/dictionary/plist.lux b/stdlib/source/test/lux/data/collection/list/property.lux
index 4b83ece89..d8ae753ef 100644
--- a/stdlib/source/test/lux/data/collection/dictionary/plist.lux
+++ b/stdlib/source/test/lux/data/collection/list/property.lux
@@ -24,7 +24,7 @@
 
 (def .public (random size gen_key gen_value)
   (All (_ v)
-    (-> Nat (Random Text) (Random v) (Random (/.PList v))))
+    (-> Nat (Random Text) (Random v) (Random (/.List v))))
   (do random.monad
     [keys (random.set text.hash size gen_key)
      values (random.list size gen_value)]
@@ -33,7 +33,7 @@
 (def .public test
   Test
   (<| (_.covering /._)
-      (_.for [/.PList])
+      (_.for [/.List])
       (do [! random.monad]
         [.let [gen_key (random.alphabetic 10)]
          size (at ! each (n.% 100) random.nat)
diff --git a/stdlib/source/test/lux/macro/local.lux b/stdlib/source/test/lux/macro/local.lux
index b86a299b8..74d66e29c 100644
--- a/stdlib/source/test/lux/macro/local.lux
+++ b/stdlib/source/test/lux/macro/local.lux
@@ -13,9 +13,8 @@
     [text
      ["%" \\format]]
     [collection
-     ["[0]" list]
-     [dictionary
-      ["[0]" plist]]]]
+     ["[0]" list
+      ["[0]" property]]]]
    ["[0]" macro (.only)
     [syntax (.only syntax)]
     ["[0]" code (.only)
@@ -60,9 +59,9 @@
          [module short] (meta.normal name)
          _ (if pre_remove
              (let [remove_macro! (is (-> .Module .Module)
-                                     (revised .#definitions (plist.lacks short)))]
+                                     (revised .#definitions (property.lacks short)))]
                (function (_ lux)
-                 {try.#Success [(revised .#modules (plist.revised module remove_macro!) lux)
+                 {try.#Success [(revised .#modules (property.revised module remove_macro!) lux)
                                 []]}))
              (in []))]
         (let [pre_expansion (` (let [(~ g!output) (~ body)]