Updated the Scriptum documentation generator.

1 files changed, 12 insertions, 9 deletions

diff --git a/stdlib/source/library/lux/data/collection/dictionary.lux b/stdlib/source/library/lux/data/collection/dictionary.lux
index 02d733d80..6768d2155 100644
--- a/stdlib/source/library/lux/data/collection/dictionary.lux
+++ b/stdlib/source/library/lux/data/collection/dictionary.lux
@@ -623,24 +623,27 @@
   (All [k v] (-> (Dictionary k v) Bit))
   (|>> size (n.= 0)))
 
-(def: #export (entries dict)
+(def: #export entries
   (All [k v] (-> (Dictionary k v) (List [k v])))
-  (entries' (product.right dict)))
+  (|>> product.right ..entries'))
 
 (def: #export (from_list Hash<k> kvs)
   (All [k v] (-> (Hash k) (List [k v]) (Dictionary k v)))
   (list\fold (function (_ [k v] dict)
-               (put k v dict))
+               (..put k v dict))
              (new Hash<k>)
              kvs))
 
-(template [<name> <elem_type> <side>]
-  [(def: #export (<name> dict)
-     (All [k v] (-> (Dictionary k v) (List <elem_type>)))
-     (|> dict entries (list\map <side>)))]
+(template [<name> <side>]
+  [(def: #export <name>
+     (All [k v] (-> (Dictionary k v) (List <side>)))
+     (|>> ..entries
+          (list\fold (function (_ [k v] bundle)
+                       (#.Cons <side> bundle))
+                     #.Nil)))]
 
-  [keys   k product.left]
-  [values v product.right]
+  [keys   k]
+  [values v]
   )
 
 (def: #export (merge dict2 dict1)