From f954705c1290110b2012d3010cee75745be97944 Mon Sep 17 00:00:00 2001 From: Nicola Mometto Date: Mon, 22 Oct 2018 14:38:58 +0200 Subject: [PATCH 01/97] update Changelog --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8528cea8..7363cb3f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,8 @@ Changelog ======================================== -* Release 1.3.1 on ? - * Changes to read+string 2-arity to match new clojure arity (CLJ-2358) +* Release 1.3.1 on 22 Oct 2018 + * Changes to read+string 2-arity to match new clojure arity (#CLJ-2358) + * Fix buffer overflow when reading files with consecutive carriage returns (#TRDR-54) * Release 1.3.0 on 5 Jul 2018 * Fix private var warning in cljs impl * Release 1.3.0-alpha3 on 25 Feb 2018 From c83773f7aa33f171f23021d9d050a076c1452c84 Mon Sep 17 00:00:00 2001 From: "Hudson @ build.clojure.org" Date: Mon, 22 Oct 2018 07:39:53 -0500 Subject: [PATCH 02/97] [maven-release-plugin] prepare release tools.reader-1.3.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 5a6e9e8d..044f4391 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 tools.reader - 1.3.1-SNAPSHOT + 1.3.1 tools.reader A Clojure reader in Clojure https://github.com/clojure/tools.reader @@ -127,6 +127,6 @@ scm:git:git://github.com/clojure/tools.reader.git scm:git:git://github.com/clojure/tools.reader.git http://github.com/clojure/tools.reader - HEAD + tools.reader-1.3.1 From fcdb603bdbcd8886d90ecccb5aee04a6ac5f1572 Mon Sep 17 00:00:00 2001 From: "Hudson @ build.clojure.org" Date: Mon, 22 Oct 2018 07:39:53 -0500 Subject: [PATCH 03/97] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 044f4391..35c044fc 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 tools.reader - 1.3.1 + 1.3.2-SNAPSHOT tools.reader A Clojure reader in Clojure https://github.com/clojure/tools.reader @@ -127,6 +127,6 @@ scm:git:git://github.com/clojure/tools.reader.git scm:git:git://github.com/clojure/tools.reader.git http://github.com/clojure/tools.reader - tools.reader-1.3.1 + HEAD From 2cfe73a4804d78a758ac21875eb016ed0aac3980 Mon Sep 17 00:00:00 2001 From: Nicola Mometto Date: Mon, 22 Oct 2018 14:40:53 +0200 Subject: [PATCH 04/97] update README --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index d7ddaf97..e4c1e13e 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ YourKit is kindly supporting open source projects with its full-featured Java Pr Releases and Dependency Information ======================================== -Latest stable release: 1.3.0 +Latest stable release: 1.3.1 * [All Released Versions](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.clojure%22%20AND%20a%3A%22tools.reader%22) @@ -42,13 +42,13 @@ Latest stable release: 1.3.0 [clj](https://clojure.org/guides/getting_started) dependency information: ```clojure -org.clojure/tools.reader {:mvn/version "1.3.0"} +org.clojure/tools.reader {:mvn/version "1.3.1"} ``` [Leiningen](https://github.com/technomancy/leiningen) dependency information: ```clojure -[org.clojure/tools.reader "1.3.0"] +[org.clojure/tools.reader "1.3.1"] ``` [Maven](http://maven.apache.org/) dependency information: @@ -56,7 +56,7 @@ org.clojure/tools.reader {:mvn/version "1.3.0"} org.clojure tools.reader - 1.2.1 + 1.3.1 ``` From c83bf9cd691f7cfb75f46215a24dc8d52fdfed3f Mon Sep 17 00:00:00 2001 From: Nicola Mometto Date: Fri, 26 Oct 2018 12:19:38 +0200 Subject: [PATCH 05/97] fix wrong argument name --- src/main/cljs/cljs/tools/reader.cljs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/cljs/cljs/tools/reader.cljs b/src/main/cljs/cljs/tools/reader.cljs index c33d18d7..ff7cc715 100644 --- a/src/main/cljs/cljs/tools/reader.cljs +++ b/src/main/cljs/cljs/tools/reader.cljs @@ -944,13 +944,13 @@ ([stream eof-error? eof-value] (read+string stream eof-error? eof-value false)) ([stream eof-error? eof-value recursive?] (let [buf (fn [reader] (str (:buffer @(.-frames stream)))) - offset (count (buf reader)) + offset (count (buf stream)) o (log-source stream (read stream eof-error? eof-value recursive?)) - s (.trim (subs (buf reader) offset))] + s (.trim (subs (buf stream) offset))] [o s])) ([opts stream] (let [buf (fn [reader] (str (:buffer @(.-frames stream)))) - offset (count (buf reader)) + offset (count (buf stream)) o (log-source stream (read opts stream)) - s (.trim (subs (buf reader) offset))] + s (.trim (subs (buf stream) offset))] [o s]))) From a4071a309d857b64886125662ada9814dee4c70f Mon Sep 17 00:00:00 2001 From: Nicola Mometto Date: Fri, 26 Oct 2018 12:25:32 +0200 Subject: [PATCH 06/97] remove non-existent recursive? path --- src/main/cljs/cljs/tools/reader.cljs | 5 ++--- src/main/clojure/clojure/tools/reader.clj | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/cljs/cljs/tools/reader.cljs b/src/main/cljs/cljs/tools/reader.cljs index ff7cc715..3cbb8fda 100644 --- a/src/main/cljs/cljs/tools/reader.cljs +++ b/src/main/cljs/cljs/tools/reader.cljs @@ -941,11 +941,10 @@ "Like read, and taking the same args. reader must be a SourceLoggingPushbackReader. Returns a vector containing the object read and the (whitespace-trimmed) string read." ([stream] (read+string stream true nil)) - ([stream eof-error? eof-value] (read+string stream eof-error? eof-value false)) - ([stream eof-error? eof-value recursive?] + ([stream eof-error? eof-value] (let [buf (fn [reader] (str (:buffer @(.-frames stream)))) offset (count (buf stream)) - o (log-source stream (read stream eof-error? eof-value recursive?)) + o (log-source stream (read stream eof-error? eof-value)) s (.trim (subs (buf stream) offset))] [o s])) ([opts stream] diff --git a/src/main/clojure/clojure/tools/reader.clj b/src/main/clojure/clojure/tools/reader.clj index 872d9188..81944834 100644 --- a/src/main/clojure/clojure/tools/reader.clj +++ b/src/main/clojure/clojure/tools/reader.clj @@ -1010,9 +1010,8 @@ Returns a vector containing the object read and the (whitespace-trimmed) string read." ([] (read+string (source-logging-push-back-reader *in*))) ([stream] (read+string stream true nil)) - ([stream eof-error? eof-value] (read+string stream eof-error? eof-value false)) - ([^SourceLoggingPushbackReader stream eof-error? eof-value recursive?] - (let [o (log-source stream (read stream eof-error? eof-value recursive?)) + ([^SourceLoggingPushbackReader stream eof-error? eof-value] + (let [o (log-source stream (read stream eof-error? eof-value)) s (.trim (str (:buffer @(.source-log-frames stream))))] [o s])) ([opts ^SourceLoggingPushbackReader stream] From 20f6d05127a7d56535e9dacf42d0cf9396d4e74c Mon Sep 17 00:00:00 2001 From: "Hudson @ build.clojure.org" Date: Fri, 26 Oct 2018 05:37:37 -0500 Subject: [PATCH 07/97] [maven-release-plugin] prepare release tools.reader-1.3.2 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 35c044fc..a22f8487 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 tools.reader - 1.3.2-SNAPSHOT + 1.3.2 tools.reader A Clojure reader in Clojure https://github.com/clojure/tools.reader @@ -127,6 +127,6 @@ scm:git:git://github.com/clojure/tools.reader.git scm:git:git://github.com/clojure/tools.reader.git http://github.com/clojure/tools.reader - HEAD + tools.reader-1.3.2 From d706a3753fac935d49def69c6cf5686914288149 Mon Sep 17 00:00:00 2001 From: "Hudson @ build.clojure.org" Date: Fri, 26 Oct 2018 05:37:37 -0500 Subject: [PATCH 08/97] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a22f8487..e1f5ac45 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 tools.reader - 1.3.2 + 1.3.3-SNAPSHOT tools.reader A Clojure reader in Clojure https://github.com/clojure/tools.reader @@ -127,6 +127,6 @@ scm:git:git://github.com/clojure/tools.reader.git scm:git:git://github.com/clojure/tools.reader.git http://github.com/clojure/tools.reader - tools.reader-1.3.2 + HEAD From 9745c851d0eb454ac2ba217320e1de2bea894a26 Mon Sep 17 00:00:00 2001 From: Nicola Mometto Date: Fri, 26 Oct 2018 17:08:17 +0200 Subject: [PATCH 09/97] TRDR-56: refer to `cljs.tools.reader` instead of `clojure.tools.reader` in docstrings --- src/main/cljs/cljs/tools/reader.cljs | 12 ++++++------ src/main/cljs/cljs/tools/reader/edn.cljs | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/cljs/cljs/tools/reader.cljs b/src/main/cljs/cljs/tools/reader.cljs index 3cbb8fda..22f49fe7 100644 --- a/src/main/cljs/cljs/tools/reader.cljs +++ b/src/main/cljs/cljs/tools/reader.cljs @@ -914,10 +914,10 @@ :eof - on eof, return value unless :eofthrow, then throw. if not specified, will throw - To read data structures only, use clojure.tools.reader.edn/read + To read data structures only, use cljs.tools.reader.edn/read - Note that the function signature of clojure.tools.reader/read and - clojure.tools.reader.edn/read is not the same for eof-handling" + Note that the function signature of cljs.tools.reader/read and + cljs.tools.reader.edn/read is not the same for eof-handling" {:arglists '([reader] [opts reader] [reader eof-error? eof-value])} ([reader] (read reader true nil)) ([{eof :eof :as opts :or {eof :eofthrow}} reader] (read* reader (= eof :eofthrow) eof nil opts (to-array []))) @@ -927,10 +927,10 @@ "Reads one object from the string s. Returns nil when s is nil or empty. - To read data structures only, use clojure.tools.reader.edn/read-string + To read data structures only, use cljs.tools.reader.edn/read-string - Note that the function signature of clojure.tools.reader/read-string and - clojure.tools.reader.edn/read-string is not the same for eof-handling" + Note that the function signature of cljs.tools.reader/read-string and + cljs.tools.reader.edn/read-string is not the same for eof-handling" ([s] (read-string {} s)) ([opts s] diff --git a/src/main/cljs/cljs/tools/reader/edn.cljs b/src/main/cljs/cljs/tools/reader/edn.cljs index ae122fde..756128eb 100644 --- a/src/main/cljs/cljs/tools/reader/edn.cljs +++ b/src/main/cljs/cljs/tools/reader/edn.cljs @@ -385,7 +385,7 @@ Reads data in the edn format (subset of Clojure data): http://edn-format.org - clojure.tools.reader.edn/read doesn't depend on dynamic Vars, all configuration + cljs.tools.reader.edn/read doesn't depend on dynamic Vars, all configuration is done by passing an opt map. opts is a map that can include the following keys: @@ -441,7 +441,7 @@ Reads data in the edn format (subset of Clojure data): http://edn-format.org - opts is a map as per clojure.tools.reader.edn/read" + opts is a map as per cljs.tools.reader.edn/read" ([s] (read-string {:eof nil} s)) ([opts s] (when (and s (not= s "")) From 12779d7d23e65bc8b33e7e9c0f15b813e829b40a Mon Sep 17 00:00:00 2001 From: Nicola Mometto Date: Sun, 28 Oct 2018 14:50:22 +0100 Subject: [PATCH 10/97] update Readme --- CHANGELOG.md | 2 ++ README.md | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7363cb3f..2af8571c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ Changelog ======================================== +* Release 1.3.2 on 26 Oct 2016 + * Fix bad arities for read+string * Release 1.3.1 on 22 Oct 2018 * Changes to read+string 2-arity to match new clojure arity (#CLJ-2358) * Fix buffer overflow when reading files with consecutive carriage returns (#TRDR-54) diff --git a/README.md b/README.md index e4c1e13e..fb65d7fd 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ YourKit is kindly supporting open source projects with its full-featured Java Pr Releases and Dependency Information ======================================== -Latest stable release: 1.3.1 +Latest stable release: 1.3.2 * [All Released Versions](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.clojure%22%20AND%20a%3A%22tools.reader%22) @@ -42,13 +42,13 @@ Latest stable release: 1.3.1 [clj](https://clojure.org/guides/getting_started) dependency information: ```clojure -org.clojure/tools.reader {:mvn/version "1.3.1"} +org.clojure/tools.reader {:mvn/version "1.3.2"} ``` [Leiningen](https://github.com/technomancy/leiningen) dependency information: ```clojure -[org.clojure/tools.reader "1.3.1"] +[org.clojure/tools.reader "1.3.2"] ``` [Maven](http://maven.apache.org/) dependency information: @@ -56,7 +56,7 @@ org.clojure/tools.reader {:mvn/version "1.3.1"} org.clojure tools.reader - 1.3.1 + 1.3.2 ``` From 5cb691bf55e30fe2ff6a42f296e028cd5b22fdb8 Mon Sep 17 00:00:00 2001 From: Sean Corfield Date: Sun, 28 Apr 2019 15:34:18 -0700 Subject: [PATCH 11/97] Update links in CONTRIBUTING.md --- CONTRIBUTING.md | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f800311d..245ed1ad 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,12 +3,10 @@ This is a [Clojure contrib] project. Under the Clojure contrib [guidelines], this project cannot accept pull requests. All patches must be submitted via [JIRA]. -See [Contributing] and the [FAQ] on the Clojure development [wiki] for +See [Contributing] on the Clojure website for more information on how to contribute. -[Clojure contrib]: http://dev.clojure.org/display/doc/Clojure+Contrib -[Contributing]: http://dev.clojure.org/display/community/Contributing -[FAQ]: http://dev.clojure.org/display/community/Contributing+FAQ +[Clojure contrib]: https://clojure.org/community/contrib_libs +[Contributing]: https://clojure.org/community/contributing [JIRA]: http://dev.clojure.org/jira/browse/TRDR -[guidelines]: http://dev.clojure.org/display/community/Guidelines+for+Clojure+Contrib+committers -[wiki]: http://dev.clojure.org/ +[guidelines]: https://clojure.org/community/contrib_howto From ecf43d48309130318a0539af9f292bfcac50a2a3 Mon Sep 17 00:00:00 2001 From: Sean Corfield Date: Wed, 19 Jun 2019 21:44:41 -0700 Subject: [PATCH 12/97] Correct 1.3.2 release date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2af8571c..61c772e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ Changelog ======================================== -* Release 1.3.2 on 26 Oct 2016 +* Release 1.3.2 on 26 Oct 2018 * Fix bad arities for read+string * Release 1.3.1 on 22 Oct 2018 * Changes to read+string 2-arity to match new clojure arity (#CLJ-2358) From 97d5dac9f5e7c04d8fe6c4a52cd77d6ced560d76 Mon Sep 17 00:00:00 2001 From: Nicola Mometto Date: Thu, 11 Jul 2019 15:11:01 +0100 Subject: [PATCH 13/97] style change --- src/main/clojure/clojure/tools/reader.clj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/clojure/clojure/tools/reader.clj b/src/main/clojure/clojure/tools/reader.clj index 81944834..e814cd47 100644 --- a/src/main/clojure/clojure/tools/reader.clj +++ b/src/main/clojure/clojure/tools/reader.clj @@ -24,7 +24,8 @@ PersistentVector IRecord Namespace) clojure.tools.reader.reader_types.SourceLoggingPushbackReader java.lang.reflect.Constructor - (java.util regex.Pattern List LinkedList))) + java.util.regex.Pattern + (java.util List LinkedList))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; helpers From 63691080cf4011421016866926f264ece692a4f6 Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Thu, 18 Jun 2020 13:13:05 -0500 Subject: [PATCH 14/97] add LICENSE text file --- LICENSE | 205 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 205 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..e246f6a2 --- /dev/null +++ b/LICENSE @@ -0,0 +1,205 @@ +Eclipse Public License - v 1.0 + +THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC +LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM +CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + +1. DEFINITIONS + +"Contribution" means: + +a) in the case of the initial Contributor, the initial code and documentation + distributed under this Agreement, and +b) in the case of each subsequent Contributor: + i) changes to the Program, and + ii) additions to the Program; + + where such changes and/or additions to the Program originate from and are + distributed by that particular Contributor. A Contribution 'originates' + from a Contributor if it was added to the Program by such Contributor + itself or anyone acting on such Contributor's behalf. Contributions do not + include additions to the Program which: (i) are separate modules of + software distributed in conjunction with the Program under their own + license agreement, and (ii) are not derivative works of the Program. + +"Contributor" means any person or entity that distributes the Program. + +"Licensed Patents" mean patent claims licensable by a Contributor which are +necessarily infringed by the use or sale of its Contribution alone or when +combined with the Program. + +"Program" means the Contributions distributed in accordance with this +Agreement. + +"Recipient" means anyone who receives the Program under this Agreement, +including all Contributors. + +2. GRANT OF RIGHTS + a) Subject to the terms of this Agreement, each Contributor hereby grants + Recipient a non-exclusive, worldwide, royalty-free copyright license to + reproduce, prepare derivative works of, publicly display, publicly + perform, distribute and sublicense the Contribution of such Contributor, + if any, and such derivative works, in source code and object code form. + b) Subject to the terms of this Agreement, each Contributor hereby grants + Recipient a non-exclusive, worldwide, royalty-free patent license under + Licensed Patents to make, use, sell, offer to sell, import and otherwise + transfer the Contribution of such Contributor, if any, in source code and + object code form. This patent license shall apply to the combination of + the Contribution and the Program if, at the time the Contribution is + added by the Contributor, such addition of the Contribution causes such + combination to be covered by the Licensed Patents. The patent license + shall not apply to any other combinations which include the Contribution. + No hardware per se is licensed hereunder. + c) Recipient understands that although each Contributor grants the licenses + to its Contributions set forth herein, no assurances are provided by any + Contributor that the Program does not infringe the patent or other + intellectual property rights of any other entity. Each Contributor + disclaims any liability to Recipient for claims brought by any other + entity based on infringement of intellectual property rights or + otherwise. As a condition to exercising the rights and licenses granted + hereunder, each Recipient hereby assumes sole responsibility to secure + any other intellectual property rights needed, if any. For example, if a + third party patent license is required to allow Recipient to distribute + the Program, it is Recipient's responsibility to acquire that license + before distributing the Program. + d) Each Contributor represents that to its knowledge it has sufficient + copyright rights in its Contribution, if any, to grant the copyright + license set forth in this Agreement. + +3. REQUIREMENTS + +A Contributor may choose to distribute the Program in object code form under +its own license agreement, provided that: + + a) it complies with the terms and conditions of this Agreement; and + b) its license agreement: + i) effectively disclaims on behalf of all Contributors all warranties + and conditions, express and implied, including warranties or + conditions of title and non-infringement, and implied warranties or + conditions of merchantability and fitness for a particular purpose; + ii) effectively excludes on behalf of all Contributors all liability for + damages, including direct, indirect, special, incidental and + consequential damages, such as lost profits; + iii) states that any provisions which differ from this Agreement are + offered by that Contributor alone and not by any other party; and + iv) states that source code for the Program is available from such + Contributor, and informs licensees how to obtain it in a reasonable + manner on or through a medium customarily used for software exchange. + +When the Program is made available in source code form: + + a) it must be made available under this Agreement; and + b) a copy of this Agreement must be included with each copy of the Program. + Contributors may not remove or alter any copyright notices contained + within the Program. + +Each Contributor must identify itself as the originator of its Contribution, +if +any, in a manner that reasonably allows subsequent Recipients to identify the +originator of the Contribution. + +4. COMMERCIAL DISTRIBUTION + +Commercial distributors of software may accept certain responsibilities with +respect to end users, business partners and the like. While this license is +intended to facilitate the commercial use of the Program, the Contributor who +includes the Program in a commercial product offering should do so in a manner +which does not create potential liability for other Contributors. Therefore, +if a Contributor includes the Program in a commercial product offering, such +Contributor ("Commercial Contributor") hereby agrees to defend and indemnify +every other Contributor ("Indemnified Contributor") against any losses, +damages and costs (collectively "Losses") arising from claims, lawsuits and +other legal actions brought by a third party against the Indemnified +Contributor to the extent caused by the acts or omissions of such Commercial +Contributor in connection with its distribution of the Program in a commercial +product offering. The obligations in this section do not apply to any claims +or Losses relating to any actual or alleged intellectual property +infringement. In order to qualify, an Indemnified Contributor must: +a) promptly notify the Commercial Contributor in writing of such claim, and +b) allow the Commercial Contributor to control, and cooperate with the +Commercial Contributor in, the defense and any related settlement +negotiations. The Indemnified Contributor may participate in any such claim at +its own expense. + +For example, a Contributor might include the Program in a commercial product +offering, Product X. That Contributor is then a Commercial Contributor. If +that Commercial Contributor then makes performance claims, or offers +warranties related to Product X, those performance claims and warranties are +such Commercial Contributor's responsibility alone. Under this section, the +Commercial Contributor would have to defend claims against the other +Contributors related to those performance claims and warranties, and if a +court requires any other Contributor to pay any damages as a result, the +Commercial Contributor must pay those damages. + +5. NO WARRANTY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR +IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, +NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each +Recipient is solely responsible for determining the appropriateness of using +and distributing the Program and assumes all risks associated with its +exercise of rights under this Agreement , including but not limited to the +risks and costs of program errors, compliance with applicable laws, damage to +or loss of data, programs or equipment, and unavailability or interruption of +operations. + +6. DISCLAIMER OF LIABILITY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY +CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION +LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE +EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY +OF SUCH DAMAGES. + +7. GENERAL + +If any provision of this Agreement is invalid or unenforceable under +applicable law, it shall not affect the validity or enforceability of the +remainder of the terms of this Agreement, and without further action by the +parties hereto, such provision shall be reformed to the minimum extent +necessary to make such provision valid and enforceable. + +If Recipient institutes patent litigation against any entity (including a +cross-claim or counterclaim in a lawsuit) alleging that the Program itself +(excluding combinations of the Program with other software or hardware) +infringes such Recipient's patent(s), then such Recipient's rights granted +under Section 2(b) shall terminate as of the date such litigation is filed. + +All Recipient's rights under this Agreement shall terminate if it fails to +comply with any of the material terms or conditions of this Agreement and does +not cure such failure in a reasonable period of time after becoming aware of +such noncompliance. If all Recipient's rights under this Agreement terminate, +Recipient agrees to cease use and distribution of the Program as soon as +reasonably practicable. However, Recipient's obligations under this Agreement +and any licenses granted by Recipient relating to the Program shall continue +and survive. + +Everyone is permitted to copy and distribute copies of this Agreement, but in +order to avoid inconsistency the Agreement is copyrighted and may only be +modified in the following manner. The Agreement Steward reserves the right to +publish new versions (including revisions) of this Agreement from time to +time. No one other than the Agreement Steward has the right to modify this +Agreement. The Eclipse Foundation is the initial Agreement Steward. The +Eclipse Foundation may assign the responsibility to serve as the Agreement +Steward to a suitable separate entity. Each new version of the Agreement will +be given a distinguishing version number. The Program (including +Contributions) may always be distributed subject to the version of the +Agreement under which it was received. In addition, after a new version of the +Agreement is published, Contributor may elect to distribute the Program +(including its Contributions) under the new version. Except as expressly +stated in Sections 2(a) and 2(b) above, Recipient receives no rights or +licenses to the intellectual property of any Contributor under this Agreement, +whether expressly, by implication, estoppel or otherwise. All rights in the +Program not expressly granted under this Agreement are reserved. + +This Agreement is governed by the laws of the State of New York and the +intellectual property laws of the United States of America. No party to this +Agreement will bring a legal action under this Agreement more than one year +after the cause of action arose. Each party waives its rights to a jury trial in +any resulting litigation. + + From 7efe1f1f78da71dbdef7c3d3600b78ff2b42116a Mon Sep 17 00:00:00 2001 From: Nicola Mometto Date: Sun, 9 Aug 2020 18:05:26 +0100 Subject: [PATCH 15/97] [TRDR-62] Fix tagged literals returning non truthy values in EDN reader --- src/main/cljs/cljs/tools/reader/edn.cljs | 4 +--- src/main/cljs/cljs/tools/reader/impl/errors.cljs | 6 ------ src/main/clojure/clojure/tools/reader.clj | 2 +- src/main/clojure/clojure/tools/reader/edn.clj | 4 +--- src/main/clojure/clojure/tools/reader/impl/errors.clj | 6 ------ 5 files changed, 3 insertions(+), 19 deletions(-) diff --git a/src/main/cljs/cljs/tools/reader/edn.cljs b/src/main/cljs/cljs/tools/reader/edn.cljs index 756128eb..926cf95e 100644 --- a/src/main/cljs/cljs/tools/reader/edn.cljs +++ b/src/main/cljs/cljs/tools/reader/edn.cljs @@ -69,9 +69,7 @@ (if-let [ch (read-char rdr)] (if-let [dm (dispatch-macros ch)] (dm rdr ch opts) - (if-let [obj (read-tagged (doto rdr (unread ch)) ch opts)] - obj - (err/throw-no-dispatch rdr ch))) + (read-tagged (doto rdr (unread ch)) ch opts)) (err/throw-eof-at-dispatch rdr))) (defn- read-unmatched-delimiter diff --git a/src/main/cljs/cljs/tools/reader/impl/errors.cljs b/src/main/cljs/cljs/tools/reader/impl/errors.cljs index 104e6625..4b1a6cfc 100644 --- a/src/main/cljs/cljs/tools/reader/impl/errors.cljs +++ b/src/main/cljs/cljs/tools/reader/impl/errors.cljs @@ -111,9 +111,6 @@ (defn throw-eof-at-dispatch [rdr] (eof-error rdr "Unexpected EOF while reading dispatch character.")) -(defn throw-bad-dispatch [rdr ch] - (reader-error rdr "No dispatch macro for " ch ".")) - (defn throw-unmatch-delimiter [rdr ch] (reader-error rdr "Unmatched delimiter " ch ".")) @@ -121,9 +118,6 @@ (let [init (case kind :regex "#\"" :string \")] (eof-error rdr "Unexpected EOF reading " (name kind) " starting " (apply str init start) "."))) -(defn throw-no-dispatch [rdr ch] - (throw-bad-dispatch rdr ch)) - (defn throw-invalid-unicode-char[rdr token] (reader-error rdr diff --git a/src/main/clojure/clojure/tools/reader.clj b/src/main/clojure/clojure/tools/reader.clj index e814cd47..2d0dd324 100644 --- a/src/main/clojure/clojure/tools/reader.clj +++ b/src/main/clojure/clojure/tools/reader.clj @@ -70,7 +70,7 @@ (if-let [ch (read-char rdr)] (if-let [dm (dispatch-macros ch)] (dm rdr ch opts pending-forms) - (read-tagged (doto rdr (unread ch)) ch opts pending-forms)) ;; ctor reader is implemented as a tagged literal + (read-tagged (doto rdr (unread ch)) ch opts pending-forms)) ;; ctor reader is implemented as a taggedx literal (err/throw-eof-at-dispatch rdr))) (defn- read-unmatched-delimiter diff --git a/src/main/clojure/clojure/tools/reader/edn.clj b/src/main/clojure/clojure/tools/reader/edn.clj index 05e0e696..2a8b77de 100644 --- a/src/main/clojure/clojure/tools/reader/edn.clj +++ b/src/main/clojure/clojure/tools/reader/edn.clj @@ -70,9 +70,7 @@ (if-let [ch (read-char rdr)] (if-let [dm (dispatch-macros ch)] (dm rdr ch opts) - (if-let [obj (read-tagged (doto rdr (unread ch)) ch opts)] - obj - (err/throw-no-dispatch rdr ch))) + (read-tagged (doto rdr (unread ch)) ch opts)) (err/throw-eof-at-dispatch rdr))) (defn- read-unmatched-delimiter diff --git a/src/main/clojure/clojure/tools/reader/impl/errors.clj b/src/main/clojure/clojure/tools/reader/impl/errors.clj index 4c3fa2cd..b7e59ba3 100644 --- a/src/main/clojure/clojure/tools/reader/impl/errors.clj +++ b/src/main/clojure/clojure/tools/reader/impl/errors.clj @@ -105,9 +105,6 @@ (defn throw-eof-at-dispatch [rdr] (eof-error rdr "Unexpected EOF while reading dispatch character.")) -(defn throw-bad-dispatch [rdr ch] - (reader-error rdr "No dispatch macro for " ch ".")) - (defn throw-unmatch-delimiter [rdr ch] (reader-error rdr "Unmatched delimiter " ch ".")) @@ -115,9 +112,6 @@ (let [init (case kind :regex "#\"" :string \")] (eof-error rdr "Unexpected EOF reading " (name kind) " starting " (apply str init start) "."))) -(defn throw-no-dispatch [rdr ch] - (throw-bad-dispatch rdr ch)) - (defn throw-invalid-unicode-char[rdr token] (throw (illegal-arg-error rdr From 319bb6ada45721f1a413fbf47592252ff89eaa69 Mon Sep 17 00:00:00 2001 From: "Hudson @ build.clojure.org" Date: Sun, 9 Aug 2020 12:08:41 -0500 Subject: [PATCH 16/97] [maven-release-plugin] prepare release tools.reader-1.3.3 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e1f5ac45..1ab2245f 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 tools.reader - 1.3.3-SNAPSHOT + 1.3.3 tools.reader A Clojure reader in Clojure https://github.com/clojure/tools.reader @@ -127,6 +127,6 @@ scm:git:git://github.com/clojure/tools.reader.git scm:git:git://github.com/clojure/tools.reader.git http://github.com/clojure/tools.reader - HEAD + tools.reader-1.3.3 From 0b3ad9d7cfe61ad5e61c1d37a8d45c53a651f6e3 Mon Sep 17 00:00:00 2001 From: "Hudson @ build.clojure.org" Date: Sun, 9 Aug 2020 12:08:41 -0500 Subject: [PATCH 17/97] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 1ab2245f..270bf074 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 tools.reader - 1.3.3 + 1.3.4-SNAPSHOT tools.reader A Clojure reader in Clojure https://github.com/clojure/tools.reader @@ -127,6 +127,6 @@ scm:git:git://github.com/clojure/tools.reader.git scm:git:git://github.com/clojure/tools.reader.git http://github.com/clojure/tools.reader - tools.reader-1.3.3 + HEAD From b13ac965dfcd8198154ac77e36992f32abaee51a Mon Sep 17 00:00:00 2001 From: Nicola Mometto Date: Sun, 9 Aug 2020 18:11:15 +0100 Subject: [PATCH 18/97] Update README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index fb65d7fd..5b44ee28 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ YourKit is kindly supporting open source projects with its full-featured Java Pr Releases and Dependency Information ======================================== -Latest stable release: 1.3.2 +Latest stable release: 1.3.3 * [All Released Versions](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.clojure%22%20AND%20a%3A%22tools.reader%22) @@ -42,13 +42,13 @@ Latest stable release: 1.3.2 [clj](https://clojure.org/guides/getting_started) dependency information: ```clojure -org.clojure/tools.reader {:mvn/version "1.3.2"} +org.clojure/tools.reader {:mvn/version "1.3.3"} ``` [Leiningen](https://github.com/technomancy/leiningen) dependency information: ```clojure -[org.clojure/tools.reader "1.3.2"] +[org.clojure/tools.reader "1.3.3"] ``` [Maven](http://maven.apache.org/) dependency information: @@ -56,7 +56,7 @@ org.clojure/tools.reader {:mvn/version "1.3.2"} org.clojure tools.reader - 1.3.2 + 1.3.3 ``` From 44ee6d2b5d2e1f2ef9bddffc22f4872328334185 Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Tue, 1 Sep 2020 13:31:50 -0500 Subject: [PATCH 19/97] remove dead link --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 5b44ee28..f078e879 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,6 @@ org.clojure/tools.reader {:mvn/version "1.3.3"} API Index ======================================== -* [CrossClj Documentation](http://crossclj.info/doc/org.clojure/tools.reader/lastest/index.html) * [API index](http://clojure.github.io/tools.reader) Developer Information From 51f4ec901afe3220bf672e066849052aecdb99e5 Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Tue, 1 Sep 2020 13:34:51 -0500 Subject: [PATCH 20/97] update changelog for 1.3.3 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 61c772e4..b524cf3d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ Changelog ======================================== + +* Release 1.3.3 on 9 Aug 2020 + * Fix tagged literals returning non truthy values in EDN reader (#TRDR-62) + * Refer to `cljs.tools.reader` instead of `clojure.tools.reader` in docstrings (#TRDR-56) * Release 1.3.2 on 26 Oct 2018 * Fix bad arities for read+string * Release 1.3.1 on 22 Oct 2018 From c8981dd6ac7a560db85321b03278d03caf2aed39 Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Thu, 12 Nov 2020 23:14:37 +0100 Subject: [PATCH 21/97] TRDR-63: fix reading (+) with tools.reader.edn from java.io.PushbackReader --- src/main/clojure/clojure/tools/reader/edn.clj | 7 ++++--- src/test/clojure/clojure/tools/reader_edn_test.clj | 8 ++++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/clojure/clojure/tools/reader/edn.clj b/src/main/clojure/clojure/tools/reader/edn.clj index 2a8b77de..54b238f6 100644 --- a/src/main/clojure/clojure/tools/reader/edn.clj +++ b/src/main/clojure/clojure/tools/reader/edn.clj @@ -52,14 +52,15 @@ :else (loop [sb (StringBuilder.) - ch (do (unread rdr initch) initch)] + ch initch] (if (or (whitespace? ch) (macro-terminating? ch) (nil? ch)) - (str sb) + (do (unread rdr ch) + (str sb)) (if (not-constituent? ch) (err/throw-bad-char rdr kind ch) - (recur (doto sb (.append (read-char rdr))) (peek-char rdr)))))))) + (recur (doto sb (.append ch)) (read-char rdr)))))))) diff --git a/src/test/clojure/clojure/tools/reader_edn_test.clj b/src/test/clojure/clojure/tools/reader_edn_test.clj index c859ea34..4d70edb1 100644 --- a/src/test/clojure/clojure/tools/reader_edn_test.clj +++ b/src/test/clojure/clojure/tools/reader_edn_test.clj @@ -1,7 +1,7 @@ (ns clojure.tools.reader-edn-test (:refer-clojure :exclude [read-string]) - (:use [clojure.tools.reader.edn :only [read-string]] - [clojure.test :only [deftest is]]) + (:use [clojure.tools.reader.edn :as edn :only [read-string]] + [clojure.test :only [deftest is testing]]) (:import clojure.lang.BigInt)) (load "common_tests") @@ -32,3 +32,7 @@ (let [my-unknown (fn [tag val] {:unknown-tag tag :value val})] (is (= {:unknown-tag 'foo :value 'bar} (read-string {:default my-unknown} "#foo bar"))))) + +(deftest pushback-reader-test + (testing "TRDR-63" + (is (= '(+) (edn/read (java.io.PushbackReader. (java.io.StringReader. "(+)"))))))) From 6a2b7fbd65a53468953543bdd876290e19808259 Mon Sep 17 00:00:00 2001 From: Nicola Mometto Date: Sat, 14 Nov 2020 13:57:31 +0000 Subject: [PATCH 22/97] style: use arg --- src/main/cljs/cljs/tools/reader.cljs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/cljs/cljs/tools/reader.cljs b/src/main/cljs/cljs/tools/reader.cljs index 22f49fe7..6eadba7a 100644 --- a/src/main/cljs/cljs/tools/reader.cljs +++ b/src/main/cljs/cljs/tools/reader.cljs @@ -942,13 +942,13 @@ Returns a vector containing the object read and the (whitespace-trimmed) string read." ([stream] (read+string stream true nil)) ([stream eof-error? eof-value] - (let [buf (fn [reader] (str (:buffer @(.-frames stream)))) + (let [buf (fn [stream] (str (:buffer @(.-frames stream)))) offset (count (buf stream)) o (log-source stream (read stream eof-error? eof-value)) s (.trim (subs (buf stream) offset))] [o s])) ([opts stream] - (let [buf (fn [reader] (str (:buffer @(.-frames stream)))) + (let [buf (fn [stream] (str (:buffer @(.-frames stream)))) offset (count (buf stream)) o (log-source stream (read opts stream)) s (.trim (subs (buf stream) offset))] From bebdbc81924ebf967583284bd31d3853e920f230 Mon Sep 17 00:00:00 2001 From: "Hudson @ build.clojure.org" Date: Sat, 14 Nov 2020 11:39:19 -0600 Subject: [PATCH 23/97] [maven-release-plugin] prepare release tools.reader-1.3.4 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 270bf074..dbe7bcd9 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 tools.reader - 1.3.4-SNAPSHOT + 1.3.4 tools.reader A Clojure reader in Clojure https://github.com/clojure/tools.reader @@ -127,6 +127,6 @@ scm:git:git://github.com/clojure/tools.reader.git scm:git:git://github.com/clojure/tools.reader.git http://github.com/clojure/tools.reader - HEAD + tools.reader-1.3.4 From 2af9a4248e617d43f44721b5402875ea08ddd5df Mon Sep 17 00:00:00 2001 From: "Hudson @ build.clojure.org" Date: Sat, 14 Nov 2020 11:39:19 -0600 Subject: [PATCH 24/97] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index dbe7bcd9..c9e6278a 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 tools.reader - 1.3.4 + 1.3.5-SNAPSHOT tools.reader A Clojure reader in Clojure https://github.com/clojure/tools.reader @@ -127,6 +127,6 @@ scm:git:git://github.com/clojure/tools.reader.git scm:git:git://github.com/clojure/tools.reader.git http://github.com/clojure/tools.reader - tools.reader-1.3.4 + HEAD From 99c627f74f9f99bebe69ddb3c0044b322f59f3fb Mon Sep 17 00:00:00 2001 From: Nicola Mometto Date: Sat, 14 Nov 2020 18:15:12 +0000 Subject: [PATCH 25/97] update readme, changelog --- CHANGELOG.md | 3 ++- README.md | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b524cf3d..500d947d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ Changelog ======================================== - +* Release 1.3.4 on 14 Nov 2020 + * Fix double unread when reading from a java.io.PushbackReader (#TRDR-63) * Release 1.3.3 on 9 Aug 2020 * Fix tagged literals returning non truthy values in EDN reader (#TRDR-62) * Refer to `cljs.tools.reader` instead of `clojure.tools.reader` in docstrings (#TRDR-56) diff --git a/README.md b/README.md index f078e879..fb62d40e 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ YourKit is kindly supporting open source projects with its full-featured Java Pr Releases and Dependency Information ======================================== -Latest stable release: 1.3.3 +Latest stable release: 1.3.4 * [All Released Versions](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.clojure%22%20AND%20a%3A%22tools.reader%22) @@ -42,13 +42,13 @@ Latest stable release: 1.3.3 [clj](https://clojure.org/guides/getting_started) dependency information: ```clojure -org.clojure/tools.reader {:mvn/version "1.3.3"} +org.clojure/tools.reader {:mvn/version "1.3.4"} ``` [Leiningen](https://github.com/technomancy/leiningen) dependency information: ```clojure -[org.clojure/tools.reader "1.3.3"] +[org.clojure/tools.reader "1.3.4"] ``` [Maven](http://maven.apache.org/) dependency information: @@ -56,7 +56,7 @@ org.clojure/tools.reader {:mvn/version "1.3.3"} org.clojure tools.reader - 1.3.3 + 1.3.4 ``` From 3e829d75130bd4258b4690d2a077bbbdf1106874 Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Wed, 20 Jan 2021 15:17:51 -0600 Subject: [PATCH 26/97] update to latest parent pom and use clojure.version property --- pom.xml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c9e6278a..ca982f3d 100644 --- a/pom.xml +++ b/pom.xml @@ -98,14 +98,19 @@ org.clojure pom.contrib - 0.2.2 + 1.0.0 + + 1.5.1 + + + org.clojure clojure - 1.5.1 + ${clojure.version} org.clojure From c234f745a06a53bda7d22b5a566d9679a47d3357 Mon Sep 17 00:00:00 2001 From: Nicola Mometto Date: Wed, 20 Jan 2021 22:18:18 +0000 Subject: [PATCH 27/97] TRDR-64: fix confusing error message for malformed keywords --- src/main/cljs/cljs/tools/reader/edn.cljs | 4 ++-- src/main/clojure/clojure/tools/reader/edn.clj | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/cljs/cljs/tools/reader/edn.cljs b/src/main/cljs/cljs/tools/reader/edn.cljs index 926cf95e..c4cd914e 100644 --- a/src/main/cljs/cljs/tools/reader/edn.cljs +++ b/src/main/cljs/cljs/tools/reader/edn.cljs @@ -271,9 +271,9 @@ (let [ns (s 0) name (s 1)] (if (identical? \: (nth token 0)) - (err/throw-invalid reader :keyword token) ;; no ::keyword in edn + (err/throw-invalid reader :keyword (str \: token)) ;; no ::keyword in edn (keyword ns name))) - (err/throw-invalid reader :keyword token))) + (err/throw-invalid reader :keyword (str \: token)))) (err/throw-single-colon reader)))) (defn- wrapping-reader diff --git a/src/main/clojure/clojure/tools/reader/edn.clj b/src/main/clojure/clojure/tools/reader/edn.clj index 54b238f6..3e9ec868 100644 --- a/src/main/clojure/clojure/tools/reader/edn.clj +++ b/src/main/clojure/clojure/tools/reader/edn.clj @@ -271,9 +271,9 @@ (let [^String ns (s 0) ^String name (s 1)] (if (identical? \: (nth token 0)) - (err/throw-invalid reader :keyword token) ; No ::kw in edn. + (err/throw-invalid reader :keyword (str \: token)) ; No ::kw in edn. (keyword ns name))) - (err/throw-invalid reader :keyword token))) + (err/throw-invalid reader :keyword (str \: token)))) (err/throw-single-colon reader)))) (defn- wrapping-reader From 55c151fa7d4455d50faead63c4e22c57473264cd Mon Sep 17 00:00:00 2001 From: "Hudson @ build.clojure.org" Date: Wed, 3 Feb 2021 12:55:59 -0600 Subject: [PATCH 28/97] [maven-release-plugin] prepare release tools.reader-1.3.5 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ca982f3d..cc839001 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 tools.reader - 1.3.5-SNAPSHOT + 1.3.5 tools.reader A Clojure reader in Clojure https://github.com/clojure/tools.reader @@ -132,6 +132,6 @@ scm:git:git://github.com/clojure/tools.reader.git scm:git:git://github.com/clojure/tools.reader.git http://github.com/clojure/tools.reader - HEAD + tools.reader-1.3.5 From d4d132658635a965ed85e5d857b955c97cbd0eea Mon Sep 17 00:00:00 2001 From: "Hudson @ build.clojure.org" Date: Wed, 3 Feb 2021 12:55:59 -0600 Subject: [PATCH 29/97] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index cc839001..0edfb157 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 tools.reader - 1.3.5 + 1.3.6-SNAPSHOT tools.reader A Clojure reader in Clojure https://github.com/clojure/tools.reader @@ -132,6 +132,6 @@ scm:git:git://github.com/clojure/tools.reader.git scm:git:git://github.com/clojure/tools.reader.git http://github.com/clojure/tools.reader - tools.reader-1.3.5 + HEAD From 0b984f95ba9f7e89afb441b4995e27c87b378a4d Mon Sep 17 00:00:00 2001 From: Vincent Cantin Date: Mon, 15 Feb 2021 02:13:46 +0800 Subject: [PATCH 30/97] TRDR-66: Inconsistent spacing in error messages + small typos - Fixes the spacing in the error messages, - Removes redundant `str` in illegal-arg-error parameters - there is (apply str msgs) in the function already, - Fixes small typos in comment and doc. --- .../cljs/cljs/tools/reader/impl/errors.cljs | 10 ++++---- src/main/clojure/clojure/tools/reader.clj | 6 ++--- .../clojure/tools/reader/impl/errors.clj | 25 +++++++++---------- 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/src/main/cljs/cljs/tools/reader/impl/errors.cljs b/src/main/cljs/cljs/tools/reader/impl/errors.cljs index 4b1a6cfc..4e8c5c16 100644 --- a/src/main/cljs/cljs/tools/reader/impl/errors.cljs +++ b/src/main/cljs/cljs/tools/reader/impl/errors.cljs @@ -146,10 +146,10 @@ rdr "Invalid unicode literal. Unicode literals should be " expected - "characters long. " - "value suppled is " + "characters long. " + "Value supplied is " actual - "characters long.")) + " characters long.")) (defn throw-invalid-character-literal[rdr token] (reader-error rdr "Invalid character literal \\u" token ".")) @@ -157,7 +157,7 @@ (defn throw-invalid-octal-len[rdr token] (reader-error rdr - "Invalid octal escape sequence in a character literal:" + "Invalid octal escape sequence in a character literal: " token ". Octal escape sequences must be 3 or fewer digits.")) @@ -202,7 +202,7 @@ rdr "Feature cannot be " (i/inspect feature) - " Features must be keywords.")) + ". Features must be keywords.")) (defn throw-ns-map-no-map [rdr ns-name] (reader-error rdr "Namespaced map with namespace " ns-name " does not specify a map.")) diff --git a/src/main/clojure/clojure/tools/reader.clj b/src/main/clojure/clojure/tools/reader.clj index 2d0dd324..5264110e 100644 --- a/src/main/clojure/clojure/tools/reader.clj +++ b/src/main/clojure/clojure/tools/reader.clj @@ -70,7 +70,7 @@ (if-let [ch (read-char rdr)] (if-let [dm (dispatch-macros ch)] (dm rdr ch opts pending-forms) - (read-tagged (doto rdr (unread ch)) ch opts pending-forms)) ;; ctor reader is implemented as a taggedx literal + (read-tagged (doto rdr (unread ch)) ch opts pending-forms)) ;; ctor reader is implemented as a tagged literal (err/throw-eof-at-dispatch rdr))) (defn- read-unmatched-delimiter @@ -830,7 +830,7 @@ (loop [i 0] (if (>= i ctors-num) (err/reader-error rdr "Unexpected number of constructor arguments to " (str class) - ": got" numargs) + ": got " numargs) (if (== (count (.getParameterTypes ^Constructor (aget all-ctors i))) numargs) (Reflector/invokeConstructor class entries) @@ -951,7 +951,7 @@ (defn read "Reads the first object from an IPushbackReader or a java.io.PushbackReader. Returns the object read. If EOF, throws if eof-error? is true. - Otherwise returns sentinel. If no stream is providen, *in* will be used. + Otherwise returns sentinel. If no stream is provided, *in* will be used. Opts is a persistent map with valid keys: :read-cond - :allow to process reader conditionals, or diff --git a/src/main/clojure/clojure/tools/reader/impl/errors.clj b/src/main/clojure/clojure/tools/reader/impl/errors.clj index b7e59ba3..38cbe252 100644 --- a/src/main/clojure/clojure/tools/reader/impl/errors.clj +++ b/src/main/clojure/clojure/tools/reader/impl/errors.clj @@ -84,7 +84,7 @@ (defn throw-invalid-unicode-literal [rdr token] (throw (illegal-arg-error rdr - (str "Invalid unicode literal: \\" token ".")))) + "Invalid unicode literal: \\" token "."))) (defn throw-invalid-unicode-escape [rdr ch] (reader-error @@ -115,28 +115,27 @@ (defn throw-invalid-unicode-char[rdr token] (throw (illegal-arg-error rdr - (str "Invalid unicode character \\" token ".")))) + "Invalid unicode character \\" token "."))) (defn throw-invalid-unicode-digit-in-token [rdr ch token] (throw (illegal-arg-error rdr - (str "Invalid digit " ch " in unicode character \\" token ".")))) + "Invalid digit " ch " in unicode character \\" token "."))) (defn throw-invalid-unicode-digit[rdr ch] (throw (illegal-arg-error rdr - (str "Invalid digit " ch " in unicode character.")))) + "Invalid digit " ch " in unicode character."))) (defn throw-invalid-unicode-len[rdr actual expected] (throw (illegal-arg-error rdr - (str - "Invalid unicode literal. Unicode literals should be " - expected - "characters long. " - "value suppled is " - actual - "characters long.")))) + "Invalid unicode literal. Unicode literals should be " + expected + " characters long. " + "Value supplied is " + actual + " characters long."))) (defn throw-invalid-character-literal[rdr token] (reader-error rdr "Invalid character literal \\u" token ".")) @@ -144,7 +143,7 @@ (defn throw-invalid-octal-len[rdr token] (reader-error rdr - "Invalid octal escape sequence in a character literal:" + "Invalid octal escape sequence in a character literal: " token ". Octal escape sequences must be 3 or fewer digits.")) @@ -187,7 +186,7 @@ rdr "Feature cannot be " (i/inspect feature) - " Features must be keywords.")) + ". Features must be keywords.")) (defn throw-ns-map-no-map [rdr ns-name] (reader-error rdr "Namespaced map with namespace " ns-name " does not specify a map.")) From d721510c37eb4d28247dd90c07c3c9a7dc3820ed Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Thu, 18 Feb 2021 09:56:08 -0600 Subject: [PATCH 31/97] update old links --- CONTRIBUTING.md | 2 +- README.md | 21 +++++++++------------ src/main/clojure/clojure/tools/reader.clj | 4 ++-- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 245ed1ad..b3db9fc3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -8,5 +8,5 @@ more information on how to contribute. [Clojure contrib]: https://clojure.org/community/contrib_libs [Contributing]: https://clojure.org/community/contributing -[JIRA]: http://dev.clojure.org/jira/browse/TRDR +[JIRA]: https://clojure.atlassian.net/browse/TRDR [guidelines]: https://clojure.org/community/contrib_howto diff --git a/README.md b/README.md index fb62d40e..b0af729c 100644 --- a/README.md +++ b/README.md @@ -28,15 +28,15 @@ YourKit has given an open source license for their profiler, greatly simplifying YourKit is kindly supporting open source projects with its full-featured Java Profiler. YourKit, LLC is the creator of innovative and intelligent tools for profiling Java and .NET applications. Take a look at YourKit's leading software products: -* YourKit Java Profiler and -* YourKit .NET Profiler. +* YourKit Java Profiler and +* YourKit .NET Profiler. Releases and Dependency Information ======================================== Latest stable release: 1.3.4 -* [All Released Versions](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.clojure%22%20AND%20a%3A%22tools.reader%22) +* [All Released Versions](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.clojure%22%20AND%20a%3A%22tools.reader%22) * [Development Snapshot Versions](https://oss.sonatype.org/index.html#nexus-search;gav%7Eorg.clojure%7Etools.reader%7E%7E%7E) @@ -50,7 +50,7 @@ org.clojure/tools.reader {:mvn/version "1.3.4"} ```clojure [org.clojure/tools.reader "1.3.4"] ``` -[Maven](http://maven.apache.org/) dependency information: +[Maven](https://maven.apache.org/) dependency information: ```xml @@ -66,18 +66,15 @@ org.clojure/tools.reader {:mvn/version "1.3.4"} API Index ======================================== -* [API index](http://clojure.github.io/tools.reader) +* [API index](https://clojure.github.io/tools.reader) Developer Information ======================================== * [GitHub project](https://github.com/clojure/tools.reader) - -* [Bug Tracker](http://dev.clojure.org/jira/browse/TRDR) - -* [Continuous Integration](http://build.clojure.org/job/tools.reader/) - -* [Compatibility Test Matrix](http://build.clojure.org/job/tools.reader-test-matrix/) +* [Bug Tracker](https://clojure.atlassian.net/browse/TRDR) +* [Continuous Integration](https://build.clojure.org/job/tools.reader/) +* [Compatibility Test Matrix](https://build.clojure.org/job/tools.reader-test-matrix/) Example Usage ======================================== @@ -172,7 +169,7 @@ Differences from LispReader.java There are small differences from clojure.lang.LispReader: * `read` throws an `ex-info` for almost every exception, whereas `clojure.lang.LispReader/read` throws a `ReaderException` wrapping the causing exception. -* `read` is capable of reading literal tags containing periods, fixing [#CLJ-1100](http://dev.clojure.org/jira/browse/CLJ-1100) +* `read` is capable of reading literal tags containing periods, fixing [#CLJ-1100](https://clojure.atlassian.net/browse/CLJ-1100) * `clojure.tools.reader/read` checks if `clojure.tools.reader/*alias-map*` is bound, if that's the case, aliases will be resolved by querying it (must be a map), otherwhise (ns-aliases \*ns\*) will be used * `clojure.tools.reader/read` adds additional line/column info to symbols, vectors and maps when possible * `clojure.tools.reader.reader-types/read-line` has an additional arity with which is possible to specify the reader to read from diff --git a/src/main/clojure/clojure/tools/reader.clj b/src/main/clojure/clojure/tools/reader.clj index 5264110e..3fecdb66 100644 --- a/src/main/clojure/clojure/tools/reader.clj +++ b/src/main/clojure/clojure/tools/reader.clj @@ -674,8 +674,8 @@ ret)) (defn- syntax-quote-coll [type coll] - ;; We use sequence rather than seq here to fix http://dev.clojure.org/jira/browse/CLJ-1444 - ;; But because of http://dev.clojure.org/jira/browse/CLJ-1586 we still need to call seq on the form + ;; We use sequence rather than seq here to fix https://clojure.atlassian.net/browse/CLJ-1444 + ;; But because of https://clojure.atlassian.net/browse/CLJ-1586 we still need to call seq on the form (let [res (list 'clojure.core/sequence (list 'clojure.core/seq (cons 'clojure.core/concat From 145b1144102cae982ab251528affd729629a4c23 Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Thu, 15 Apr 2021 16:02:26 -0500 Subject: [PATCH 32/97] update parent pom version to latest --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0edfb157..60d1ee95 100644 --- a/pom.xml +++ b/pom.xml @@ -98,7 +98,7 @@ org.clojure pom.contrib - 1.0.0 + 1.1.0 From 6bc1352113f7154b6e47b7941ab55f0c5e90517b Mon Sep 17 00:00:00 2001 From: Nicola Mometto Date: Tue, 13 Jul 2021 18:24:49 +0100 Subject: [PATCH 33/97] TRDR-67: add loc info to namespaced map literals --- src/main/cljs/cljs/tools/reader.cljs | 20 +++++++++++++++----- src/main/clojure/clojure/tools/reader.clj | 18 ++++++++++++++---- 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/src/main/cljs/cljs/tools/reader.cljs b/src/main/cljs/cljs/tools/reader.cljs index 6eadba7a..6f627804 100644 --- a/src/main/cljs/cljs/tools/reader.cljs +++ b/src/main/cljs/cljs/tools/reader.cljs @@ -754,7 +754,8 @@ (defn- read-namespaced-map [rdr _ opts pending-forms] - (let [token (read-token rdr :namespaced-map (read-char rdr))] + (let [[start-line start-column] (starting-line-col-info rdr) + token (read-token rdr :namespaced-map (read-char rdr))] (if-let [ns (cond (= token ":") (ns-name *ns*) @@ -767,16 +768,25 @@ (let [ch (read-past whitespace? rdr)] (if (identical? ch \{) - (let [items (read-delimited :namespaced-map \} rdr opts pending-forms)] + (let [items (read-delimited :namespaced-map \} rdr opts pending-forms) + [end-line end-column] (ending-line-col-info rdr)] (when (odd? (count items)) (err/throw-odd-map rdr nil nil items)) (let [keys (namespace-keys (str ns) (take-nth 2 items)) vals (take-nth 2 (rest items))] (when-not (= (count (set keys)) (count keys)) (err/throw-dup-keys rdr :namespaced-map keys)) - (zipmap keys vals))) - (err/throw-ns-map-no-map rdr token))) - (err/throw-bad-ns rdr token)))) + (with-meta (zipmap keys vals) + (when start-line + (merge + (when-let [file (get-file-name rdr)] + {:file file}) + {:line start-line + :column start-column + :end-line end-line + :end-column end-column}))))) + (err/throw-ns-map-no-map rdr token))) + (err/throw-bad-ns rdr token)))) (defn- macros [ch] (case ch diff --git a/src/main/clojure/clojure/tools/reader.clj b/src/main/clojure/clojure/tools/reader.clj index 3fecdb66..2a230110 100644 --- a/src/main/clojure/clojure/tools/reader.clj +++ b/src/main/clojure/clojure/tools/reader.clj @@ -752,7 +752,8 @@ (defn- read-namespaced-map [rdr _ opts pending-forms] - (let [token (read-token rdr :namespaced-map (read-char rdr))] + (let [[start-line start-column] (starting-line-col-info rdr) + token (read-token rdr :namespaced-map (read-char rdr))] (if-let [ns (cond (= token ":") (ns-name *ns*) @@ -765,13 +766,22 @@ (let [ch (read-past whitespace? rdr)] (if (identical? ch \{) - (let [items (read-delimited :namespaced-map \} rdr opts pending-forms)] + (let [items (read-delimited :namespaced-map \} rdr opts pending-forms) + [end-line end-column] (ending-line-col-info rdr)] (when (odd? (count items)) (err/throw-odd-map rdr nil nil items)) (let [keys (take-nth 2 items) vals (take-nth 2 (rest items))] - - (RT/map (to-array (mapcat list (namespace-keys (str ns) keys) vals))))) + (with-meta + (RT/map (to-array (mapcat list (namespace-keys (str ns) keys) vals))) + (when start-line + (merge + (when-let [file (get-file-name rdr)] + {:file file}) + {:line start-line + :column start-column + :end-line end-line + :end-column end-column}))))) (err/throw-ns-map-no-map rdr token))) (err/throw-bad-ns rdr token)))) From fb185af411fa379e48e5d0a9e623b68f552d8c92 Mon Sep 17 00:00:00 2001 From: "Hudson @ build.clojure.org" Date: Tue, 13 Jul 2021 13:35:50 -0500 Subject: [PATCH 34/97] [maven-release-plugin] prepare release v1.3.6 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 60d1ee95..c72a2cad 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 tools.reader - 1.3.6-SNAPSHOT + 1.3.6 tools.reader A Clojure reader in Clojure https://github.com/clojure/tools.reader @@ -132,6 +132,6 @@ scm:git:git://github.com/clojure/tools.reader.git scm:git:git://github.com/clojure/tools.reader.git http://github.com/clojure/tools.reader - HEAD + v1.3.6 From 6f997d5d342d7692dd2ce8ff31c3e52583498af3 Mon Sep 17 00:00:00 2001 From: "Hudson @ build.clojure.org" Date: Tue, 13 Jul 2021 13:35:50 -0500 Subject: [PATCH 35/97] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c72a2cad..8bdc4333 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 tools.reader - 1.3.6 + 1.3.7-SNAPSHOT tools.reader A Clojure reader in Clojure https://github.com/clojure/tools.reader @@ -132,6 +132,6 @@ scm:git:git://github.com/clojure/tools.reader.git scm:git:git://github.com/clojure/tools.reader.git http://github.com/clojure/tools.reader - v1.3.6 + HEAD From 0040c5249691235d42c89cd54196bc1f8a4f1322 Mon Sep 17 00:00:00 2001 From: Nicola Mometto Date: Tue, 13 Jul 2021 22:32:54 +0100 Subject: [PATCH 36/97] update README --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index b0af729c..07dfb01f 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ YourKit is kindly supporting open source projects with its full-featured Java Pr Releases and Dependency Information ======================================== -Latest stable release: 1.3.4 +Latest stable release: 1.3.6 * [All Released Versions](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.clojure%22%20AND%20a%3A%22tools.reader%22) @@ -42,13 +42,13 @@ Latest stable release: 1.3.4 [clj](https://clojure.org/guides/getting_started) dependency information: ```clojure -org.clojure/tools.reader {:mvn/version "1.3.4"} +org.clojure/tools.reader {:mvn/version "1.3.6"} ``` [Leiningen](https://github.com/technomancy/leiningen) dependency information: ```clojure -[org.clojure/tools.reader "1.3.4"] +[org.clojure/tools.reader "1.3.6"] ``` [Maven](https://maven.apache.org/) dependency information: @@ -56,7 +56,7 @@ org.clojure/tools.reader {:mvn/version "1.3.4"} org.clojure tools.reader - 1.3.4 + 1.3.6 ``` From b7705c6ddc9029a5c1dcbceef6e53dbda9b67469 Mon Sep 17 00:00:00 2001 From: Nicola Mometto Date: Tue, 13 Jul 2021 22:34:43 +0100 Subject: [PATCH 37/97] update CHANGELOG --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 500d947d..9dd03e99 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ Changelog ======================================== + +* Release 1.3.5 on 13 Jul 2021 + * Add loc info to namespaced map literals (#TRDR-67) + * Fix inconsistent spacing and typos in error messages (#TRDR-66) +* Release 1.3.5 on 3 Feb 2021 + * Fix confusing error message for malformed keywords (#TRDR-64) * Release 1.3.4 on 14 Nov 2020 * Fix double unread when reading from a java.io.PushbackReader (#TRDR-63) * Release 1.3.3 on 9 Aug 2020 From 047bdd762dfe34ba2ddccdc8632921277a4a4d1d Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Wed, 14 Jul 2021 09:00:41 -0500 Subject: [PATCH 38/97] fix typo --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9dd03e99..9a963249 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ Changelog ======================================== -* Release 1.3.5 on 13 Jul 2021 +* Release 1.3.6 on 13 Jul 2021 * Add loc info to namespaced map literals (#TRDR-67) * Fix inconsistent spacing and typos in error messages (#TRDR-66) * Release 1.3.5 on 3 Feb 2021 From 3b0211b3504e9a8e321bfaa16fe6d5f517fa44be Mon Sep 17 00:00:00 2001 From: Nicola Mometto Date: Wed, 14 Jul 2021 15:24:55 +0100 Subject: [PATCH 39/97] add deps.edn --- .gitignore | 1 + deps.edn | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 deps.edn diff --git a/.gitignore b/.gitignore index d74cd6f8..d7f12503 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ .lein-deps-sum .lein-failures .lein-plugins +.cpcache diff --git a/deps.edn b/deps.edn new file mode 100644 index 00000000..d918b0fb --- /dev/null +++ b/deps.edn @@ -0,0 +1,2 @@ +{:deps {org.clojure/clojure {:mvn/version "1.10.3"}} + :paths ["src/main/clojure"]} From 6918abc8b3c009228790cf091097eb3037858ad6 Mon Sep 17 00:00:00 2001 From: Nicola Mometto Date: Tue, 14 Sep 2021 14:36:22 +0100 Subject: [PATCH 40/97] chore: rename test --- src/test/clojure/clojure/tools/common_tests.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/clojure/clojure/tools/common_tests.clj b/src/test/clojure/clojure/tools/common_tests.clj index ffc12d51..a2841621 100644 --- a/src/test/clojure/clojure/tools/common_tests.clj +++ b/src/test/clojure/clojure/tools/common_tests.clj @@ -249,6 +249,6 @@ (is (= {:tag "foo"} (meta (read-string "^\"foo\" 'bar")))) (is (= {:tag 'String} (meta (read-string "^String 'x"))))) -(deftest read-namespaced-map +(deftest read-namespaced-map' (is (= {:foo/bar 1 :baz 2} (read-string "#:foo{:bar 1 :_/baz 2}"))) (is (= '{foo/bar 1 :baz 2} (read-string "#:foo{bar 1 :_/baz 2}")))) From 7266705a63985a5021c3b4b0cccad4770fe74803 Mon Sep 17 00:00:00 2001 From: David Nolen Date: Thu, 30 Jun 2022 09:44:20 -0400 Subject: [PATCH 41/97] * add adv.edn * add cljs-test alias to deps.edn * several tests failing, around #inst & regex --- build/adv.edn | 5 +++++ deps.edn | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 build/adv.edn diff --git a/build/adv.edn b/build/adv.edn new file mode 100644 index 00000000..2a7adfeb --- /dev/null +++ b/build/adv.edn @@ -0,0 +1,5 @@ +{:main cljs.tools.test-runner + :optimizations :advanced + :output-to "target/test/tests-advanced.js" + :output-dir "target/test/out-advanced" + :parallel-build true} diff --git a/deps.edn b/deps.edn index d918b0fb..16a41319 100644 --- a/deps.edn +++ b/deps.edn @@ -1,2 +1,6 @@ {:deps {org.clojure/clojure {:mvn/version "1.10.3"}} - :paths ["src/main/clojure"]} + :paths ["src/main/clojure"] + :aliases + {:cljs-test {:extra-deps {org.clojure/clojurescript {:mvn/version "1.10.597"}} + :extra-paths ["src/main/cljs" "src/test/cljs"] + :main-opts ["-m" "cljs.main" "-v" "-co" "build/adv.edn" "-c"]}}} From 6c4d834febd0628291514d7425e96cc44a42a1ee Mon Sep 17 00:00:00 2001 From: David Nolen Date: Thu, 30 Jun 2022 12:57:36 -0400 Subject: [PATCH 42/97] add other build files, add more build aliases --- build/adv.edn | 3 ++- build/dev.edn | 6 ++++++ build/simp.edn | 7 +++++++ deps.edn | 8 +++++--- 4 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 build/dev.edn create mode 100644 build/simp.edn diff --git a/build/adv.edn b/build/adv.edn index 2a7adfeb..c4e0b78e 100644 --- a/build/adv.edn +++ b/build/adv.edn @@ -2,4 +2,5 @@ :optimizations :advanced :output-to "target/test/tests-advanced.js" :output-dir "target/test/out-advanced" - :parallel-build true} + :parallel-build true + :target :nodejs} diff --git a/build/dev.edn b/build/dev.edn new file mode 100644 index 00000000..e4498852 --- /dev/null +++ b/build/dev.edn @@ -0,0 +1,6 @@ +{:main cljs.tools.test-runner + :optimizations :none + :output-to "target/dev/out/main.js" + :output-dir "target/dev/out" + :parallel-build true + :target :nodejs} diff --git a/build/simp.edn b/build/simp.edn new file mode 100644 index 00000000..f960a885 --- /dev/null +++ b/build/simp.edn @@ -0,0 +1,7 @@ +{:main cljs.tools.test-runner + :optimizations :simple + :output-to "target/test/tests-simple.js" + :output-dir "target/test/out-simple" + :parallel-build true + :static-fns true + :target :nodejs} diff --git a/deps.edn b/deps.edn index 16a41319..272a2f72 100644 --- a/deps.edn +++ b/deps.edn @@ -1,6 +1,8 @@ {:deps {org.clojure/clojure {:mvn/version "1.10.3"}} :paths ["src/main/clojure"] :aliases - {:cljs-test {:extra-deps {org.clojure/clojurescript {:mvn/version "1.10.597"}} - :extra-paths ["src/main/cljs" "src/test/cljs"] - :main-opts ["-m" "cljs.main" "-v" "-co" "build/adv.edn" "-c"]}}} + {:cljs-test {:extra-deps {org.clojure/clojurescript {:mvn/version "1.11.60"}} + :extra-paths ["src/main/cljs" "src/test/cljs"]} + :cljs-repl {:main-opts ["-m" "cljs.main" "-v" "-co" "build/dev.edn" "-re" "node" "-r"]} + :cljs-adv {:main-opts ["-m" "cljs.main" "-v" "-co" "build/adv.edn" "-c"]} + :cljs-simp {:main-opts ["-m" "cljs.main" "-v" "-co" "build/simp.edn" "-c"]}}} From 8eb566b6ca1bb02439ebf29728562d42c4daa3e7 Mon Sep 17 00:00:00 2001 From: David Nolen Date: Thu, 30 Jun 2022 12:59:09 -0400 Subject: [PATCH 43/97] add test workflow --- .github/workflows/test.yaml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/workflows/test.yaml diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml new file mode 100644 index 00000000..6905fe7c --- /dev/null +++ b/.github/workflows/test.yaml @@ -0,0 +1,22 @@ +name: Tests +on: [push] + +jobs: + # Runtime Tests + runtime-test: + name: Runtime Tests + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - uses: DeLaGuardo/setup-clojure@3.1 + with: + tools-deps: '1.10.1.763' + + - name: Build tests + run: clojure -M:cljs-test:cljs-adv + + - name: Run tests + run: | + node target/test/tests-advanced.js | tee test-out.txt + grep -qxF '0 failures, 0 errors.' test-out.txt From b3294232d5dd4dd18405f1d31f0e485ace5d0c19 Mon Sep 17 00:00:00 2001 From: Nicola Mometto Date: Wed, 6 Jul 2022 17:10:14 +0100 Subject: [PATCH 44/97] fix cljs test under advanced compilation --- src/test/cljs/cljs/tools/reader_test.cljs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/cljs/cljs/tools/reader_test.cljs b/src/test/cljs/cljs/tools/reader_test.cljs index 82ebd793..583be0bf 100644 --- a/src/test/cljs/cljs/tools/reader_test.cljs +++ b/src/test/cljs/cljs/tools/reader_test.cljs @@ -145,8 +145,8 @@ (deftest read-regex (is (= (str #"(?i)abc") (str (read-string "#\"(?i)abc\"")))) - (is (= (str #"\[\]?(\")\\") - (str (read-string "#\"\\[\\]?(\\\")\\\\\""))))) + (is (= (re-matches #"\[\]?(\")\\" "[]\"\\") + (re-matches (read-string "#\"\\[\\]?(\\\")\\\\\"") "[]\"\\")))) (deftest read-quote (is (= ''foo (read-string "'foo")))) From 6107e1078c9a0c6bacf23717b2437f25cfed50e9 Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Fri, 18 Nov 2022 13:48:00 +0100 Subject: [PATCH 45/97] TRDR-69: reset source-logging-reader's buffer like in Clojure --- src/main/cljs/cljs/tools/reader.cljs | 12 ++++++------ src/test/cljs/cljs/tools/reader_test.cljs | 9 +++++++++ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/main/cljs/cljs/tools/reader.cljs b/src/main/cljs/cljs/tools/reader.cljs index 6f627804..4e6922b5 100644 --- a/src/main/cljs/cljs/tools/reader.cljs +++ b/src/main/cljs/cljs/tools/reader.cljs @@ -952,14 +952,14 @@ Returns a vector containing the object read and the (whitespace-trimmed) string read." ([stream] (read+string stream true nil)) ([stream eof-error? eof-value] - (let [buf (fn [stream] (str (:buffer @(.-frames stream)))) - offset (count (buf stream)) + (let [buf (:buffer @(.-frames stream)) + _ (.clear buf) o (log-source stream (read stream eof-error? eof-value)) - s (.trim (subs (buf stream) offset))] + s (.trim (str buf))] [o s])) ([opts stream] - (let [buf (fn [stream] (str (:buffer @(.-frames stream)))) - offset (count (buf stream)) + (let [buf (:buffer @(.-frames stream)) + _ (.clear buf) o (log-source stream (read opts stream)) - s (.trim (subs (buf stream) offset))] + s (.trim (str buf))] [o s]))) diff --git a/src/test/cljs/cljs/tools/reader_test.cljs b/src/test/cljs/cljs/tools/reader_test.cljs index 583be0bf..b9a854bc 100644 --- a/src/test/cljs/cljs/tools/reader_test.cljs +++ b/src/test/cljs/cljs/tools/reader_test.cljs @@ -325,3 +325,12 @@ (is (instance? PersistentArrayMap a)) (is (= b {:a 1 :b 2 :c 3 :d 4 :e 5 :f 6 :g 7 :h 8 :i 9})) (is (instance? PersistentHashMap b)))) + +(deftest read+string-test + (let [rdr (rt/source-logging-push-back-reader "[1][2][3][4]")] + (is (= [[1] "[1]"] (reader/read+string rdr))) + (testing "buffer is reset and next value is read succesfully" + (is (= [[2] "[2]"] (reader/read+string rdr)))) + (testing "exercising second arity" + (is (= [[3] "[3]"] (reader/read+string {} rdr))) + (is (= [[4] "[4]"] (reader/read+string {} rdr)))))) From bb5885b8417c493cf7fb3d7f9544c3565f16370e Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Fri, 26 May 2023 15:51:36 -0500 Subject: [PATCH 46/97] add workflows --- .github/workflows/release.yml | 19 +++++++++++++++++++ .github/workflows/snapshot.yml | 8 ++++++++ .github/workflows/test.yml | 7 +++++++ README.md | 5 ++--- 4 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/release.yml create mode 100644 .github/workflows/snapshot.yml create mode 100644 .github/workflows/test.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 00000000..e2718bd3 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,19 @@ +name: Release on demand + +on: + workflow_dispatch: + inputs: + releaseVersion: + description: "Version to release" + required: true + snapshotVersion: + description: "Snapshot version after release" + required: true + +jobs: + call-release: + uses: clojure/build.ci/.github/workflows/release.yml@master + with: + releaseVersion: ${{ github.event.inputs.releaseVersion }} + snapshotVersion: ${{ github.event.inputs.snapshotVersion }} + secrets: inherit \ No newline at end of file diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml new file mode 100644 index 00000000..24729578 --- /dev/null +++ b/.github/workflows/snapshot.yml @@ -0,0 +1,8 @@ +name: Snapshot on demand + +on: [workflow_dispatch] + +jobs: + call-snapshot: + uses: clojure/build.ci/.github/workflows/snapshot.yml@master + secrets: inherit diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 00000000..1fa127c9 --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,7 @@ +name: Test + +on: [push] + +jobs: + call-test: + uses: clojure/build.ci/.github/workflows/test.yml@master diff --git a/README.md b/README.md index 07dfb01f..511a0076 100644 --- a/README.md +++ b/README.md @@ -73,8 +73,7 @@ Developer Information * [GitHub project](https://github.com/clojure/tools.reader) * [Bug Tracker](https://clojure.atlassian.net/browse/TRDR) -* [Continuous Integration](https://build.clojure.org/job/tools.reader/) -* [Compatibility Test Matrix](https://build.clojure.org/job/tools.reader-test-matrix/) +* [Continuous Integration](https://github.com/clojure/tools.reader/actions/workflows/test.yml) Example Usage ======================================== @@ -176,6 +175,6 @@ There are small differences from clojure.lang.LispReader: ## License -Copyright © 2013-2018 Nicola Mometto, Rich Hickey & contributors. +Copyright © 2013-2023 Nicola Mometto, Rich Hickey & contributors. Licensed under the EPL. (See the file epl.html.) From d368dcfbd9827c185b4825f2776ffe80385afcde Mon Sep 17 00:00:00 2001 From: JarrodCTaylor Date: Wed, 16 Aug 2023 14:40:14 -0500 Subject: [PATCH 47/97] Added github action to build api docs --- .github/workflows/doc-build.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .github/workflows/doc-build.yml diff --git a/.github/workflows/doc-build.yml b/.github/workflows/doc-build.yml new file mode 100644 index 00000000..8e00125b --- /dev/null +++ b/.github/workflows/doc-build.yml @@ -0,0 +1,10 @@ +name: Build API Docs + +on: + workflow_dispatch: + +jobs: + call-doc-build-workflow: + uses: clojure/build.ci/.github/workflows/doc-build.yml@master + with: + project: clojure/tools.reader From 88d47e6fb776135b4835c06b9e487bed7ec6c974 Mon Sep 17 00:00:00 2001 From: Juan Monetta Date: Tue, 26 Sep 2023 06:58:32 -0300 Subject: [PATCH 48/97] Respect forms :line and :column meta when provided --- src/main/clojure/clojure/tools/reader.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/clojure/clojure/tools/reader.clj b/src/main/clojure/clojure/tools/reader.clj index 2a230110..ac4aff75 100644 --- a/src/main/clojure/clojure/tools/reader.clj +++ b/src/main/clojure/clojure/tools/reader.clj @@ -378,7 +378,7 @@ (let [o (read* rdr true nil opts pending-forms)] (if (instance? IMeta o) (let [m (if (and line (seq? o)) - (assoc m :line line :column column) + (merge {:line line :column column} m) m)] (if (instance? IObj o) (with-meta o (merge (meta o) m)) From 3213e8f6ba581c28211a746026b1d4655a7198ce Mon Sep 17 00:00:00 2001 From: Nicola Mometto Date: Wed, 8 Nov 2023 11:19:48 +0000 Subject: [PATCH 49/97] TRDR-71: source-logging-push-back-reader throws StringIndexOutOfBoundsException reading multiline form --- src/main/clojure/clojure/tools/reader.clj | 10 ++++++---- src/main/clojure/clojure/tools/reader/reader_types.clj | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/clojure/clojure/tools/reader.clj b/src/main/clojure/clojure/tools/reader.clj index 2a230110..3d32d672 100644 --- a/src/main/clojure/clojure/tools/reader.clj +++ b/src/main/clojure/clojure/tools/reader.clj @@ -1022,10 +1022,12 @@ ([] (read+string (source-logging-push-back-reader *in*))) ([stream] (read+string stream true nil)) ([^SourceLoggingPushbackReader stream eof-error? eof-value] - (let [o (log-source stream (read stream eof-error? eof-value)) - s (.trim (str (:buffer @(.source-log-frames stream))))] + (let [^StringBuilder buf (doto (:buffer @(.source-log-frames stream)) (.setLength 0)) + o (log-source stream (read stream eof-error? eof-value)) + s (.trim (str buf))] [o s])) ([opts ^SourceLoggingPushbackReader stream] - (let [o (log-source stream (read opts stream)) - s (.trim (str (:buffer @(.source-log-frames stream))))] + (let [^StringBuilder buf (doto (:buffer @(.source-log-frames stream)) (.setLength 0)) + o (log-source stream (read opts stream)) + s (.trim (str buf))] [o s]))) diff --git a/src/main/clojure/clojure/tools/reader/reader_types.clj b/src/main/clojure/clojure/tools/reader/reader_types.clj index 62239a93..06141bd5 100644 --- a/src/main/clojure/clojure/tools/reader/reader_types.clj +++ b/src/main/clojure/clojure/tools/reader/reader_types.clj @@ -317,7 +317,7 @@ [reader f] (let [frame (.source-log-frames ^SourceLoggingPushbackReader reader) ^StringBuilder buffer (:buffer @frame) - new-frame (assoc-in @frame [:offset] (.length buffer))] + new-frame (assoc @frame :offset (.length buffer))] (with-bindings {frame new-frame} (let [ret (f)] (if (instance? clojure.lang.IObj ret) From abcac34b114d95a901ae9741e4da8e196d2e531e Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Thu, 9 Nov 2023 11:27:02 -0300 Subject: [PATCH 50/97] prepare release v1.3.7 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 8bdc4333..68a06a12 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 tools.reader - 1.3.7-SNAPSHOT + 1.3.7 tools.reader A Clojure reader in Clojure https://github.com/clojure/tools.reader @@ -132,6 +132,6 @@ scm:git:git://github.com/clojure/tools.reader.git scm:git:git://github.com/clojure/tools.reader.git http://github.com/clojure/tools.reader - HEAD + v1.3.7 From 11c25aa12ff43a66f11ca95183de1aa639b7ef37 Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Thu, 9 Nov 2023 11:28:25 -0300 Subject: [PATCH 51/97] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 68a06a12..74d1c0e6 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 tools.reader - 1.3.7 + 1.3.8-SNAPSHOT tools.reader A Clojure reader in Clojure https://github.com/clojure/tools.reader @@ -132,6 +132,6 @@ scm:git:git://github.com/clojure/tools.reader.git scm:git:git://github.com/clojure/tools.reader.git http://github.com/clojure/tools.reader - v1.3.7 + HEAD From 0a25c1fc1158bdc083b2bd5fa92c43a28c66c05b Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Thu, 9 Nov 2023 11:32:07 -0300 Subject: [PATCH 52/97] update changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a963249..dbc4b7d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ Changelog ======================================== +* Release 1.3.7 on 9 Nov 2023 + * Reset source-logging-reader's buffer like in Clojure (#TRDR-69) + * Respect forms :line and :column meta when provided + * source-logging-push-back-reader throws StringIndexOutOfBoundsException reading multiline form (#TRDR-71) * Release 1.3.6 on 13 Jul 2021 * Add loc info to namespaced map literals (#TRDR-67) * Fix inconsistent spacing and typos in error messages (#TRDR-66) From 85ddfd88c0f53e4afeb88e4297c6941d57a80bf5 Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Thu, 9 Nov 2023 11:32:36 -0300 Subject: [PATCH 53/97] update readme for release --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 511a0076..f07dc955 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ YourKit is kindly supporting open source projects with its full-featured Java Pr Releases and Dependency Information ======================================== -Latest stable release: 1.3.6 +Latest stable release: 1.3.7 * [All Released Versions](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.clojure%22%20AND%20a%3A%22tools.reader%22) @@ -42,13 +42,13 @@ Latest stable release: 1.3.6 [clj](https://clojure.org/guides/getting_started) dependency information: ```clojure -org.clojure/tools.reader {:mvn/version "1.3.6"} +org.clojure/tools.reader {:mvn/version "1.3.7"} ``` [Leiningen](https://github.com/technomancy/leiningen) dependency information: ```clojure -[org.clojure/tools.reader "1.3.6"] +[org.clojure/tools.reader "1.3.7"] ``` [Maven](https://maven.apache.org/) dependency information: @@ -56,7 +56,7 @@ org.clojure/tools.reader {:mvn/version "1.3.6"} org.clojure tools.reader - 1.3.6 + 1.3.7 ``` From ff18b1b872398a99e3e2941a0ed9abc0c2dec151 Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Thu, 9 Nov 2023 11:33:52 -0300 Subject: [PATCH 54/97] update links in pom --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 74d1c0e6..28f7f5c4 100644 --- a/pom.xml +++ b/pom.xml @@ -90,7 +90,7 @@ Eclipse Public License 1.0 - http://opensource.org/licenses/eclipse-1.0.php + https://opensource.org/license/epl-1-0/ repo @@ -131,7 +131,7 @@ scm:git:git://github.com/clojure/tools.reader.git scm:git:git://github.com/clojure/tools.reader.git - http://github.com/clojure/tools.reader + https://github.com/clojure/tools.reader HEAD From 3c240a0e3cf2e3256977d4b2e38945622c5cd68d Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Mon, 19 Feb 2024 12:20:58 -0600 Subject: [PATCH 55/97] update parent pom and clojure versions --- pom.xml | 4 ++-- project.clj | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 28f7f5c4..d182768e 100644 --- a/pom.xml +++ b/pom.xml @@ -98,11 +98,11 @@ org.clojure pom.contrib - 1.1.0 + 1.2.0 - 1.5.1 + 1.9.0 diff --git a/project.clj b/project.clj index 09f890e2..3078ef34 100644 --- a/project.clj +++ b/project.clj @@ -7,14 +7,14 @@ :source-paths ["src/main/clojure" "src/main/cljs"] :test-paths ["src/test/clojure"] :repositories {"sonatype-oss-public" "https://oss.sonatype.org/content/groups/public/"} - :dependencies [[org.clojure/clojure "1.10.0-master-SNAPSHOT"] + :dependencies [[org.clojure/clojure "1.9.0"] [org.clojure/clojurescript "1.9.946" :scope "provided"]] :profiles {:1.5 {:dependencies [[org.clojure/clojure "1.5.1"]]} :1.6 {:dependencies [[org.clojure/clojure "1.6.0"]]} :1.7 {:dependencies [[org.clojure/clojure "1.7.0"]]} :1.8 {:dependencies [[org.clojure/clojure "1.8.0"]]} :1.9 {:dependencies [[org.clojure/clojure "1.9.0"]]} - :1.10 {:dependencies [[org.clojure/clojure "1.10.0-master-SNAPSHOT"]]}} + :1.10 {:dependencies [[org.clojure/clojure "1.10.3"]]}} :aliases {"test-all" ["with-profile" "test,1.5:test,1.6:test,1.7:test,1.8:test,1.9:test,1.10" "test"] "check-all" ["with-profile" "1.5:1.6:1.7:1.8:1.9" "check"]} :min-lein-version "2.0.0" From b1c29d73f6ed7120c6046c85d9cae1b361d27696 Mon Sep 17 00:00:00 2001 From: clojure-build Date: Mon, 19 Feb 2024 18:22:46 +0000 Subject: [PATCH 56/97] [maven-release-plugin] prepare release v1.4.0 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index d182768e..7fa29caa 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 tools.reader - 1.3.8-SNAPSHOT + 1.4.0 tools.reader A Clojure reader in Clojure https://github.com/clojure/tools.reader @@ -132,6 +132,6 @@ scm:git:git://github.com/clojure/tools.reader.git scm:git:git://github.com/clojure/tools.reader.git https://github.com/clojure/tools.reader - HEAD + v1.4.0 From a61caebf73c5fa28a868a089c6873905b9844b06 Mon Sep 17 00:00:00 2001 From: clojure-build Date: Mon, 19 Feb 2024 18:22:46 +0000 Subject: [PATCH 57/97] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 7fa29caa..a41d5c2f 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 tools.reader - 1.4.0 + 1.4.1-SNAPSHOT tools.reader A Clojure reader in Clojure https://github.com/clojure/tools.reader @@ -132,6 +132,6 @@ scm:git:git://github.com/clojure/tools.reader.git scm:git:git://github.com/clojure/tools.reader.git https://github.com/clojure/tools.reader - v1.4.0 + HEAD From 2930acfd0e41637f3759ae0aff8c6386efb810cf Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Mon, 19 Feb 2024 12:26:19 -0600 Subject: [PATCH 58/97] update for release --- CHANGELOG.md | 2 ++ README.md | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dbc4b7d1..75f7ef41 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ Changelog ======================================== +* Release 1.4.0 on 19 Feb 2024 + * Update parent pom and Clojure dep versions to 1.9.0 * Release 1.3.7 on 9 Nov 2023 * Reset source-logging-reader's buffer like in Clojure (#TRDR-69) * Respect forms :line and :column meta when provided diff --git a/README.md b/README.md index f07dc955..f5acea00 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ YourKit is kindly supporting open source projects with its full-featured Java Pr Releases and Dependency Information ======================================== -Latest stable release: 1.3.7 +Latest stable release: 1.4.0 * [All Released Versions](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.clojure%22%20AND%20a%3A%22tools.reader%22) @@ -42,13 +42,13 @@ Latest stable release: 1.3.7 [clj](https://clojure.org/guides/getting_started) dependency information: ```clojure -org.clojure/tools.reader {:mvn/version "1.3.7"} +org.clojure/tools.reader {:mvn/version "1.4.0"} ``` [Leiningen](https://github.com/technomancy/leiningen) dependency information: ```clojure -[org.clojure/tools.reader "1.3.7"] +[org.clojure/tools.reader "1.4.0"] ``` [Maven](https://maven.apache.org/) dependency information: @@ -56,7 +56,7 @@ org.clojure/tools.reader {:mvn/version "1.3.7"} org.clojure tools.reader - 1.3.7 + 1.4.0 ``` @@ -175,6 +175,6 @@ There are small differences from clojure.lang.LispReader: ## License -Copyright © 2013-2023 Nicola Mometto, Rich Hickey & contributors. +Copyright © Nicola Mometto, Rich Hickey & contributors. Licensed under the EPL. (See the file epl.html.) From 2af45053bbbaa340111bbf4f353ab9ce8165064d Mon Sep 17 00:00:00 2001 From: JarrodCTaylor Date: Mon, 11 Mar 2024 16:15:12 -0500 Subject: [PATCH 59/97] TRDR-72 Added type hint to suppress reflection warning --- src/main/clojure/clojure/tools/reader.clj | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/clojure/clojure/tools/reader.clj b/src/main/clojure/clojure/tools/reader.clj index 70f212db..ee9d7841 100644 --- a/src/main/clojure/clojure/tools/reader.clj +++ b/src/main/clojure/clojure/tools/reader.clj @@ -27,6 +27,8 @@ java.util.regex.Pattern (java.util List LinkedList))) +(set! *warn-on-reflection* true) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; helpers ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -1022,12 +1024,12 @@ ([] (read+string (source-logging-push-back-reader *in*))) ([stream] (read+string stream true nil)) ([^SourceLoggingPushbackReader stream eof-error? eof-value] - (let [^StringBuilder buf (doto (:buffer @(.source-log-frames stream)) (.setLength 0)) + (let [^StringBuilder buf (doto ^StringBuilder (:buffer @(.source-log-frames stream)) (.setLength 0)) o (log-source stream (read stream eof-error? eof-value)) s (.trim (str buf))] [o s])) ([opts ^SourceLoggingPushbackReader stream] - (let [^StringBuilder buf (doto (:buffer @(.source-log-frames stream)) (.setLength 0)) + (let [^StringBuilder buf (doto ^StringBuilder (:buffer @(.source-log-frames stream)) (.setLength 0)) o (log-source stream (read opts stream)) s (.trim (str buf))] [o s]))) From 5a032b496e87207c4c9a4143bb45bf1ac3623f1d Mon Sep 17 00:00:00 2001 From: clojure-build Date: Tue, 12 Mar 2024 10:49:54 +0000 Subject: [PATCH 60/97] [maven-release-plugin] prepare release v1.4.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a41d5c2f..59f2cc6b 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 tools.reader - 1.4.1-SNAPSHOT + 1.4.1 tools.reader A Clojure reader in Clojure https://github.com/clojure/tools.reader @@ -132,6 +132,6 @@ scm:git:git://github.com/clojure/tools.reader.git scm:git:git://github.com/clojure/tools.reader.git https://github.com/clojure/tools.reader - HEAD + v1.4.1 From 993d340a2566ec3ebf93d790d425b839a45e4f89 Mon Sep 17 00:00:00 2001 From: clojure-build Date: Tue, 12 Mar 2024 10:49:54 +0000 Subject: [PATCH 61/97] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 59f2cc6b..5020a3df 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 tools.reader - 1.4.1 + 1.4.2-SNAPSHOT tools.reader A Clojure reader in Clojure https://github.com/clojure/tools.reader @@ -132,6 +132,6 @@ scm:git:git://github.com/clojure/tools.reader.git scm:git:git://github.com/clojure/tools.reader.git https://github.com/clojure/tools.reader - v1.4.1 + HEAD From f1214ef998372a8b87f9eb116487afeb01ad39be Mon Sep 17 00:00:00 2001 From: Nicola Mometto Date: Tue, 12 Mar 2024 10:53:09 +0000 Subject: [PATCH 62/97] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f5acea00..5aa2dd15 100644 --- a/README.md +++ b/README.md @@ -42,13 +42,13 @@ Latest stable release: 1.4.0 [clj](https://clojure.org/guides/getting_started) dependency information: ```clojure -org.clojure/tools.reader {:mvn/version "1.4.0"} +org.clojure/tools.reader {:mvn/version "1.4.1"} ``` [Leiningen](https://github.com/technomancy/leiningen) dependency information: ```clojure -[org.clojure/tools.reader "1.4.0"] +[org.clojure/tools.reader "1.4.1"] ``` [Maven](https://maven.apache.org/) dependency information: @@ -56,7 +56,7 @@ org.clojure/tools.reader {:mvn/version "1.4.0"} org.clojure tools.reader - 1.4.0 + 1.4.1 ``` From 39b484787ed882ad1167b1078f4a873a88ad9a58 Mon Sep 17 00:00:00 2001 From: JarrodCTaylor Date: Sat, 23 Mar 2024 15:51:32 -0500 Subject: [PATCH 63/97] Update changelog for version 1.4.1 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 75f7ef41..8ca3c992 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ Changelog ======================================== +* Release 1.4.1 on 12 March 2024 + * Add type hints to suppress reflection warnings introduced in 1.3.7 * Release 1.4.0 on 19 Feb 2024 * Update parent pom and Clojure dep versions to 1.9.0 * Release 1.3.7 on 9 Nov 2023 From 0d770e496f7a1cb5030bb80062c3396438717006 Mon Sep 17 00:00:00 2001 From: Nicola Mometto Date: Thu, 18 Apr 2024 09:39:44 +0100 Subject: [PATCH 64/97] fix(reader): just use `str` rather than ns-name, so it can work for cljs' :as-alias --- src/main/clojure/clojure/tools/reader.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/clojure/clojure/tools/reader.clj b/src/main/clojure/clojure/tools/reader.clj index ee9d7841..7ac2fbc3 100644 --- a/src/main/clojure/clojure/tools/reader.clj +++ b/src/main/clojure/clojure/tools/reader.clj @@ -761,7 +761,7 @@ (ns-name *ns*) (= \: (first token)) - (some-> token (subs 1) parse-symbol second' symbol resolve-ns ns-name) + (some-> token (subs 1) parse-symbol second' symbol resolve-ns) :else (some-> token parse-symbol second'))] From d532e07de06d63c5b4baffcb28c94f07e4cad866 Mon Sep 17 00:00:00 2001 From: clojure-build Date: Thu, 18 Apr 2024 11:53:25 +0000 Subject: [PATCH 65/97] [maven-release-plugin] prepare release v1.4.2 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 5020a3df..00359222 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 tools.reader - 1.4.2-SNAPSHOT + 1.4.2 tools.reader A Clojure reader in Clojure https://github.com/clojure/tools.reader @@ -132,6 +132,6 @@ scm:git:git://github.com/clojure/tools.reader.git scm:git:git://github.com/clojure/tools.reader.git https://github.com/clojure/tools.reader - HEAD + v1.4.2 From 3e58420e9aa8db01987b2f8ecd63fe011bab99cf Mon Sep 17 00:00:00 2001 From: clojure-build Date: Thu, 18 Apr 2024 11:53:25 +0000 Subject: [PATCH 66/97] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 00359222..d0173ed1 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 tools.reader - 1.4.2 + 1.4.3-SNAPSHOT tools.reader A Clojure reader in Clojure https://github.com/clojure/tools.reader @@ -132,6 +132,6 @@ scm:git:git://github.com/clojure/tools.reader.git scm:git:git://github.com/clojure/tools.reader.git https://github.com/clojure/tools.reader - v1.4.2 + HEAD From 01f7cf68b373ddb5f0a2c84536411b53691f763a Mon Sep 17 00:00:00 2001 From: Nicola Mometto Date: Thu, 18 Apr 2024 12:58:06 +0100 Subject: [PATCH 67/97] Update README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 5aa2dd15..03e04494 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ YourKit is kindly supporting open source projects with its full-featured Java Pr Releases and Dependency Information ======================================== -Latest stable release: 1.4.0 +Latest stable release: 1.4.2 * [All Released Versions](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.clojure%22%20AND%20a%3A%22tools.reader%22) @@ -42,13 +42,13 @@ Latest stable release: 1.4.0 [clj](https://clojure.org/guides/getting_started) dependency information: ```clojure -org.clojure/tools.reader {:mvn/version "1.4.1"} +org.clojure/tools.reader {:mvn/version "1.4.2"} ``` [Leiningen](https://github.com/technomancy/leiningen) dependency information: ```clojure -[org.clojure/tools.reader "1.4.1"] +[org.clojure/tools.reader "1.4.2"] ``` [Maven](https://maven.apache.org/) dependency information: @@ -56,7 +56,7 @@ org.clojure/tools.reader {:mvn/version "1.4.1"} org.clojure tools.reader - 1.4.1 + 1.4.2 ``` From 0d3a7cd946e0ef377b7fe2c85df6cf940ff39c81 Mon Sep 17 00:00:00 2001 From: Nicola Mometto Date: Thu, 18 Apr 2024 22:17:13 +0100 Subject: [PATCH 68/97] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ca3c992..af5951f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ Changelog ======================================== +* Release 1.4.2 on 18 April 2024 + * Fixed namespaced map support for clojurescript * Release 1.4.1 on 12 March 2024 * Add type hints to suppress reflection warnings introduced in 1.3.7 * Release 1.4.0 on 19 Feb 2024 From 16d9be2b59a28293342f3528d73f8934707b6471 Mon Sep 17 00:00:00 2001 From: JarrodCTaylor Date: Fri, 20 Oct 2023 12:06:16 -0500 Subject: [PATCH 69/97] Updated metadata processing to support param-tags in 1.12 --- src/main/cljs/cljs/tools/reader/impl/errors.cljs | 2 +- src/main/cljs/cljs/tools/reader/impl/utils.cljs | 1 + src/main/clojure/clojure/tools/reader/impl/errors.clj | 2 +- src/main/clojure/clojure/tools/reader/impl/utils.clj | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/cljs/cljs/tools/reader/impl/errors.cljs b/src/main/cljs/cljs/tools/reader/impl/errors.cljs index 4e8c5c16..418defb3 100644 --- a/src/main/cljs/cljs/tools/reader/impl/errors.cljs +++ b/src/main/cljs/cljs/tools/reader/impl/errors.cljs @@ -187,7 +187,7 @@ rdr "Metadata cannot be " (i/inspect x) - ". Metadata must be a Symbol, Keyword, String or Map.")) + ". Metadata must be a Symbol, Keyword, String, Map or Vector.")) (defn throw-bad-metadata-target [rdr target] (reader-error diff --git a/src/main/cljs/cljs/tools/reader/impl/utils.cljs b/src/main/cljs/cljs/tools/reader/impl/utils.cljs index 12a06501..f64c800f 100644 --- a/src/main/cljs/cljs/tools/reader/impl/utils.cljs +++ b/src/main/cljs/cljs/tools/reader/impl/utils.cljs @@ -68,6 +68,7 @@ (keyword? f) {f true} (symbol? f) {:tag f} (string? f) {:tag f} + (vector? f) {:param-tags f} :else f)) (def last-id (atom 0)) diff --git a/src/main/clojure/clojure/tools/reader/impl/errors.clj b/src/main/clojure/clojure/tools/reader/impl/errors.clj index 38cbe252..f77d4962 100644 --- a/src/main/clojure/clojure/tools/reader/impl/errors.clj +++ b/src/main/clojure/clojure/tools/reader/impl/errors.clj @@ -171,7 +171,7 @@ rdr "Metadata cannot be " (i/inspect x) - ". Metadata must be a Symbol, Keyword, String or Map.")) + ". Metadata must be a Symbol, Keyword, String, Map or Vector.")) (defn throw-bad-metadata-target [rdr target] (reader-error diff --git a/src/main/clojure/clojure/tools/reader/impl/utils.clj b/src/main/clojure/clojure/tools/reader/impl/utils.clj index be64e5f2..f2f60f7d 100644 --- a/src/main/clojure/clojure/tools/reader/impl/utils.clj +++ b/src/main/clojure/clojure/tools/reader/impl/utils.clj @@ -99,6 +99,7 @@ (keyword? f) {f true} (symbol? f) {:tag f} (string? f) {:tag f} + (vector? f) {:param-tags f} :else f)) (defn make-var From 31adc06cd56753ed5a3cd443cea32158ba68c45c Mon Sep 17 00:00:00 2001 From: Noah Bogart Date: Mon, 1 Jul 2024 10:10:50 -0400 Subject: [PATCH 70/97] TRDR-73 Restrict Clojure symbols for array class notation --- .../clojure/tools/reader/impl/commons.clj | 13 ++++--- .../clojure/clojure/tools/reader_test.clj | 35 +++++++++++++++++++ 2 files changed, 43 insertions(+), 5 deletions(-) diff --git a/src/main/clojure/clojure/tools/reader/impl/commons.clj b/src/main/clojure/clojure/tools/reader/impl/commons.clj index 87ebbd6a..670c615f 100644 --- a/src/main/clojure/clojure/tools/reader/impl/commons.clj +++ b/src/main/clojure/clojure/tools/reader/impl/commons.clj @@ -107,11 +107,14 @@ (let [ns-idx (inc ns-idx)] (when-not (== ns-idx (count token)) (let [sym (subs token ns-idx)] - (when (and (not (numeric? (nth sym 0))) - (not (= "" sym)) - (not (.endsWith ns ":")) - (or (= sym "/") - (== -1 (.indexOf sym "/")))) + (cond + (re-matches #"[1-9]" sym) + [ns sym] + (and (not (numeric? (nth sym 0))) + (not (= "" sym)) + (not (.endsWith ns ":")) + (or (= sym "/") + (== -1 (.indexOf sym "/")))) [ns sym])))) (when (or (= token "/") (== -1 (.indexOf token "/"))) diff --git a/src/test/clojure/clojure/tools/reader_test.clj b/src/test/clojure/clojure/tools/reader_test.clj index bf6e8b62..646d746c 100644 --- a/src/test/clojure/clojure/tools/reader_test.clj +++ b/src/test/clojure/clojure/tools/reader_test.clj @@ -199,3 +199,38 @@ ["[a\rb]" "[a\r b]" "[a \rb]"])] (doseq [pairs (partition 2 1 read-vals)] (is (= (first pairs) (second pairs)))))) + +(deftest read-symbol + (is (= 'foo (read-string "foo"))) + (is (= 'foo/bar (read-string "foo/bar"))) + (is (= '*+!-_? (read-string "*+!-_?"))) + (is (= 'abc:def:ghi (read-string "abc:def:ghi"))) + (is (= 'abc.def/ghi (read-string "abc.def/ghi"))) + (is (= 'abc/def.ghi (read-string "abc/def.ghi"))) + (is (= 'abc:def/ghi:jkl.mno (read-string "abc:def/ghi:jkl.mno"))) + (is (instance? clojure.lang.Symbol (read-string "alphabet"))) + (is (= "foo//" (str (read-string "foo//")))) + (is (java.lang.Double/isNaN ^double (read-string "##NaN"))) + (is (java.lang.Double/isInfinite ^double (read-string "##Inf"))) + (is (java.lang.Double/isInfinite ^double (read-string "##-Inf"))) + (testing "Correct array class symbols" + (doseq [n (range 1 10) + :let [sym (str "String/" n) + qsym (str "java.lang.String/" n)]] + (let [rsym (read-string sym) + rqsym (read-string qsym)] + (is (= ((juxt namespace name) rsym) + ["String" (str n)])) + (is (= ((juxt namespace name) rqsym) + ["java.lang.String" (str n)]))))) + (testing "Correct prim array symbols" + (doseq [prim ["int" "long" "boolean" "byte" "char" "double" "float" "short"]] + (doseq [n (range 1 10) + :let [sym (str prim "/" n)]] + (let [rsym (read-string sym)] + (is (= ((juxt namespace name) rsym) + [prim (str n)])))))) + (testing "Incorrect Array class symbols" + (doseq [suffix ["" "0" "11" "1a"] + :let [sym (str "String/" suffix)]] + (is (thrown? clojure.lang.ExceptionInfo (read-string sym)) sym)))) From 0f7b0baa6a46c745f3043dd7b625702837a6c8af Mon Sep 17 00:00:00 2001 From: Fogus Date: Mon, 19 Aug 2024 09:19:10 -0400 Subject: [PATCH 71/97] Update changelog for 1.5.0 --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index af5951f7..66935a5b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ Changelog ======================================== +* Release 1.5.0 on 18 April 2024 + * Support clojure 1.12 param-tags metadata (#TRDR-70) + * Support Clojure 1.12 array class notation refinement (#TRDR-73) * Release 1.4.2 on 18 April 2024 * Fixed namespaced map support for clojurescript * Release 1.4.1 on 12 March 2024 From c0632a3d8dbdd91124e80dc3cf10f3e531734a6a Mon Sep 17 00:00:00 2001 From: clojure-build Date: Mon, 19 Aug 2024 13:22:45 +0000 Subject: [PATCH 72/97] [maven-release-plugin] prepare release v1.5.0 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index d0173ed1..ce04dcf2 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 tools.reader - 1.4.3-SNAPSHOT + 1.5.0 tools.reader A Clojure reader in Clojure https://github.com/clojure/tools.reader @@ -132,6 +132,6 @@ scm:git:git://github.com/clojure/tools.reader.git scm:git:git://github.com/clojure/tools.reader.git https://github.com/clojure/tools.reader - HEAD + v1.5.0 From 286e2d7a801d99ef2d1bbb90a1dc875e6848c454 Mon Sep 17 00:00:00 2001 From: clojure-build Date: Mon, 19 Aug 2024 13:22:45 +0000 Subject: [PATCH 73/97] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ce04dcf2..7d84c82a 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 tools.reader - 1.5.0 + 1.5.1-SNAPSHOT tools.reader A Clojure reader in Clojure https://github.com/clojure/tools.reader @@ -132,6 +132,6 @@ scm:git:git://github.com/clojure/tools.reader.git scm:git:git://github.com/clojure/tools.reader.git https://github.com/clojure/tools.reader - v1.5.0 + HEAD From 5bbe1b296fdb47c1200f998095de9ba9aa4446bf Mon Sep 17 00:00:00 2001 From: Fogus Date: Mon, 19 Aug 2024 09:54:42 -0400 Subject: [PATCH 74/97] Update README for v1.5.0 --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 03e04494..7317f739 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ YourKit is kindly supporting open source projects with its full-featured Java Pr Releases and Dependency Information ======================================== -Latest stable release: 1.4.2 +Latest stable release: 1.5.0 * [All Released Versions](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.clojure%22%20AND%20a%3A%22tools.reader%22) @@ -42,13 +42,13 @@ Latest stable release: 1.4.2 [clj](https://clojure.org/guides/getting_started) dependency information: ```clojure -org.clojure/tools.reader {:mvn/version "1.4.2"} +org.clojure/tools.reader {:mvn/version "1.5.0"} ``` [Leiningen](https://github.com/technomancy/leiningen) dependency information: ```clojure -[org.clojure/tools.reader "1.4.2"] +[org.clojure/tools.reader "1.5.0"] ``` [Maven](https://maven.apache.org/) dependency information: @@ -56,7 +56,7 @@ org.clojure/tools.reader {:mvn/version "1.4.2"} org.clojure tools.reader - 1.4.2 + 1.5.0 ``` From 30d9f1d04417adc222ab57178dfd56d5d7a01d58 Mon Sep 17 00:00:00 2001 From: Fogus Date: Mon, 19 Aug 2024 09:56:24 -0400 Subject: [PATCH 75/97] Update changelog for 1.5.0 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 66935a5b..1f03b48d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ Changelog ======================================== -* Release 1.5.0 on 18 April 2024 +* Release 1.5.0 on 18 August 2024 * Support clojure 1.12 param-tags metadata (#TRDR-70) * Support Clojure 1.12 array class notation refinement (#TRDR-73) * Release 1.4.2 on 18 April 2024 From c73a52a7c807013c85466cfe2440fdd0cabc1167 Mon Sep 17 00:00:00 2001 From: Nicola Mometto Date: Thu, 6 Mar 2025 10:20:49 +0000 Subject: [PATCH 76/97] fix(TRDR-75): backport TRDR-19 to edn reader --- src/main/cljs/cljs/tools/reader/edn.cljs | 8 +++++--- src/main/clojure/clojure/tools/reader/edn.clj | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/cljs/cljs/tools/reader/edn.cljs b/src/main/cljs/cljs/tools/reader/edn.cljs index c4cd914e..54a4902d 100644 --- a/src/main/cljs/cljs/tools/reader/edn.cljs +++ b/src/main/cljs/cljs/tools/reader/edn.cljs @@ -53,14 +53,16 @@ :else (loop [sb (StringBuffer.) - ch (do (unread rdr initch) initch)] + ch initch] (if (or (whitespace? ch) (macro-terminating? ch) (nil? ch)) - (str sb) + (do (when-not (nil? ch) + (unread rdr ch)) + (str sb)) (if (not-constituent? ch) (err/throw-bad-char rdr kind ch) - (recur (doto sb (.append (read-char rdr))) (peek-char rdr)))))))) + (recur (doto sb (.append ch)) (read-char rdr)))))))) (declare read-tagged) diff --git a/src/main/clojure/clojure/tools/reader/edn.clj b/src/main/clojure/clojure/tools/reader/edn.clj index 3e9ec868..67a90afe 100644 --- a/src/main/clojure/clojure/tools/reader/edn.clj +++ b/src/main/clojure/clojure/tools/reader/edn.clj @@ -56,7 +56,8 @@ (if (or (whitespace? ch) (macro-terminating? ch) (nil? ch)) - (do (unread rdr ch) + (do (when ch + (unread rdr ch)) (str sb)) (if (not-constituent? ch) (err/throw-bad-char rdr kind ch) From 8bf779cdd1b72da72c7b76bf06d52e79b54faf2c Mon Sep 17 00:00:00 2001 From: Nicola Mometto Date: Thu, 6 Mar 2025 10:26:18 +0000 Subject: [PATCH 77/97] bump: 1.5.1 --- CHANGELOG.md | 3 ++- README.md | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f03b48d..0cc0e054 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ Changelog ======================================== - +* Release 1.5.1 on 06 March 2025 + * Fix column number info for token at EOF * Release 1.5.0 on 18 August 2024 * Support clojure 1.12 param-tags metadata (#TRDR-70) * Support Clojure 1.12 array class notation refinement (#TRDR-73) diff --git a/README.md b/README.md index 7317f739..8d5577f1 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ YourKit is kindly supporting open source projects with its full-featured Java Pr Releases and Dependency Information ======================================== -Latest stable release: 1.5.0 +Latest stable release: 1.5.1 * [All Released Versions](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.clojure%22%20AND%20a%3A%22tools.reader%22) @@ -42,13 +42,13 @@ Latest stable release: 1.5.0 [clj](https://clojure.org/guides/getting_started) dependency information: ```clojure -org.clojure/tools.reader {:mvn/version "1.5.0"} +org.clojure/tools.reader {:mvn/version "1.5.1"} ``` [Leiningen](https://github.com/technomancy/leiningen) dependency information: ```clojure -[org.clojure/tools.reader "1.5.0"] +[org.clojure/tools.reader "1.5.1"] ``` [Maven](https://maven.apache.org/) dependency information: @@ -56,7 +56,7 @@ org.clojure/tools.reader {:mvn/version "1.5.0"} org.clojure tools.reader - 1.5.0 + 1.5.1 ``` From 0acec94b8058e1f72b9b7fd59764adfdac7f0933 Mon Sep 17 00:00:00 2001 From: clojure-build Date: Thu, 6 Mar 2025 10:28:33 +0000 Subject: [PATCH 78/97] [maven-release-plugin] prepare release v1.5.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 7d84c82a..45da8cbf 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 tools.reader - 1.5.1-SNAPSHOT + 1.5.1 tools.reader A Clojure reader in Clojure https://github.com/clojure/tools.reader @@ -132,6 +132,6 @@ scm:git:git://github.com/clojure/tools.reader.git scm:git:git://github.com/clojure/tools.reader.git https://github.com/clojure/tools.reader - HEAD + v1.5.1 From d577a8f324348defa4c0beb892e9f41262c9554b Mon Sep 17 00:00:00 2001 From: clojure-build Date: Thu, 6 Mar 2025 10:28:33 +0000 Subject: [PATCH 79/97] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 45da8cbf..ecab41ea 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 tools.reader - 1.5.1 + 1.5.2-SNAPSHOT tools.reader A Clojure reader in Clojure https://github.com/clojure/tools.reader @@ -132,6 +132,6 @@ scm:git:git://github.com/clojure/tools.reader.git scm:git:git://github.com/clojure/tools.reader.git https://github.com/clojure/tools.reader - v1.5.1 + HEAD From e496dedde59b47a5c4abd2338e73349df3d23ef0 Mon Sep 17 00:00:00 2001 From: Nicola Mometto Date: Mon, 10 Mar 2025 11:45:42 +0000 Subject: [PATCH 80/97] fix: EOF col number for numbers --- src/main/cljs/cljs/tools/reader.cljs | 3 ++- src/main/cljs/cljs/tools/reader/edn.cljs | 3 ++- src/main/clojure/clojure/tools/reader.clj | 2 +- src/main/clojure/clojure/tools/reader/edn.clj | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/cljs/cljs/tools/reader.cljs b/src/main/cljs/cljs/tools/reader.cljs index 4e6922b5..21ad0438 100644 --- 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 index 54a4902d..7e2dc221 100644 --- 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 index 7ac2fbc3..85aea17a 100644 --- 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 index 67a90afe..b10cca67 100644 --- 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))))) From d32920f3c7b2d4c40bbd9d6346627857d0574210 Mon Sep 17 00:00:00 2001 From: clojure-build Date: Mon, 10 Mar 2025 11:49:09 +0000 Subject: [PATCH 81/97] [maven-release-plugin] prepare release v1.5.2 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ecab41ea..f3ff6675 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 tools.reader - 1.5.2-SNAPSHOT + 1.5.2 tools.reader A Clojure reader in Clojure https://github.com/clojure/tools.reader @@ -132,6 +132,6 @@ scm:git:git://github.com/clojure/tools.reader.git scm:git:git://github.com/clojure/tools.reader.git https://github.com/clojure/tools.reader - HEAD + v1.5.2 From 8cce6fac24951d936fdccccb2b8a6d24f4ad34e7 Mon Sep 17 00:00:00 2001 From: clojure-build Date: Mon, 10 Mar 2025 11:49:09 +0000 Subject: [PATCH 82/97] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f3ff6675..0082efe4 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 tools.reader - 1.5.2 + 1.5.3-SNAPSHOT tools.reader A Clojure reader in Clojure https://github.com/clojure/tools.reader @@ -132,6 +132,6 @@ scm:git:git://github.com/clojure/tools.reader.git scm:git:git://github.com/clojure/tools.reader.git https://github.com/clojure/tools.reader - v1.5.2 + HEAD From d781830bf61ba1f59d7bbf830d988d23a95b9e78 Mon Sep 17 00:00:00 2001 From: Nicola Mometto Date: Mon, 10 Mar 2025 11:56:01 +0000 Subject: [PATCH 83/97] chore: update for 1.5.2 --- CHANGELOG.md | 2 ++ README.md | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0cc0e054..de942d93 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ Changelog ======================================== +* Release 1.5.2 on 10 March 2025 + * Fix column number info for number at EOF * Release 1.5.1 on 06 March 2025 * Fix column number info for token at EOF * Release 1.5.0 on 18 August 2024 diff --git a/README.md b/README.md index 8d5577f1..c9a1cbc5 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ YourKit is kindly supporting open source projects with its full-featured Java Pr Releases and Dependency Information ======================================== -Latest stable release: 1.5.1 +Latest stable release: 1.5.2 * [All Released Versions](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.clojure%22%20AND%20a%3A%22tools.reader%22) @@ -42,13 +42,13 @@ Latest stable release: 1.5.1 [clj](https://clojure.org/guides/getting_started) dependency information: ```clojure -org.clojure/tools.reader {:mvn/version "1.5.1"} +org.clojure/tools.reader {:mvn/version "1.5.2"} ``` [Leiningen](https://github.com/technomancy/leiningen) dependency information: ```clojure -[org.clojure/tools.reader "1.5.1"] +[org.clojure/tools.reader "1.5.2"] ``` [Maven](https://maven.apache.org/) dependency information: @@ -56,7 +56,7 @@ org.clojure/tools.reader {:mvn/version "1.5.1"} org.clojure tools.reader - 1.5.1 + 1.5.2 ``` From 64df655db1fc790c1fc9e78be108d39d9050d39f Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Fri, 30 May 2025 15:26:04 -0500 Subject: [PATCH 84/97] update to new parent pom --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0082efe4..443fc92a 100644 --- a/pom.xml +++ b/pom.xml @@ -98,7 +98,7 @@ org.clojure pom.contrib - 1.2.0 + 1.3.0 From 1466729730feb2b0577a5ef243bb627b5d37e78f Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Tue, 30 Dec 2025 11:00:15 -0600 Subject: [PATCH 85/97] update CI actions to latest --- .github/workflows/doc-build.yml | 3 +++ .github/workflows/release.yml | 3 +++ .github/workflows/snapshot.yml | 3 +++ .github/workflows/test.yaml | 6 ++---- .github/workflows/test.yml | 3 +++ 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.github/workflows/doc-build.yml b/.github/workflows/doc-build.yml index 8e00125b..ec1f314d 100644 --- a/.github/workflows/doc-build.yml +++ b/.github/workflows/doc-build.yml @@ -1,5 +1,8 @@ name: Build API Docs +permissions: + contents: write + on: workflow_dispatch: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e2718bd3..286cf956 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,5 +1,8 @@ name: Release on demand +permissions: + contents: write + on: workflow_dispatch: inputs: diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 24729578..9fdad8c6 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -1,5 +1,8 @@ name: Snapshot on demand +permissions: + contents: read + on: [workflow_dispatch] jobs: diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 6905fe7c..fffe9889 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -7,11 +7,9 @@ jobs: name: Runtime Tests runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v6 - - uses: DeLaGuardo/setup-clojure@3.1 - with: - tools-deps: '1.10.1.763' + - uses: DeLaGuardo/setup-clojure@13.4 - name: Build tests run: clojure -M:cljs-test:cljs-adv diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1fa127c9..2cc441ac 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,5 +1,8 @@ name: Test +permissions: + contents: read + on: [push] jobs: From c8560efb01826baec3e1dd6abd2ef9ada864dd2c Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Tue, 30 Dec 2025 11:11:25 -0600 Subject: [PATCH 86/97] set CLI version in action --- .github/workflows/test.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index fffe9889..008cf9ca 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -10,6 +10,7 @@ jobs: - uses: actions/checkout@v6 - uses: DeLaGuardo/setup-clojure@13.4 + with: 1.12.4.1582 - name: Build tests run: clojure -M:cljs-test:cljs-adv From e82711b73150a3877f05701d947fac0cf8f72e02 Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Tue, 30 Dec 2025 11:13:24 -0600 Subject: [PATCH 87/97] set CLI version in action --- .github/workflows/test.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 008cf9ca..41bbb7ad 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -10,7 +10,8 @@ jobs: - uses: actions/checkout@v6 - uses: DeLaGuardo/setup-clojure@13.4 - with: 1.12.4.1582 + with: + tools-deps: '1.12.4.1582' - name: Build tests run: clojure -M:cljs-test:cljs-adv From 853da064500d9bae5ced5fdf8e171219a349c186 Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Tue, 30 Dec 2025 11:16:23 -0600 Subject: [PATCH 88/97] update parent pom and Clojure version to 1.11.4 --- CHANGELOG.md | 2 ++ deps.edn | 4 ++-- pom.xml | 4 ++-- project.clj | 8 ++++---- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index de942d93..637c674f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ Changelog ======================================== +* Release 1.6.0 on 30 Dec 2025 + * Update parent pom and Clojure dep versions to 1.11.4 * Release 1.5.2 on 10 March 2025 * Fix column number info for number at EOF * Release 1.5.1 on 06 March 2025 diff --git a/deps.edn b/deps.edn index 272a2f72..d75affc9 100644 --- a/deps.edn +++ b/deps.edn @@ -1,7 +1,7 @@ -{:deps {org.clojure/clojure {:mvn/version "1.10.3"}} +{:deps {org.clojure/clojure {:mvn/version "1.11.4"}} :paths ["src/main/clojure"] :aliases - {:cljs-test {:extra-deps {org.clojure/clojurescript {:mvn/version "1.11.60"}} + {:cljs-test {:extra-deps {org.clojure/clojurescript {:mvn/version "1.9.946"}} :extra-paths ["src/main/cljs" "src/test/cljs"]} :cljs-repl {:main-opts ["-m" "cljs.main" "-v" "-co" "build/dev.edn" "-re" "node" "-r"]} :cljs-adv {:main-opts ["-m" "cljs.main" "-v" "-co" "build/adv.edn" "-c"]} diff --git a/pom.xml b/pom.xml index 443fc92a..da63b2c3 100644 --- a/pom.xml +++ b/pom.xml @@ -98,11 +98,11 @@ org.clojure pom.contrib - 1.3.0 + 1.4.0 - 1.9.0 + 1.11.4 diff --git a/project.clj b/project.clj index 3078ef34..50e57c94 100644 --- a/project.clj +++ b/project.clj @@ -1,13 +1,13 @@ (defproject org.clojure/tools.reader "1.0.0-SNAPSHOT" :description "A Clojure reader in Clojure" - :parent [org.clojure/pom.contrib "0.2.0"] + :parent [org.clojure/pom.contrib "1.4.0"] :url "https://github.com/clojure/tools.reader" :license {:name "Eclipse Public License" - :url "http://www.eclipse.org/legal/epl-v10.html"} + :url "https://www.eclipse.org/legal/epl-v10.html"} :source-paths ["src/main/clojure" "src/main/cljs"] :test-paths ["src/test/clojure"] :repositories {"sonatype-oss-public" "https://oss.sonatype.org/content/groups/public/"} - :dependencies [[org.clojure/clojure "1.9.0"] + :dependencies [[org.clojure/clojure "1.11.4"] [org.clojure/clojurescript "1.9.946" :scope "provided"]] :profiles {:1.5 {:dependencies [[org.clojure/clojure "1.5.1"]]} :1.6 {:dependencies [[org.clojure/clojure "1.6.0"]]} @@ -20,7 +20,7 @@ :min-lein-version "2.0.0" :global-vars {*warn-on-reflection* true *unchecked-math* :warn-on-boxed} - :plugins [[lein-cljsbuild "1.1.4"]] + :plugins [[lein-cljsbuild "1.1.8"]] :cljsbuild {:builds [{:id "dev" :source-paths ["src/main/cljs"] From 9af77ba38a02a1d493af3b6f3ff23dde2d5f7a3c Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Tue, 30 Dec 2025 11:20:19 -0600 Subject: [PATCH 89/97] update workflow --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 41bbb7ad..c18b354a 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -11,7 +11,7 @@ jobs: - uses: DeLaGuardo/setup-clojure@13.4 with: - tools-deps: '1.12.4.1582' + cli: '1.12.4.1582' - name: Build tests run: clojure -M:cljs-test:cljs-adv From f7bceb6714fc38c417d641eb00f7015829c0d0eb Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Tue, 30 Dec 2025 11:24:20 -0600 Subject: [PATCH 90/97] revert cljs version in deps.edn --- deps.edn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps.edn b/deps.edn index d75affc9..151533ee 100644 --- a/deps.edn +++ b/deps.edn @@ -1,7 +1,7 @@ {:deps {org.clojure/clojure {:mvn/version "1.11.4"}} :paths ["src/main/clojure"] :aliases - {:cljs-test {:extra-deps {org.clojure/clojurescript {:mvn/version "1.9.946"}} + {:cljs-test {:extra-deps {org.clojure/clojurescript {:mvn/version "1.11.60"}} :extra-paths ["src/main/cljs" "src/test/cljs"]} :cljs-repl {:main-opts ["-m" "cljs.main" "-v" "-co" "build/dev.edn" "-re" "node" "-r"]} :cljs-adv {:main-opts ["-m" "cljs.main" "-v" "-co" "build/adv.edn" "-c"]} From 5b351051f3026c4a73021ec8e479c9559d2f3bf9 Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Tue, 30 Dec 2025 11:34:27 -0600 Subject: [PATCH 91/97] update pom plugin versions --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index da63b2c3..57809e17 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ maven-jar-plugin - 2.4 + 3.5 default-jar @@ -68,7 +68,7 @@ maven-assembly-plugin - 2.4 + 3.5 aot-jar From a9c2b54a63f83a5e738984d9f63fd9c21ec7c22d Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Tue, 30 Dec 2025 11:37:12 -0600 Subject: [PATCH 92/97] add permissions in action --- .github/workflows/test.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index c18b354a..ef22cd7b 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -1,4 +1,8 @@ name: Tests + +permissions: + contents: read + on: [push] jobs: From 7e13cb2a45f75f8b176be243265fcb760440cf6b Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Tue, 30 Dec 2025 11:38:28 -0600 Subject: [PATCH 93/97] update pom plugin versions --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 57809e17..7ebddc25 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ maven-jar-plugin - 3.5 + 3.5.0 default-jar @@ -68,7 +68,7 @@ maven-assembly-plugin - 3.5 + 3.8.0 aot-jar From f16fb9e2f74f639d7190ee741654d789fb109ec2 Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Thu, 1 Jan 2026 16:33:10 -0600 Subject: [PATCH 94/97] build empty javadoc jar --- pom.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pom.xml b/pom.xml index 7ebddc25..04143c9e 100644 --- a/pom.xml +++ b/pom.xml @@ -64,6 +64,19 @@ + + javadoc-jar + package + + jar + + + javadoc + + **/*.html + + + From 9f2495e0353d0cdbb4678440b814a74501d8a64e Mon Sep 17 00:00:00 2001 From: clojure-build Date: Thu, 1 Jan 2026 22:34:59 +0000 Subject: [PATCH 95/97] [maven-release-plugin] prepare release v1.6.0 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 04143c9e..8fdd3efb 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 tools.reader - 1.5.3-SNAPSHOT + 1.6.0 tools.reader A Clojure reader in Clojure https://github.com/clojure/tools.reader @@ -145,6 +145,6 @@ scm:git:git://github.com/clojure/tools.reader.git scm:git:git://github.com/clojure/tools.reader.git https://github.com/clojure/tools.reader - HEAD + v1.6.0 From 4503437420a5b19d04f4f19b642131cdd6eadd8a Mon Sep 17 00:00:00 2001 From: clojure-build Date: Thu, 1 Jan 2026 22:34:59 +0000 Subject: [PATCH 96/97] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 8fdd3efb..7e1f7958 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 tools.reader - 1.6.0 + 1.6.1-SNAPSHOT tools.reader A Clojure reader in Clojure https://github.com/clojure/tools.reader @@ -145,6 +145,6 @@ scm:git:git://github.com/clojure/tools.reader.git scm:git:git://github.com/clojure/tools.reader.git https://github.com/clojure/tools.reader - v1.6.0 + HEAD From 2914602ff08352a15ae2cdaa49f76e6ca0386818 Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Thu, 1 Jan 2026 16:43:24 -0600 Subject: [PATCH 97/97] update for release --- CHANGELOG.md | 2 +- README.md | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 637c674f..bf2ae723 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ Changelog ======================================== -* Release 1.6.0 on 30 Dec 2025 +* Release 1.6.0 on 01 Jan 2026 * Update parent pom and Clojure dep versions to 1.11.4 * Release 1.5.2 on 10 March 2025 * Fix column number info for number at EOF diff --git a/README.md b/README.md index c9a1cbc5..ef8d7cc8 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ YourKit is kindly supporting open source projects with its full-featured Java Pr Releases and Dependency Information ======================================== -Latest stable release: 1.5.2 +Latest stable release: 1.6.0 * [All Released Versions](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.clojure%22%20AND%20a%3A%22tools.reader%22) @@ -42,13 +42,13 @@ Latest stable release: 1.5.2 [clj](https://clojure.org/guides/getting_started) dependency information: ```clojure -org.clojure/tools.reader {:mvn/version "1.5.2"} +org.clojure/tools.reader {:mvn/version "1.6.0"} ``` [Leiningen](https://github.com/technomancy/leiningen) dependency information: ```clojure -[org.clojure/tools.reader "1.5.2"] +[org.clojure/tools.reader "1.6.0"] ``` [Maven](https://maven.apache.org/) dependency information: @@ -56,7 +56,7 @@ org.clojure/tools.reader {:mvn/version "1.5.2"} org.clojure tools.reader - 1.5.2 + 1.6.0 ```