Skip to content

A peer-to-peer stack for code collaboration

More functions in `prelude/set`. (#318)

James Haydon6e9ce7cb38e9
diff --git a/docs/source/reference.rst b/docs/source/reference.rst
index 95862e6..0a6fbe7 100644
--- a/docs/source/reference.rst
+++ b/docs/source/reference.rst
@@ -865,10 +865,10 @@ Insert a value into a set.
Delete a value from a set.
-``(member? x s)``
-~~~~~~~~~~~~~~~~~
+``member?``
+~~~~~~~~~~~
-Query if an value is an element of a set.
+Query if a value is an element of a set.
``(to-vec s)``
~~~~~~~~~~~~~~
@@ -880,6 +880,16 @@ Convert a set to a vector.
Create a set from a sequence.
+``(key-set d)``
+~~~~~~~~~~~~~~~
+
+The set of keys of a dict.
+
+``(subset? xs ys)``
+~~~~~~~~~~~~~~~~~~~
+
+Checks if ``xs`` is a subset of ``ys``.
+
``prelude/ref``
---------------
diff --git a/rad/prelude/set.rad b/rad/prelude/set.rad
index 5bccd68..6ed8161 100644
--- a/rad/prelude/set.rad
+++ b/rad/prelude/set.rad
@@ -1,6 +1,10 @@
+
{:module 'prelude/set
:doc "Sets, built using dicts."
- :exports '[empty insert delete member? to-vec from-seq]}
+ :exports '[empty insert delete member? to-vec from-seq key-set subset?]}
+
+(import prelude/bool :unqualified)
+(import prelude/dict :as 'dict)
(def empty
"An empty set."
@@ -17,14 +21,35 @@
(delete x s)))
(def member?
- "Query if an value is an element of a set."
- (fn [x s]
- (member? x s)))
+ "Query if a value is an element of a set."
+ member?)
(def to-vec
"Convert a set to a vector."
- (fn [s] (keys s)))
+ (fn [s] (dict/keys s)))
(def from-seq
"Create a set from a sequence."
- (fn [xs] (foldr set/insert {} xs)))
+ (fn [xs] (foldr insert {} xs)))
+
+(:test "from-seq"
+ [ (from-seq [1 3]) ==> {1 #t 3 #t} ]
+ [ (eq? (from-seq [1 2]) (from-seq [1 1 2 1 2])) ==> #t ])
+
+(def key-set
+ "The set of keys of a dict."
+ (fn [d]
+ (map-values (fn [v] #t) d)))
+
+(:test "key-set"
+ [ (key-set {:a 1 :b 2}) ==> {:a #t :b #t} ])
+
+(def subset?
+ "Checks if `xs` is a subset of `ys`."
+ (fn [xs ys]
+ (all (map (fn [x] (member? x ys))
+ (dict/keys xs)))))
+
+(:test "subset?"
+ [ (subset? (from-seq [1 3 5]) (from-seq [1 2 3 4 5])) ==> #t ]
+ [ (subset? (from-seq [1 3]) (from-seq [1 2])) ==> #f ])