fix pass, add lite-mode tests

Author: swannodette

src/main/cljs/cljs/analyzer/passes/lite.cljc

@@ -6,21 +6,22 @@
 ;; the terms of this license.
 ;; You must not remove this notice, or any other, from this software.
 
-(ns cljs.analyzer.passes.lite)
+(ns cljs.analyzer.passes.lite
+  (:refer-clojure :exclude [var?]))
 
 (defn var? [ast]
   (= :var (:op ast)))
 
-(def replace
+(def ctor->simple-ctor
   '{cljs.core/vector cljs.core/simple-vector
     cljs.core/vec    cljs.core/simple-vec})
 
 (defn update-var [{:keys [name] :as ast}]
-  (update-in ast :name (get replace name)))
+  (update ast :name ctor->simple-ctor))
 
 (defn replace-var? [ast]
   (and (var? ast)
-       (contains? replace (:name ast))))
+       (contains? ctor->simple-ctor (:name ast))))
 
 (defn use-lite-types
   [env ast _]

src/main/clojure/cljs/analyzer.cljc

@@ -16,6 +16,7 @@
   #?(:clj  (:require [cljs.analyzer.impl :as impl]
                      [cljs.analyzer.impl.namespaces :as nses]
                      [cljs.analyzer.passes.and-or :as and-or]
+                     [cljs.analyzer.passes.lite :as lite]
                      [cljs.env :as env :refer [ensure]]
                      [cljs.externs :as externs]
                      [cljs.js-deps :as deps]
@@ -30,6 +31,7 @@
      :cljs (:require [cljs.analyzer.impl :as impl]
                      [cljs.analyzer.impl.namespaces :as nses]
                      [cljs.analyzer.passes.and-or :as and-or]
+                     [cljs.analyzer.passes.lite :as lite]
                      [cljs.env :as env]
                      [cljs.reader :as edn]
                      [cljs.tagged-literals :as tags]
@@ -4455,10 +4457,8 @@
      :cljs [infer-type and-or/optimize check-invoke-arg-types]))
 
 (defn analyze* [env form name opts]
-  (let [passes *passes*
-        passes (if (nil? passes)
-                 default-passes
-                 passes)
+  (let [passes (cond-> (or *passes* default-passes)
+                 (lite-mode?) (conj lite/use-lite-types))
         form   (if (instance? LazySeq form)
                  (if (seq form) form ())
                  form)

src/test/clojure/cljs/analyzer_pass_tests.clj

@@ -178,8 +178,25 @@
                                  (map (fn [x] x) s))))]))))]
       (is (empty? (re-seq #"or_" code))))))
 
+(deftest test-lite-mode-pass
+  (let [aenv (assoc (ana/empty-env) :context :expr)
+        env  (env/default-compiler-env {:lite-mode true})]
+    (is (= 'cljs.core/simple-vec
+            (-> (env/with-compiler-env env
+                  (comp/with-core-cljs {}
+                    (fn []
+                      (analyze aenv 'cljs.core/vec))))
+              :name)))
+    (is (= 'cljs.core/simple-vector
+          (-> (env/with-compiler-env env
+                (comp/with-core-cljs {}
+                  (fn []
+                    (analyze aenv 'cljs.core/vector))))
+            :name)))))
+
 (comment
   (test/run-tests)
 
   (require '[clojure.pprint :refer [pprint]])
+
   )