import-fn -> import-macro

clj-commons · Apr 22, 2012 · 8649792 · 8649792
1 parent f2e2628
commit 8649792
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/src/potemkin.clj b/src/potemkin.clj
@@ -22,7 +22,7 @@
 (import-fn macros/transform-defn-bodies)
 (import-fn macros/transform-fn-bodies)
 
-(import-fn protocols/defprotocol-once)
+(import-macro protocols/defprotocol-once)
 
 
 

diff --git a/src/potemkin/namespace.clj b/src/potemkin/namespace.clj
@@ -22,6 +22,8 @@
         protocol (:protocol m)]
     (when-not vr
       (throw (IllegalArgumentException. (str "Don't recognize " sym))))
+    (when (:macro m)
+      (throw (IllegalArgumentException. (str "Calling import-fn on a macro: " sym))))
     `(do
        (def ~(with-meta n {:protocol protocol}) (deref ~vr))
        (alter-meta! (var ~n) assoc
@@ -43,6 +45,8 @@
         doc (:doc m)]
     (when-not vr
       (throw (IllegalArgumentException. (str "Don't recognize " sym))))
+    (when-not (:macro m)
+      (throw (IllegalArgumentException. (str "Calling import-macro on a non-macro: " sym))))
     `(do
        (def ~n ~(resolve sym))
        (alter-meta! (var ~n) assoc

diff --git a/src/potemkin/protocols.clj b/src/potemkin/protocols.clj
@@ -8,7 +8,9 @@
 
 (ns potemkin.protocols)
 
-(defmacro defprotocol-once [name & body]
+(defmacro defprotocol-once
+  "defonce for defprotocol"
+  [name & body]
   (if (resolve name)
     `(do)
     (list* 'defprotocol name body)))