CLJS-2880: cl-format octal and Unicode character directives fail

alexisvincent · May 29, 2020 · 39709c9 · 39709c9
1 parent 790bcbf
commit 39709c9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/main/cljs/cljs/pprint.cljs b/src/main/cljs/cljs/pprint.cljs
@@ -1362,8 +1362,8 @@ http://www.lispworks.com/documentation/HyperSpec/Body/22_c.htm"
 (defn- readable-character [params navigator offsets]
   (let [[c navigator] (next-arg navigator)]
     (condp = (:char-format params)
-      \o (cl-format true "\\o~3, '0o" (char-code c))
-      \u (cl-format true "\\u~4, '0x" (char-code c))
+      \o (cl-format true "\\o~3,'0o" (char-code c))
+      \u (cl-format true "\\u~4,'0x" (char-code c))
       nil (print-char c))
     navigator))
 

diff --git a/src/test/cljs/cljs/pprint_test.cljs b/src/test/cljs/cljs/pprint_test.cljs
@@ -1087,6 +1087,13 @@ Usage: *hello*
 "
   )
 
+(deftest test-cljs-2880
+  (are [expected format]
+    (= expected (with-out-str (cl-format true format \a)))
+    "\\a" "~@c"
+    "\\o141" "~'o@c"
+    "\\u0061" "~'u@c"))
+
 (deftest test-cljs-2881
   (are [expected ch]
     (= expected (with-out-str (cl-format true "~@c" ch)))