Qualify @ ~ ~@ sexpr's under clojure.core

z/sexpr should return the same value as clojure.core/read-string as per the documentation. After this commit, the only special forms that return different values are ` and #=.
clj-commons · Aug 14, 2024 · ea99838 · ea99838
1 parent bf37e3d
commit ea99838
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 28 deletions.
diff --git a/src/rewrite_clj/node/quote.cljc b/src/rewrite_clj/node/quote.cljc
@@ -110,7 +110,7 @@
   [children]
   (if (sequential? children)
     (->node
-      :unquote "~" 'unquote
+      :unquote "~" 'clojure.core/unquote
       children)
     (recur [children])))
 
@@ -135,6 +135,6 @@
   [children]
   (if (sequential? children)
     (->node
-      :unquote-splicing "~@" 'unquote-splicing
+      :unquote-splicing "~@" 'clojure.core/unquote-splicing
       children)
     (recur [children])))
diff --git a/src/rewrite_clj/node/reader_macro.cljc b/src/rewrite_clj/node/reader_macro.cljc
@@ -68,7 +68,7 @@
   (node-type [_node] :deref)
   (printable-only?[_node] false)
   (sexpr* [_node opts]
-    (list* 'deref (node/sexprs children opts)))
+    (list* 'clojure.core/deref (node/sexprs children opts)))
   (length [_node]
     (inc (node/sum-lengths children)))
   (string [_node]

diff --git a/test/rewrite_clj/parser_test.cljc b/test/rewrite_clj/parser_test.cljc
@@ -2,14 +2,17 @@
       :author "Yannick Scherer"}
  rewrite-clj.parser-test
   (:refer-clojure :exclude [read-string])
-  (:require [clojure.string :as string]
-            [clojure.test :refer [deftest is]]
+  (:require [clojure.core :as cc]
+            [clojure.string :as string]
+            [clojure.test :refer [deftest is testing]]
             [clojure.tools.reader.edn :refer [read-string]]
             [rewrite-clj.node :as node]
             [rewrite-clj.parser :as p])
   #?(:clj (:import [clojure.lang ExceptionInfo]
                    [java.io File])))
 
+(def this-nsym (ns-name *ns*))
+
 (deftest t-parsing-the-first-few-whitespaces
   (doseq [[ws parsed]
           [["   "     "   "]
@@ -130,29 +133,37 @@
        :default (is (Double/isNaN e)))))
 
 (deftest t-parsing-reader-prefixed-data
-  (doseq [[s t ws sexpr]
-          [["@sym"        :deref            []              '(deref sym)]
-           ["@  sym"      :deref            [:whitespace]   '(deref sym)]
-           ["'sym"        :quote            []              '(quote sym)]
-           ["'  sym"      :quote            [:whitespace]   '(quote sym)]
-           ["`sym"        :syntax-quote     []              '(quote sym)]
-           ["`  sym"      :syntax-quote     [:whitespace]   '(quote sym)]
-           ["~sym"        :unquote          []              '(unquote sym)]
-           ["~  sym"      :unquote          [:whitespace]   '(unquote sym)]
-           ["~@sym"       :unquote-splicing []              '(unquote-splicing sym)]
-           ["~@  sym"     :unquote-splicing [:whitespace]   '(unquote-splicing sym)]
-           ["#=sym"       :eval             []              '(eval 'sym)]
-           ["#=  sym"     :eval             [:whitespace]   '(eval 'sym)]
-           ["#'sym"       :var              []              '(var sym)]
-           ["#'\nsym"     :var              [:newline]      '(var sym)]]]
-    (let [n (p/parse-string s)
-          children (node/children n)
-          c (map node/tag children)]
-      (is (= t (node/tag n)))
-      (is (= :token (last c)))
-      (is (= sexpr (node/sexpr n)))
-      (is (= 'sym (node/sexpr (last children))))
-      (is (= ws (vec (butlast c)))))))
+  (doseq [[ s         t                 ws            sexpr        ltag   lcld]
+          [["@sym"    :deref            []            '@sym        :token 'sym]
+           ["@  sym"  :deref            [:whitespace] '@sym        :token 'sym]
+           ["'sym"    :quote            []            ''sym        :token 'sym]
+           ["'  sym"  :quote            [:whitespace] ''sym        :token 'sym]
+           ["`sym"    :syntax-quote     []            ''sym        :token 'sym]
+           ["`  sym"  :syntax-quote     [:whitespace] ''sym        :token 'sym]
+           ["~sym"    :unquote          []            '~sym        :token 'sym]
+           ["~  sym"  :unquote          [:whitespace] '~sym        :token 'sym]
+           ["~@sym"   :unquote-splicing []            '~@sym       :token 'sym]
+           ["~@  sym" :unquote-splicing [:whitespace] '~@sym       :token 'sym]
+           ["~ @sym"  :unquote          [:whitespace] '~ @sym      :deref '@sym]
+           ["#=sym"   :eval             []            '(eval 'sym) :token 'sym]
+           ["#=  sym" :eval             [:whitespace] '(eval 'sym) :token 'sym]
+           ["#'sym"   :var              []            '#'sym       :token 'sym]
+           ["#'\nsym" :var              [:newline]    '#'sym       :token 'sym]]]
+    (testing (pr-str s)
+      (binding [*ns* (the-ns this-nsym)]
+        (let [n (p/parse-string s)
+              children (node/children n)
+              c (map node/tag children)]
+          (is (= t (node/tag n)) "tag")
+          (is (= ltag (last c)) "ltag")
+          (is (= sexpr (node/sexpr n)) "sexpr")
+          (is (= s (node/string n)) "string")
+          ;; ` and #= return different sexpr's than via clojure.core/read-string
+          (when-not (#{:syntax-quote :eval} t)
+            (is (= sexpr (binding [cc/*read-eval* false] (cc/read-string s)))
+                "read-string"))
+          (is (= lcld (node/sexpr (last children))) "lcld")
+          (is (= ws (vec (butlast c))) "ws"))))))
 
 (deftest t-eval
   (let [n (p/parse-string "#=(+ 1 2)")]