summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRich Hickey <richhickey@gmail.com>2006-08-05 16:59:24 +0000
committerRich Hickey <richhickey@gmail.com>2006-08-05 16:59:24 +0000
commit9213607263509ebc766e7bcf082784ec8ae19bfd (patch)
treeb9be4ed2fbf4d4f57b89280526b48bf9e781ffb3 /src
parent279dd21d4b919496c8fb54c3135f2b82cc36f5c2 (diff)
derived Associative from IPersistentCollection
Diffstat (limited to 'src')
-rw-r--r--src/cli/runtime/Associative.cs2
-rw-r--r--src/cli/runtime/IPersistentMap.cs2
-rw-r--r--src/jvm/clojure/lang/Associative.java2
-rw-r--r--src/jvm/clojure/lang/IPersistentMap.java2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/cli/runtime/Associative.cs b/src/cli/runtime/Associative.cs
index 2711e993..57b4cd56 100644
--- a/src/cli/runtime/Associative.cs
+++ b/src/cli/runtime/Associative.cs
@@ -11,7 +11,7 @@
using System;
namespace clojure.lang
{
- public interface Associative
+ public interface Associative : IPersistentCollection
{
bool contains(object key);
IMapEntry find(object key);
diff --git a/src/cli/runtime/IPersistentMap.cs b/src/cli/runtime/IPersistentMap.cs
index 055746ce..b1f9ef94 100644
--- a/src/cli/runtime/IPersistentMap.cs
+++ b/src/cli/runtime/IPersistentMap.cs
@@ -14,7 +14,7 @@ using System.Collections;
namespace clojure.lang
{
-public interface IPersistentMap : Associative, IEnumerable, IPersistentCollection{
+public interface IPersistentMap : Associative, IEnumerable{
IPersistentMap assocEx(Object key, Object val);
diff --git a/src/jvm/clojure/lang/Associative.java b/src/jvm/clojure/lang/Associative.java
index cab4f23a..eea67e59 100644
--- a/src/jvm/clojure/lang/Associative.java
+++ b/src/jvm/clojure/lang/Associative.java
@@ -9,7 +9,7 @@ package clojure.lang;
* the terms of this license.
* You must not remove this notice, or any other, from this software.
*/
-public interface Associative {
+public interface Associative extends IPersistentCollection {
boolean contains(Object key);
IMapEntry find(Object key);
diff --git a/src/jvm/clojure/lang/IPersistentMap.java b/src/jvm/clojure/lang/IPersistentMap.java
index 3a32b27a..c0632edc 100644
--- a/src/jvm/clojure/lang/IPersistentMap.java
+++ b/src/jvm/clojure/lang/IPersistentMap.java
@@ -11,7 +11,7 @@
package clojure.lang;
-public interface IPersistentMap extends Iterable, IPersistentCollection, Associative {
+public interface IPersistentMap extends Iterable, Associative {
IPersistentMap assoc(Object key, Object val);