diff options
author | Tom Faulhaber <git_net@infolace.com> | 2009-12-10 23:58:25 -0800 |
---|---|---|
committer | Tom Faulhaber <git_net@infolace.com> | 2009-12-10 23:58:25 -0800 |
commit | eb73c54687a9ed63dc939bbe886170f4a47455ed (patch) | |
tree | 54a60cf03e5bf6757aa7fe92ce70fe5d97d60e30 | |
parent | 74c5bf10a5e92c2f2ee83d09eb15938914f95fbe (diff) |
Remove the translation of (meta x) to ^x in code dispatch, since the ^x form is being deprecated in 1.1
-rw-r--r-- | src/clojure/contrib/pprint/dispatch.clj | 5 | ||||
-rw-r--r-- | src/clojure/contrib/test_contrib/pprint/pretty.clj | 5 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/clojure/contrib/pprint/dispatch.clj b/src/clojure/contrib/pprint/dispatch.clj index a473dbc3..82db8746 100644 --- a/src/clojure/contrib/pprint/dispatch.clj +++ b/src/clojure/contrib/pprint/dispatch.clj @@ -1,4 +1,4 @@ -;;; dispatch.clj -- part of the pretty printer for Clojure +;; dispatch.clj -- part of the pretty printer for Clojure ;; by Tom Faulhaber ;; April 3, 2009 @@ -42,8 +42,9 @@ ;;; :keyword, \char, or ""). The notable exception is #() which is special-cased. (def reader-macros - {'quote "'", 'clojure.core/meta "^", 'clojure.core/deref "@", + {'quote "'", 'clojure.core/deref "@", 'var "#'", 'clojure.core/unquote "~"}) + (defn pprint-reader-macro [alis] (let [#^String macro-char (reader-macros (first alis))] (when (and macro-char (= 2 (count alis))) diff --git a/src/clojure/contrib/test_contrib/pprint/pretty.clj b/src/clojure/contrib/test_contrib/pprint/pretty.clj index f51b172f..01e7c87e 100644 --- a/src/clojure/contrib/test_contrib/pprint/pretty.clj +++ b/src/clojure/contrib/test_contrib/pprint/pretty.clj @@ -116,11 +116,6 @@ Usage: *hello* "(map #(first %) [[1 2 3] [4 5 6] [7]])" (with-pprint-dispatch *code-dispatch* - (write (read-string "^#'first") - :stream nil)) - "^#'first" - - (with-pprint-dispatch *code-dispatch* (write (read-string "@@(ref (ref 1))") :stream nil)) "@@(ref (ref 1))" |