Refactored "export" common syntax.

1 files changed, 11 insertions, 14 deletions

diff --git a/stdlib/source/program/aedifex/package.lux b/stdlib/source/program/aedifex/package.lux
index de831555e..03f2c3994 100644
--- a/stdlib/source/program/aedifex/package.lux
+++ b/stdlib/source/program/aedifex/package.lux
@@ -15,7 +15,8 @@
     [collection
      [set (#+ Set)]]]]
   ["." // #_
-   [dependency (#+ Dependency)]
+   [dependency (#+ Dependency)
+    ["#." status (#+ Status)]]
    ["/" profile]
    ["#." hash (#+ Hash SHA-1 MD5)]
    ["#." pom]])
@@ -34,14 +35,13 @@
   (Equivalence Origin)
   ($_ sum.equivalence
       ..any-equivalence
-      ..any-equivalence))
+      ..any-equivalence
+      ))
 
 (type: #export Package
   {#origin Origin
-   #library Binary
-   #pom XML
-   #sha-1 (Hash SHA-1)
-   #md5 (Hash MD5)})
+   #library [Binary Status]
+   #pom [XML Status]})
 
 (template [<name> <tag>]
   [(def: #export <name>
@@ -55,14 +55,13 @@
 (def: #export (local pom library)
   (-> XML Binary Package)
   {#origin #Local
-   #library library
-   #pom pom
-   #sha-1 (//hash.sha-1 library)
-   #md5 (//hash.md5 library)})
+   #library [library #//status.Unverified]
+   #pom [pom #//status.Unverified]})
 
 (def: #export dependencies
   (-> Package (Try (Set Dependency)))
   (|>> (get@ #pom)
+       product.left
        (<xml>.run //pom.parser)
        (try\map (get@ #/.dependencies))))
 
@@ -70,8 +69,6 @@
   (Equivalence Package)
   ($_ product.equivalence
       ..origin-equivalence
-      binary.equivalence
-      xml.equivalence
-      //hash.equivalence
-      //hash.equivalence
+      (product.equivalence binary.equivalence //status.equivalence)
+      (product.equivalence xml.equivalence //status.equivalence)
       ))