CLJS-1942: Self-host: cljs.env.macros and cljs.analyzer.macros can't be loaded

Author: anmonteiro

src/main/clojure/cljs/analyzer/macros.clj

@@ -7,33 +7,32 @@
 ;   You must not remove this notice, or any other, from this software.
 
 (ns cljs.analyzer.macros
-  (:refer-clojure :exclude [binding])
-  (:require [cljs.core :refer [binding]]))
+  (:refer-clojure :exclude [binding]))
 
 (defmacro with-warning-handlers [handlers & body]
-  `(binding [cljs.analyzer/*cljs-warning-handlers* ~handlers]
+  `(cljs.core/binding [cljs.analyzer/*cljs-warning-handlers* ~handlers]
      ~@body))
 
 (defmacro no-warn [& body]
-  `(binding [cljs.analyzer/*cljs-warnings*
-             (zipmap (keys cljs.analyzer/*cljs-warnings*) (repeat false))]
+  `(cljs.core/binding [cljs.analyzer/*cljs-warnings*
+                       (zipmap (keys cljs.analyzer/*cljs-warnings*) (repeat false))]
      ~@body))
 
 (defmacro with-core-macros
   [path & body]
   `(do
      (when (not= cljs.analyzer/*cljs-macros-path* ~path)
        (reset! cljs.analyzer/-cljs-macros-loaded false))
-     (binding [cljs.analyzer/*cljs-macros-path* ~path]
+     (cljs.core/binding [cljs.analyzer/*cljs-macros-path* ~path]
        ~@body)))
 
 (defmacro with-core-macros-file
   [path & body]
   `(do
      (when (not= cljs.analyzer/*cljs-macros-path* ~path)
        (reset! cljs.analyzer/-cljs-macros-loaded false))
-     (binding [cljs.analyzer/*cljs-macros-path* ~path
-               cljs.analyzer/*cljs-macros-is-classpath* false]
+     (cljs.core/binding [cljs.analyzer/*cljs-macros-path* ~path
+                         cljs.analyzer/*cljs-macros-is-classpath* false]
        ~@body)))
 
 (defmacro wrapping-errors [env & body]
@@ -45,13 +44,13 @@
          (throw (cljs.analyzer/error ~env (.-message err#) err#))))))
 
 (defmacro disallowing-recur [& body]
-  `(binding [cljs.analyzer/*recur-frames*
-             (cons nil cljs.analyzer/*recur-frames*)]
+  `(cljs.core/binding [cljs.analyzer/*recur-frames*
+                       (cons nil cljs.analyzer/*recur-frames*)]
      ~@body))
 
 (defmacro allowing-redef [& body]
-  `(binding [cljs.analyzer/*allow-redef* true]
+  `(cljs.core/binding [cljs.analyzer/*allow-redef* true]
      ~@body))
 
 (defmacro disallowing-ns* [& body]
-  `(binding [cljs.analyzer/*allow-ns* false] ~@body))
+  `(cljs.core/binding [cljs.analyzer/*allow-ns* false] ~@body))

src/main/clojure/cljs/compiler/macros.clj

@@ -7,11 +7,10 @@
 ;   You must not remove this notice, or any other, from this software.
 
 (ns cljs.compiler.macros
-  (:refer-clojure :exclude [let])
-  (:require [cljs.core :refer [let]]))
+  (:refer-clojure :exclude [let]))
 
 (defmacro emit-wrap [env & body]
-  `(let [env# ~env]
+  `(cljs.core/let [env# ~env]
      (when (= :return (:context env#)) (cljs.compiler/emits "return "))
      ~@body
-     (when-not (= :expr (:context env#)) (cljs.compiler/emitln ";"))))
+     (when-not (= :expr (:context env#)) (cljs.compiler/emitln ";"))))

src/main/clojure/cljs/env/macros.clj

@@ -7,8 +7,7 @@
 ;   You must not remove this notice, or any other, from this software.
 
 (ns cljs.env.macros
-  (:refer-clojure :exclude [binding ensure])
-  (:require [cljs.core :refer [binding]]))
+  (:refer-clojure :exclude [binding ensure]))
 
 (defmacro with-compiler-env
    "Evaluates [body] with [env] bound as the value of the `*compiler*` var in
@@ -23,7 +22,7 @@
                    (js/Error.
                      (str "Compiler environment must be a map or atom containing a map, not "
                        (type env#)))))]
-      (binding [cljs.env/*compiler* env#]
+      (cljs.core/binding [cljs.env/*compiler* env#]
         ~@body)))
 
 (defmacro ensure
@@ -35,4 +34,4 @@
        ~@body
        (finally
          (when (nil? val#)
-           (set! cljs.env/*compiler* nil))))))
+           (set! cljs.env/*compiler* nil))))))

src/test/self/self_parity/test.cljs

@@ -171,10 +171,7 @@
   [name macros]
   ((if macros
      #{'cljs.core
-       'cljs.pprint
-       'cljs.env.macros
-       'cljs.analyzer.macros
-       'cljs.compiler.macros}
+       'cljs.pprint}
      #{'goog.object
        'goog.string
        'goog.string.StringBuffer