CLJS-1943: Self-host: cljs.pprint's macros can't be compiled

Author: anmonteiro

src/main/cljs/cljs/pprint.clj renamed to src/main/cljs/cljs/pprint.cljc

@@ -7,8 +7,9 @@
 ;; You must not remove this notice, or any other, from this software.
 
 (ns cljs.pprint
-  (:refer-clojure :exclude [deftype])
-  (:require [clojure.walk :as walk]))
+  (:refer-clojure :exclude [deftype #?(:cljs macroexpand)])
+  (:require [clojure.walk :as walk]
+            #?(:cljs [cljs.analyzer :as ana])))
 
 
 ;; required the following changes:
@@ -78,10 +79,19 @@
                (cljs.pprint/end-block cljs.core/*out*))))
          nil)))
 
-(defn- pll-mod-body [var-sym body]
+#?(:cljs
+   (defn macroexpand [env form]
+     (loop [form form
+            form' (ana/macroexpand-1 env form)]
+       (if-not (identical? form form')
+         (recur form' (ana/macroexpand-1 env form'))
+         form'))))
+
+(defn- pll-mod-body [env var-sym body]
   (letfn [(inner [form]
                  (if (seq? form)
-                   (let [form (macroexpand form)]
+                   (let [form #?(:clj  (macroexpand form)
+                                 :cljs (macroexpand env form))]
                      (condp = (first form)
                        'loop* form
                        'recur (concat `(recur (inc ~var-sym)) (rest form))
@@ -94,7 +104,7 @@
   for use in pretty-printer dispatch functions."
   [bindings & body]
   (let [count-var (gensym "length-count")
-        mod-body (pll-mod-body count-var body)]
+        mod-body (pll-mod-body &env count-var body)]
     `(loop ~(apply vector count-var 0 bindings)
        (if (or (not cljs.core/*print-length*) (< ~count-var cljs.core/*print-length*))
          (do ~@mod-body)
@@ -154,4 +164,4 @@ format-in can be either a control string or a previously compiled format."
   "A convenience macro that pretty prints the last thing output. This is
 exactly equivalent to (pprint *1)."
   {:added "1.2"}
-  [] `(cljs.pprint/pprint *1))
+  [] `(cljs.pprint/pprint *1))

src/test/cljs/cljs/pprint_test.clj

@@ -7,15 +7,15 @@
 ;; You must not remove this notice, or any other, from this software.
 
 (ns cljs.pprint-test
-  (:require [cljs.test :refer [deftest is]]))
+  (:require cljs.test))
 
 (defmacro simple-tests [name & test-pairs]
-  `(deftest ~name
+  `(cljs.test/deftest ~name
      ~@(for [[x y] (partition 2 test-pairs)]
          `(cond
-            (cljs.core/regexp? ~y) (is (.exec ~y ~x))
-            (cljs.core/string? ~y) (is (= ~x ~y))
-            :else (is (= ~x ~y))))))
+            (cljs.core/regexp? ~y) (cljs.test/is (.exec ~y ~x))
+            (cljs.core/string? ~y) (cljs.test/is (= ~x ~y))
+            :else (cljs.test/is (= ~x ~y))))))
 
 (defmacro code-block
   "Read a string then print it with code-dispatch and succeed if it comes out the same"
@@ -28,4 +28,3 @@
                       (cljs.pprint/with-pprint-dispatch cljs.pprint/code-dispatch
                                             (cljs.pprint/pprint (cljs.reader/read-string ~block)))))
                   (clojure.string/split-lines ~block)]))))
-

src/test/self/self_parity/test.cljs

@@ -170,15 +170,13 @@
   technical issues)."
   [name macros]
   ((if macros
-     #{'cljs.core
-       'cljs.pprint}
+     #{'cljs.core}
      #{'goog.object
        'goog.string
        'goog.string.StringBuffer
        'goog.array
        'cljs.core
        'cljs.env
-       'cljs.pprint
        'cljs.tools.reader
        'clojure.walk}) name))
 
@@ -288,8 +286,8 @@
                    #_[cljs.keyword-test]
                    [cljs.import-test]
                    [cljs.ns-test.foo]
-                   #_[cljs.pprint]
-                   #_[cljs.pprint-test]
+                   [cljs.pprint]
+                   [cljs.pprint-test]
                    [cljs.spec-test]
                    #_[cljs.spec.test-test]
                    [cljs.clojure-alias-test]
@@ -325,8 +323,8 @@
                'cljs.ns-test.foo
                'foo.ns-shadow-test
                'cljs.import-test
-               #_'cljs.pprint
-               #_'cljs.pprint-test
+               'cljs.pprint
+               'cljs.pprint-test
                'cljs.spec-test
                #_'cljs.spec.test-test
                'cljs.clojure-alias-test