aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorscgilardi <scgilardi@gmail.com>2009-02-10 04:48:42 +0000
committerscgilardi <scgilardi@gmail.com>2009-02-10 04:48:42 +0000
commit31d234202eb3e838e683999e70adb8854d0d876b (patch)
tree1d2bdcc2a2288d146d215902978765ad24422671
parent635566be032e9ed8d92998e7a61f3c6f434ef994 (diff)
add set to build.xml, add {:tag Boolean} to predicates in set.clj
-rw-r--r--build.xml1
-rw-r--r--src/clojure/contrib/set.clj4
2 files changed, 5 insertions, 0 deletions
diff --git a/build.xml b/build.xml
index 141ede18..04cd7ec6 100644
--- a/build.xml
+++ b/build.xml
@@ -82,6 +82,7 @@
<arg value="clojure.contrib.repl-ln"/>
<arg value="clojure.contrib.repl-utils"/>
<arg value="clojure.contrib.seq-utils"/>
+ <arg value="clojure.contrib.set"/>
<arg value="clojure.contrib.server-socket"/>
<arg value="clojure.contrib.sql.internal"/>
<arg value="clojure.contrib.sql"/>
diff --git a/src/clojure/contrib/set.clj b/src/clojure/contrib/set.clj
index 2e8c76a4..67a46e82 100644
--- a/src/clojure/contrib/set.clj
+++ b/src/clojure/contrib/set.clj
@@ -18,23 +18,27 @@
(defn subset?
"Is set1 a subset of set2?"
[set1 set2]
+ {:tag Boolean}
(and (<= (count set1) (count set2))
(every? set2 set1)))
(defn superset?
"Is set1 a superset of set2?"
[set1 set2]
+ {:tag Boolean}
(and (>= (count set1) (count set2))
(every? set1 set2)))
(defn proper-subset?
"Is s1 a proper subset of s2?"
[set1 set2]
+ {:tag Boolean}
(and (< (count set1) (count set2))
(every? set2 set1)))
(defn proper-superset?
"Is s1 a proper superset of s2?"
[set1 set2]
+ {:tag Boolean}
(and (> (count set1) (count set2))
(every? set1 set2)))