add defonce variants for deftype et al, presumptive fix for #26

Author: ztellman

project.clj

@@ -4,7 +4,7 @@
             :url "http://opensource.org/licenses/MIT"}
   :dependencies [[primitive-math "0.1.5"]
                  [clj-tuple "0.2.2"]
-                 [manifold "0.1.4"]]
+                 [manifold "0.1.6"]]
   :profiles {:dev {:dependencies [[org.clojure/clojure "1.8.0"]
                                   [org.clojure/test.check "0.9.0"]
                                   [codox-md "0.2.0" :exclusions [org.clojure/clojure]]]}}

src/byte_streams/graph.clj

@@ -4,7 +4,7 @@
     [clj-tuple :refer [vector]]
     [manifold.stream :as s]
     [byte-streams
-     [utils :as u]
+     [utils :as u :refer [defprotocol+ defrecord+ deftype+]]
      [protocols :as p]])
   (:import
     [java.util.concurrent
@@ -17,7 +17,7 @@
 
 (declare pprint-type)
 
-(deftype Conversion [f ^double cost]
+(deftype+ Conversion [f ^double cost]
   Object
   (equals [_ x]
     (and
@@ -27,7 +27,7 @@
   (hashCode [_]
     (bit-xor (System/identityHashCode f) (unchecked-int cost))))
 
-(deftype Type [wrapper type]
+(deftype+ Type [wrapper type]
   Object
   (equals [_ x]
     (and
@@ -88,7 +88,7 @@
         :else
         (= a b)))))
 
-(defprotocol IConversionGraph
+(defprotocol+ IConversionGraph
   (assoc-conversion [_ src dst f cost])
   (equivalent-targets [_ dst])
   (possible-sources [_])
@@ -114,7 +114,7 @@
     :else
     nil))
 
-(deftype ConversionGraph [m]
+(deftype+ ConversionGraph [m]
   IConversionGraph
   (assoc-conversion [_ src dst f cost]
     (let [m' (assoc-in m [src dst] (Conversion. f cost))
@@ -156,7 +156,7 @@
 
 ;;;
 
-(defrecord ConversionPath [path fns visited? cost]
+(defrecord+ ConversionPath [path fns visited? cost]
   Comparable
   (compareTo [_ x]
     (let [cmp (compare cost (.cost ^ConversionPath x))]

src/byte_streams/protocols.clj

@@ -1,15 +1,17 @@
 (ns byte-streams.protocols
+  (:require
+   [byte-streams.utils :refer [defprotocol+]])
   (:import
     [java.util.concurrent
      ConcurrentHashMap]))
 
-(defprotocol Closeable
+(defprotocol+ Closeable
   (close [_] "A protocol that is a superset of `java.io.Closeable`."))
 
-(defprotocol ByteSource
+(defprotocol+ ByteSource
   (take-bytes! [_ n options] "Takes `n` bytes from the byte source."))
 
-(defprotocol ByteSink
+(defprotocol+ ByteSink
   (send-bytes! [_ bytes options] "Puts `bytes` in the byte sink."))
 
 (extend-protocol Closeable

src/byte_streams/pushback_stream.clj

@@ -2,7 +2,7 @@
   (:refer-clojure :exclude [take])
   (:require
     [primitive-math :as p]
-    [byte-streams.utils :refer [doit]]
+    [byte-streams.utils :refer [doit definterface+ deftype+]]
     [manifold
      [utils :as u]
      [stream :as s]
@@ -20,7 +20,7 @@
 
 (set! *unchecked-math* true)
 
-(definterface PushbackStream
+(definterface+ PushbackStream
   (put [^bytes x ^int offset ^int length])
   (put [^java.nio.ByteBuffer buf])
   (pushback [^bytes ary ^int offset ^int length])
@@ -87,7 +87,7 @@
         body)))
 
 (both
-  (deftype (either [PushbackByteStream] [SynchronizedPushbackByteStream])
+  (deftype+ (either [PushbackByteStream] [SynchronizedPushbackByteStream])
     [lock
      ^LinkedList consumers
      ^long buffer-capacity

src/byte_streams/utils.clj

@@ -5,6 +5,22 @@
     [java.util.concurrent
      ConcurrentHashMap]))
 
+(defmacro defprotocol+ [name & body]
+  (when-not (resolve name)
+    `(defprotocol ~name ~@body)))
+
+(defmacro deftype+ [name & body]
+  (when-not (resolve name)
+    `(deftype ~name ~@body)))
+
+(defmacro defrecord+ [name & body]
+  (when-not (resolve name)
+    `(defrecord ~name ~@body)))
+
+(defmacro definterface+ [name & body]
+  (when-not (resolve name)
+    `(definterface ~name ~@body)))
+
 (defmacro doit
   "A version of doseq that doesn't emit all that inline-destroying chunked-seq code."
   [[x it] & body]

test/byte_streams_reload_test.clj

@@ -0,0 +1,7 @@
+(ns byte-streams-reload-test
+  (:require
+   [clojure.test :refer :all]))
+
+(deftest test-reload-all
+  (dotimes [_ 5]
+    (require 'byte-streams :reload-all)))