diff options
| -rw-r--r-- | src/clj/clojure/core.clj | 4 | ||||
| -rw-r--r-- | src/clj/clojure/java/shell.clj | 11 | ||||
| -rw-r--r-- | test/clojure/test_clojure/other_functions.clj | 6 |
3 files changed, 9 insertions, 12 deletions
diff --git a/src/clj/clojure/core.clj b/src/clj/clojure/core.clj index d1b4b8e4..65b3bc2d 100644 --- a/src/clj/clojure/core.clj +++ b/src/clj/clojure/core.clj @@ -1222,11 +1222,11 @@ (. rev (rseq))) (defn name - "Returns the name String of a symbol or keyword." + "Returns the name String of a string, symbol or keyword." {:tag String :added "1.0"} [^clojure.lang.Named x] - (. x (getName))) + (if (string? x) x (. x (getName)))) (defn namespace "Returns the namespace String of a symbol or keyword, or nil if not present." diff --git a/src/clj/clojure/java/shell.clj b/src/clj/clojure/java/shell.clj index e8a8427b..11d908a5 100644 --- a/src/clj/clojure/java/shell.clj +++ b/src/clj/clojure/java/shell.clj @@ -52,21 +52,12 @@ collecting its stdout"} [cmd opts] (split-with string? args)] [cmd (merge default-opts (apply hash-map opts))])) -(defn- as-env-key - "Helper so that callers can use symbols, keywords, or strings - when building an environment map." - [arg] - (cond - (symbol? arg) (name arg) - (keyword? arg) (name arg) - (string? arg) arg)) - (defn- as-env-string "Helper so that callers can pass a Clojure map for the :env to sh." [arg] (cond (nil? arg) nil - (map? arg) (into-array String (map (fn [[k v]] (str (as-env-key k) "=" v)) arg)) + (map? arg) (into-array String (map (fn [[k v]] (str (name k) "=" v)) arg)) true arg)) (defn sh diff --git a/test/clojure/test_clojure/other_functions.clj b/test/clojure/test_clojure/other_functions.clj index 43214921..575ac9fb 100644 --- a/test/clojure/test_clojure/other_functions.clj +++ b/test/clojure/test_clojure/other_functions.clj @@ -44,6 +44,12 @@ (> 5 0) true )) +(deftest test-name + (are [x y] (= x (name y)) + "foo" :foo + "bar" 'bar + "quux" "quux")) + ; time assert comment doc ; partial |