aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--stdlib/source/lux/data/coll/set/ordered.lux150
-rw-r--r--stdlib/source/lux/data/coll/set/unordered.lux127
2 files changed, 141 insertions, 136 deletions
diff --git a/stdlib/source/lux/data/coll/set/ordered.lux b/stdlib/source/lux/data/coll/set/ordered.lux
index 45a6b0cb0..4761b7409 100644
--- a/stdlib/source/lux/data/coll/set/ordered.lux
+++ b/stdlib/source/lux/data/coll/set/ordered.lux
@@ -1,86 +1,86 @@
(.module:
lux
- (lux (control [monad #+ do Monad]
- equivalence
+ (lux (control [equivalence #+ Equivalence]
[order #+ Order])
- (data (coll [list "L/" Monad<List> Monoid<List> Fold<List>]
- (dictionary ["d" ordered]))
- ["p" product]
- ["M" maybe #+ Functor<Maybe>])
- [macro]
- (macro [code]
- ["s" syntax #+ syntax: Syntax])))
-
-(type: #export (Set a)
- (d.Dict a a))
-
-(def: #export new
- (All [a] (-> (Order a) (Set a)))
- d.new)
-
-(def: #export (member? set elem)
- (All [a] (-> (Set a) a Bool))
- (d.contains? elem set))
-
-(do-template [<name> <alias>]
- [(def: #export (<name> set)
- (All [a] (-> (Set a) (Maybe a)))
- (<alias> set))]
-
- [min d.min]
- [max d.max]
+ (data (coll [list "list/" Fold<List>]
+ (dictionary ["//" ordered])))
+ (type abstract)))
+
+(abstract: #export (Set a)
+ {}
+
+ (//.Dict a a)
+
+ (def: #export new
+ (All [a] (-> (Order a) (Set a)))
+ (|>> //.new :abstraction))
+
+ (def: #export (member? set elem)
+ (All [a] (-> (Set a) a Bool))
+ (|> set :representation (//.contains? elem)))
+
+ (do-template [<name> <alias>]
+ [(def: #export <name>
+ (All [a] (-> (Set a) (Maybe a)))
+ (|>> :representation <alias>))]
+
+ [min //.min]
+ [max //.max]
+ )
+
+ (do-template [<name> <alias>]
+ [(def: #export <name>
+ (-> (Set Any) Nat)
+ (|>> :representation <alias>))]
+
+ [size //.size]
+ [depth //.depth]
+ )
+
+ (def: #export (add elem set)
+ (All [a] (-> a (Set a) (Set a)))
+ (|> set :representation (//.put elem elem) :abstraction))
+
+ (def: #export (remove elem set)
+ (All [a] (-> a (Set a) (Set a)))
+ (|> set :representation (//.remove elem) :abstraction))
+
+ (def: #export to-list
+ (All [a] (-> (Set a) (List a)))
+ (|>> :representation //.keys))
+
+ (def: #export (from-list Order<a> list)
+ (All [a] (-> (Order a) (List a) (Set a)))
+ (list/fold add (new Order<a>) list))
+
+ (def: #export (union left right)
+ (All [a] (-> (Set a) (Set a) (Set a)))
+ (list/fold ..add right (..to-list left)))
+
+ (def: #export (intersection left right)
+ (All [a] (-> (Set a) (Set a) (Set a)))
+ (|> (..to-list right)
+ (list.filter (..member? left))
+ (..from-list (get@ #//.order (:representation right)))))
+
+ (def: #export (difference param subject)
+ (All [a] (-> (Set a) (Set a) (Set a)))
+ (|> (..to-list subject)
+ (list.filter (|>> (..member? param) not))
+ (..from-list (get@ #//.order (:representation subject)))))
+
+ (structure: #export Equivalence<Set> (All [a] (Equivalence (Set a)))
+ (def: (= reference sample)
+ (:: (list.Equivalence<List> (:: (:representation sample) eq))
+ = (..to-list reference) (..to-list sample))))
)
-(do-template [<name> <alias>]
- [(def: #export (<name> set)
- (All [a] (-> (Set a) Nat))
- (<alias> set))]
-
- [size d.size]
- [depth d.depth]
- )
-
-(def: #export (add elem set)
- (All [a] (-> a (Set a) (Set a)))
- (d.put elem elem set))
-
-(def: #export (remove elem set)
- (All [a] (-> a (Set a) (Set a)))
- (d.remove elem set))
-
-(def: #export (from-list Order<a> list)
- (All [a] (-> (Order a) (List a) (Set a)))
- (L/fold add (new Order<a>) list))
-
-(def: #export (to-list set)
- (All [a] (-> (Set a) (List a)))
- (d.keys set))
-
-(def: #export (union left right)
- (All [a] (-> (Set a) (Set a) (Set a)))
- (L/fold add right (to-list left)))
-
-(def: #export (intersection left right)
- (All [a] (-> (Set a) (Set a) (Set a)))
- (|> (to-list right)
- (list.filter (member? left))
- (from-list (get@ #d.order right))))
-
-(def: #export (difference param subject)
- (All [a] (-> (Set a) (Set a) (Set a)))
- (|> (to-list subject)
- (list.filter (|>> (member? param) not))
- (from-list (get@ #d.order subject))))
-
(def: #export (sub? super sub)
(All [a] (-> (Set a) (Set a) Bool))
- (list.every? (member? super) (to-list sub)))
+ (|> sub
+ ..to-list
+ (list.every? (..member? super))))
(def: #export (super? sub super)
(All [a] (-> (Set a) (Set a) Bool))
(sub? super sub))
-
-(structure: #export Equivalence<Set> (All [a] (Equivalence (Set a)))
- (def: (= reference sample)
- (:: (list.Equivalence<List> (:: sample eq))
- = (to-list reference) (to-list sample))))
diff --git a/stdlib/source/lux/data/coll/set/unordered.lux b/stdlib/source/lux/data/coll/set/unordered.lux
index 6f0007412..1d9942206 100644
--- a/stdlib/source/lux/data/coll/set/unordered.lux
+++ b/stdlib/source/lux/data/coll/set/unordered.lux
@@ -1,76 +1,81 @@
(.module:
lux
(lux (control [equivalence #+ Equivalence]
- [hash #*])
+ [hash #+ Hash])
(data (coll (dictionary ["dict" unordered #+ Dict])
- [list "list/" Fold<List> Functor<List>]))))
+ [list "list/" Fold<List>]))
+ (type abstract)))
-## [Types]
-(type: #export (Set a)
- (Dict a a))
-
-## [Values]
-(def: #export (new Hash<a>)
- (All [a] (-> (Hash a) (Set a)))
- (dict.new Hash<a>))
-
-(def: #export (add elem set)
- (All [a] (-> a (Set a) (Set a)))
- (dict.put elem elem set))
-
-(def: #export (remove elem set)
- (All [a] (-> a (Set a) (Set a)))
- (dict.remove elem set))
-
-(def: #export (member? set elem)
- (All [a] (-> (Set a) a Bool))
- (dict.contains? elem set))
-
-(def: #export to-list
- (All [a] (-> (Set a) (List a)))
- dict.keys)
+(abstract: #export (Set a)
+ {}
+
+ (Dict a a)
+
+ (def: #export new
+ (All [a] (-> (Hash a) (Set a)))
+ (|>> dict.new :abstraction))
+
+ (def: #export size
+ (All [a] (-> (Set a) Nat))
+ (|>> :representation dict.size))
+
+ (def: #export (add elem set)
+ (All [a] (-> a (Set a) (Set a)))
+ (|> set :representation (dict.put elem elem) :abstraction))
+
+ (def: #export (remove elem set)
+ (All [a] (-> a (Set a) (Set a)))
+ (|> set :representation (dict.remove elem) :abstraction))
+
+ (def: #export (member? set elem)
+ (All [a] (-> (Set a) a Bool))
+ (|> set :representation (dict.contains? elem)))
+
+ (def: #export to-list
+ (All [a] (-> (Set a) (List a)))
+ (|>> :representation dict.keys))
+
+ (def: #export (union xs yx)
+ (All [a] (-> (Set a) (Set a) (Set a)))
+ (:abstraction (dict.merge (:representation xs) (:representation yx))))
+
+ (def: #export (difference sub base)
+ (All [a] (-> (Set a) (Set a) (Set a)))
+ (list/fold ..remove base (..to-list sub)))
+
+ (def: #export (intersection filter base)
+ (All [a] (-> (Set a) (Set a) (Set a)))
+ (:abstraction (dict.select (dict.keys (:representation filter))
+ (:representation base))))
+
+ (structure: #export Equivalence<Set> (All [a] (Equivalence (Set a)))
+ (def: (= reference sample)
+ (let [[Hash<a> _] (:representation reference)]
+ (:: (list.Equivalence<List> (get@ #hash.eq Hash<a>)) =
+ (..to-list reference) (..to-list sample)))))
+
+ (structure: #export Hash<Set> (All [a] (Hash (Set a)))
+ (def: eq ..Equivalence<Set>)
+
+ (def: (hash set)
+ (let [[Hash<a> _] (:representation set)]
+ (list/fold (function (_ elem acc) (n/+ (:: Hash<a> hash elem) acc))
+ +0
+ (..to-list set)))))
+ )
+
+(def: #export empty?
+ (All [a] (-> (Set a) Bool))
+ (|>> ..size (n/= +0)))
(def: #export (from-list Hash<a> xs)
(All [a] (-> (Hash a) (List a) (Set a)))
- (list/fold add (new Hash<a>) xs))
-
-(def: #export (union xs yx)
- (All [a] (-> (Set a) (Set a) (Set a)))
- (dict.merge xs yx))
-
-(def: #export (difference sub base)
- (All [a] (-> (Set a) (Set a) (Set a)))
- (list/fold remove base (to-list sub)))
-
-(def: #export (intersection filter base)
- (All [a] (-> (Set a) (Set a) (Set a)))
- (dict.select (dict.keys filter) base))
-
-(def: #export (size set)
- (All [a] (-> (Set a) Nat))
- (dict.size set))
-
-(def: #export (empty? set)
- (All [a] (-> (Set a) Bool))
- (n/= +0 (dict.size set)))
+ (list/fold ..add (..new Hash<a>) xs))
(def: #export (sub? super sub)
(All [a] (-> (Set a) (Set a) Bool))
- (list.every? (member? super) (to-list sub)))
+ (list.every? (..member? super) (..to-list sub)))
(def: #export (super? sub super)
(All [a] (-> (Set a) (Set a) Bool))
(sub? super sub))
-
-## [Structures]
-(structure: #export Equivalence<Set> (All [a] (Equivalence (Set a)))
- (def: (= (^@ test [Hash<a> _]) subject)
- (:: (list.Equivalence<List> (get@ #hash.eq Hash<a>)) = (to-list test) (to-list subject))))
-
-(structure: #export Hash<Set> (All [a] (Hash (Set a)))
- (def: eq Equivalence<Set>)
-
- (def: (hash (^@ set [Hash<a> _]))
- (list/fold (function (_ elem acc) (n/+ (:: Hash<a> hash elem) acc))
- +0
- (to-list set))))
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 19:34:32 +0000