Skip to:

  1. Skip to Jira Navigation
  2. Skip to Side Navigation
  3. Skip to Main Content

Allow EdnReader to read foo// (CLJ-873 for EdnReader)

Description

The patch that has been applied in 1.6 for https://clojure.atlassian.net/browse/CLJ-873#icft=CLJ-873 predated the introduction of EdnReader, as such it only patched LispReader.

This patch makes the same change to allow foo// in EdnReader, and removes two constants in clojure.lang.RT that are not needed anymore after this patch.

To reproduce:

user=> (require 'clojure.edn) user=> (defn / [& x] 42) user=> (clojure.edn/read-string "(user// 4 2)") RuntimeException Invalid token: user// clojure.lang.Util.runtimeException (Util.java:219)

Approach: copy changes from LispReader in CLJ-873. After:

user=> (require 'clojure.edn) nil user=> (defn / [& x] 42) WARNING: / already refers to: #'clojure.core// in namespace: user, being replaced by: #'user// #'user// user=> (clojure.edn/read-string "(user// 4 2)") (user// 4 2)

Patch: 0001-Fix-CLJ-873-for-EdnReader-too.patch

Screened by: Alex Miller

Environment

None

Attachments

2
  • 25 Oct 2013, 08:05 PM
  • 29 Jul 2013, 04:21 AM

Activity

Show:

Alex MillerOctober 31, 2013 at 10:51 PM

Switching back to prior patch.

Alex MillerOctober 31, 2013 at 10:48 PM

Andy you are uncanny - I was just on my way to update this. slightly smiling face

Andy FingerhutOctober 31, 2013 at 10:37 PM

With the undoing of the change for https://clojure.atlassian.net/browse/CLJ-1252#icft=CLJ-1252 earlier today, the patch 0001-Fix-CLJ-873-for-EdnReader-too.patch applies cleanly again, and clj-1238-2.diff no longer does.

Alex MillerOctober 25, 2013 at 8:05 PM

Updated patch to apply cleanly to master as of Oct 25, 2013.

Andy FingerhutOctober 25, 2013 at 6:27 PM

I've not looked into details yet, but screened 0001-Fix-CLJ-873-for-EdnReader-too.patch fails to apply cleanly as of Oct 25, 2013 latest Clojure master.

Completed

Details

Assignee

Reporter

Labels

Approval

Ok

Patch

Code

Priority

Affects versions

Fix versions

Created July 29, 2013 at 4:21 AM
Updated November 23, 2013 at 1:06 AM
Resolved November 23, 2013 at 1:06 AM

Flag notifications