Improved naming when evaluating code on the host platform.

1 files changed, 10 insertions, 16 deletions

diff --git a/stdlib/source/lux/data/name.lux b/stdlib/source/lux/data/name.lux
index 897690144..e79398021 100644
--- a/stdlib/source/lux/data/name.lux
+++ b/stdlib/source/lux/data/name.lux
@@ -2,11 +2,12 @@
   [lux #*
    [abstract
     [equivalence (#+ Equivalence)]
+    [hash (#+ Hash)]
     [order (#+ Order)]
-    [codec (#+ Codec)]
-    hash]
+    [codec (#+ Codec)]]
    [data
-    ["." text ("#@." monoid hash)]]])
+    ["." text ("#@." equivalence monoid)]
+    ["." product]]])
 
 ## (type: Name
 ##   [Text Text])
@@ -20,12 +21,13 @@
   [short  short]
   )
 
-(structure: #export equivalence
+(def: #export hash
+  (Hash Name)
+  (product.hash text.hash text.hash))
+
+(def: #export equivalence
   (Equivalence Name)
-  
-  (def: (= [xmodule xname] [ymodule yname])
-    (and (text@= xmodule ymodule)
-         (text@= xname yname))))
+  (:: ..hash &equivalence))
 
 (structure: #export order
   (Order Name)
@@ -56,11 +58,3 @@
 
         _
         (#.Left (text@compose "Invalid format for Name: " input))))))
-
-(structure: #export hash
-  (Hash Name)
-  
-  (def: &equivalence ..equivalence)
-  
-  (def: (hash [module name])
-    ("lux i64 +" (text@hash module) (text@hash name))))