From dd7d616121f0c40363727468869d42e3920a01e3 Mon Sep 17 00:00:00 2001 From: Alexander Taggart Date: Fri, 27 May 2011 11:38:56 -0700 Subject: [PATCH] Fix CLJ-797: Longs print-dup as literal instead of read-eval on Long constructor. --- src/clj/clojure/core_print.clj | 2 +- test/clojure/test_clojure/printer.clj | 4 ++-- test/clojure/test_clojure/protocols.clj | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/clj/clojure/core_print.clj b/src/clj/clojure/core_print.clj index 4d3dda3..e484521 100644 --- a/src/clj/clojure/core_print.clj +++ b/src/clj/clojure/core_print.clj @@ -259,7 +259,7 @@ nil) (defmethod print-dup java.lang.Character [c w] (print-method c w)) -(defmethod print-dup java.lang.Integer [o w] (print-method o w)) +(defmethod print-dup java.lang.Long [o w] (print-method o w)) (defmethod print-dup java.lang.Double [o w] (print-method o w)) (defmethod print-dup clojure.lang.Ratio [o w] (print-method o w)) (defmethod print-dup java.math.BigDecimal [o w] (print-method o w)) diff --git a/test/clojure/test_clojure/printer.clj b/test/clojure/test_clojure/printer.clj index 82dfcae..1f6627f 100644 --- a/test/clojure/test_clojure/printer.clj +++ b/test/clojure/test_clojure/printer.clj @@ -84,7 +84,7 @@ (deftest print-dup-expected (are [x s] (= s (binding [*print-dup* true] (print-str x))) -; 1 "1" + 1 "1" 1.0 "1.0" 1N "1N" (java.math.BigInteger. "1") "1BIGINT" @@ -95,7 +95,7 @@ (deftest print-dup-readable-literal (are [form] (let [x form] (= x (binding [*print-dup* true *read-eval* false] (read-string (print-str x))))) -; 1 + 1 1.0 1N 1BIGINT diff --git a/test/clojure/test_clojure/protocols.clj b/test/clojure/test_clojure/protocols.clj index 05965f5..f62291c 100644 --- a/test/clojure/test_clojure/protocols.clj +++ b/test/clojure/test_clojure/protocols.clj @@ -376,11 +376,11 @@ (let [r (RecordToTestPrinting. 1 2)] (is (= "#clojure.test_clojure.protocols.RecordToTestPrinting{:a 1, :b 2}" (pr-str r))) - (is (= "#clojure.test_clojure.protocols.RecordToTestPrinting[#=(java.lang.Long. \"1\"), #=(java.lang.Long. \"2\")]" + (is (= "#clojure.test_clojure.protocols.RecordToTestPrinting[1, 2]" (binding [*print-dup* true] (pr-str r)))) - (is (= "#clojure.test_clojure.protocols.RecordToTestPrinting{:a #=(java.lang.Long. \"1\"), :b #=(java.lang.Long. \"2\")}" + (is (= "#clojure.test_clojure.protocols.RecordToTestPrinting{:a 1, :b 2}" (binding [*print-dup* true *verbose-defrecords* true] (pr-str r)))) - (is (= "#clojure.test_clojure.protocols.TypeToTestLiterals[#=(java.lang.Long. \"42\")]" + (is (= "#clojure.test_clojure.protocols.TypeToTestLiterals[42]" (binding [*print-dup* true] (pr-str (TypeToTestLiterals. 42)))))))) (defrecord RecordToTestLongHint [^long a]) -- 1.7.3.5