fix: EOF col number for numbers

bronsa · bronsa · commit e496dedde59b · 2025-03-10T11:46:56.000Z
diff --git a/src/main/cljs/cljs/tools/reader.cljs b/src/main/cljs/cljs/tools/reader.cljs
@@ -276,7 +276,8 @@
          ch (read-char rdr)]
     (if (or (whitespace? ch) (macros ch) (nil? ch))
       (let [s (str sb)]
-        (unread rdr ch)
+        (when-not (nil? ch)
+          (unread rdr ch))
         (or (match-number s)
             (err/throw-invalid-number rdr s)))
       (recur (doto sb (.append ch)) (read-char rdr)))))
diff --git a/src/main/cljs/cljs/tools/reader/edn.cljs b/src/main/cljs/cljs/tools/reader/edn.cljs
@@ -211,7 +211,8 @@
          ch (read-char rdr)]
     (if (or (whitespace? ch) (macros ch) (nil? ch))
       (let [s (str sb)]
-        (unread rdr ch)
+        (when-not (nil? ch)
+          (unread rdr ch))
         (or (match-number s)
             (err/throw-invalid-number rdr s)))
       (recur (doto sb (.append ch)) (read-char rdr)))))
diff --git a/src/main/clojure/clojure/tools/reader.clj b/src/main/clojure/clojure/tools/reader.clj
@@ -266,7 +266,7 @@
          ch (read-char rdr)]
     (if (or (whitespace? ch) (macros ch) (nil? ch))
       (let [s (str sb)]
-        (unread rdr ch)
+        (when ch (unread rdr ch))
         (or (match-number s)
             (err/throw-invalid-number rdr s)))
       (recur (doto sb (.append ch)) (read-char rdr)))))
diff --git a/src/main/clojure/clojure/tools/reader/edn.clj b/src/main/clojure/clojure/tools/reader/edn.clj
@@ -209,7 +209,7 @@
          ch (read-char rdr)]
     (if (or (whitespace? ch) (macros ch) (nil? ch))
       (let [s (str sb)]
-        (unread rdr ch)
+        (when ch (unread rdr ch))
         (or (match-number s)
             (err/throw-invalid-number rdr s)))
       (recur (doto sb (.append ch)) (read-char rdr)))))
