Some renamings.

1 files changed, 16 insertions, 26 deletions

diff --git a/stdlib/source/program/aedifex/package.lux b/stdlib/source/program/aedifex/package.lux
index b3118a7e0..f6ba87078 100644
--- a/stdlib/source/program/aedifex/package.lux
+++ b/stdlib/source/program/aedifex/package.lux
@@ -15,28 +15,13 @@
     [collection
      [set (#+ Set)]]]]
   ["." // #_
-   [dependency (#+ Dependency)
-    ["#." status (#+ Status)]]
    ["/" profile]
    ["#." hash (#+ Hash SHA-1 MD5)]
-   ["#." pom]])
-
-(type: #export Origin
-  #Local
-  #Remote)
-
-(structure: any_equivalence
-  (Equivalence Any)
-
-  (def: (= _ _)
-    true))
-
-(def: origin_equivalence
-  (Equivalence Origin)
-  ($_ sum.equivalence
-      ..any_equivalence
-      ..any_equivalence
-      ))
+   ["#." pom]
+   [dependency (#+ Dependency)
+    ["#." status (#+ Status)]]
+   [repository
+    ["#." origin (#+ Origin)]]])
 
 (type: #export Package
   {#origin Origin
@@ -44,17 +29,22 @@
    #pom [XML Status]})
 
 (template [<name> <tag>]
-  [(def: #export <name>
+  [(def: #export (<name> package)
      (-> Package Bit)
-     (|>> (get@ #origin) (\ ..origin_equivalence = <tag>)))]
+     (case (get@ #origin package)
+       (<tag> _)
+       true
+       
+       _
+       false))]
 
-  [local? #Local]
-  [remote? #Remote]
+  [local? #//origin.Local]
+  [remote? #//origin.Remote]
   )
 
 (def: #export (local pom library)
   (-> XML Binary Package)
-  {#origin #Local
+  {#origin (#//origin.Local "")
    #library [library #//status.Unverified]
    #pom [pom #//status.Unverified]})
 
@@ -68,7 +58,7 @@
 (def: #export equivalence
   (Equivalence Package)
   ($_ product.equivalence
-      ..origin_equivalence
+      //origin.equivalence
       (product.equivalence binary.equivalence //status.equivalence)
       (product.equivalence xml.equivalence //status.equivalence)
       ))