From 0c74f22f9bd8e450dd9fcc749f73f672326f9a44 Mon Sep 17 00:00:00 2001 From: Christophe Grand Date: Tue, 20 Aug 2024 15:52:37 +0200 Subject: [PATCH] revert reader version until we figure out the bug --- deps.edn | 2 +- java/src/cljd/lang/LispReader.java | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/deps.edn b/deps.edn index 4f6aa22a..c36c0d08 100644 --- a/deps.edn +++ b/deps.edn @@ -5,4 +5,4 @@ org.clojure/tools.deps.alpha {:mvn/version "0.12.1162"} org.slf4j/slf4j-simple {:mvn/version "1.7.36"} org.yaml/snakeyaml {:mvn/version "2.2"} - org.clojuredart/java-host-lisp-reader {:mvn/version "1.11.1633"}}} + org.clojuredart/java-host-lisp-reader {:mvn/version "1.11.1602"}}} diff --git a/java/src/cljd/lang/LispReader.java b/java/src/cljd/lang/LispReader.java index e2b62996..229a72c4 100644 --- a/java/src/cljd/lang/LispReader.java +++ b/java/src/cljd/lang/LispReader.java @@ -49,8 +49,6 @@ public class LispReader{ final static Keyword TAG_KEY = Keyword.intern(null, "tag"); static Keyword LINE_KEY = Keyword.intern(null, "line"); static Keyword COLUMN_KEY = Keyword.intern(null, "column"); -static Keyword END_LINE_KEY = Keyword.intern(null, "end-line"); -static Keyword END_COLUMN_KEY = Keyword.intern(null, "end-column"); static Namespace currentNS(){ return (Namespace) RT.CURRENT_NS.deref(); @@ -1026,8 +1024,6 @@ else if(!(meta instanceof IPersistentMap)) { meta = RT.assoc(meta, LINE_KEY, RT.get(meta, LINE_KEY, line)); meta = RT.assoc(meta, COLUMN_KEY, RT.get(meta,COLUMN_KEY, column)); - meta = RT.assoc(meta, END_LINE_KEY, RT.get(meta, END_LINE_KEY, ((LineNumberingPushbackReader) r).getLineNumber())); - meta = RT.assoc(meta, END_COLUMN_KEY, RT.get(meta,END_COLUMN_KEY, ((LineNumberingPushbackReader) r).getColumnNumber()-1)); } if(o instanceof IReference) { @@ -1184,7 +1180,7 @@ else if(form instanceof Keyword if(form instanceof IObj && RT.meta(form) != null) { //filter line and column numbers - IPersistentMap newMeta = ((IObj) form).meta().without(LINE_KEY).without(COLUMN_KEY).without(END_LINE_KEY).without(END_COLUMN_KEY); + IPersistentMap newMeta = ((IObj) form).meta().without(LINE_KEY).without(COLUMN_KEY); if(newMeta.count() > 0) return RT.list(WITH_META, ret, syntaxQuote(((IObj) form).meta())); } @@ -1312,8 +1308,6 @@ public Object invoke(Object reader, Object leftparen, Object opts, Object pendin Object meta = RT.meta(s); meta = RT.assoc(meta, LINE_KEY, RT.get(meta, LINE_KEY, line)); meta = RT.assoc(meta, COLUMN_KEY, RT.get(meta,COLUMN_KEY, column)); - meta = RT.assoc(meta, END_LINE_KEY, RT.get(meta, END_LINE_KEY, ((LineNumberingPushbackReader) r).getLineNumber())); - meta = RT.assoc(meta, END_COLUMN_KEY, RT.get(meta,END_COLUMN_KEY, ((LineNumberingPushbackReader) r).getColumnNumber()-1)); return s.withMeta((IPersistentMap)meta); } else