Replace '-' with '_' when converting ns-sym into file-path

amalloy · Jan 7, 2012 · ef807a7 · ef807a7
1 parent b43ab68
commit ef807a7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/project.clj b/project.clj
@@ -3,8 +3,9 @@
   :dependencies [[org.clojure/clojure "1.3.0"]
 
                  [org.clojure/data.json "0.1.1"] ;; OK - reflection warnings
-                 [org.clojure/core.match "0.2.0-alpha8"] ;;ArityException
-                 [org.clojure/data.finger-tree "0.0.1"] ;;NPE
+                 [org.clojure/core.match "0.2.0-alpha8"] ;; OK
+                 [org.clojure/data.finger-tree "0.0.1"] ;; OK, private macros are reported
+                                                        ;; as never used. Bug in eastwood.
                  [org.clojure/tools.logging "0.2.3"] ;; OK
                  [org.clojure/java.jdbc "0.1.1"] ;; OK, using deprecated replicate + naked use.
                  [org.clojure/data.csv "0.1.0"] ;; OK

diff --git a/src/analyze/core.clj b/src/analyze/core.clj
@@ -95,7 +95,7 @@
 (defmethod Expr->map Compiler$LetFnExpr
   [^Compiler$LetFnExpr expr env]
   (let [body (Expr->map (.body expr) env)
-        binding-inits (-> (doall (map BindingInit->vec (.bindingInits expr)))
+        binding-inits (-> (doall (map BindingInit->vec (.bindingInits expr) (repeat env)))
                         vec)]
     {:op :letfn
      :env env

diff --git a/src/eastwood/core.clj b/src/eastwood/core.clj
@@ -8,6 +8,7 @@
 (defn- analyze [ns-sym]
   (let [source-file (-> (name ns-sym)
                         (string/replace "." "/")
+                        (string/replace "-" "_")
                         (str ".clj"))]
     (analyze/analyze-path source-file ns-sym)))