wip

Author: borkdude

bb/tasks.clj

@@ -121,5 +121,5 @@
 (defn libtests []
   #_(build-squint-npm-package)
   ;; temporarily disabled because of not= bug
-  #_(eucalypt-test)
+  (eucalypt-test)
   (clojure-mode-test))

src/squint/compiler.cljc

@@ -309,6 +309,40 @@
            (str/join ", " (emit-args (expr-env env) expr)))
    env))
 
+(defn- make-get-expander [env]
+  (when (:anf env)
+    (fn [op env]
+      (when (symbol? op)
+        (let [ns-state (some-> (:ns-state env) deref)
+              current (:current ns-state)
+              current-ns-state (get ns-state current)
+              excluded? (contains? current-ns-state op)
+              head (strip-core-symbol op)]
+          (when-not (or (:squint.compiler/skip-macro (meta op))
+                        excluded?)
+            (case head
+              let (fn [form env & args]
+                    (let [result (core-let env (first args) (rest args))]
+                      ;; core-let returns (cljs.core/let* ...), normalize
+                      (if (and (seq? result) (= 'cljs.core/let* (first result)))
+                        (cons 'let* (rest result))
+                        result)))
+              fn (fn [form _env & sigs]
+                   (apply core-fn form {} sigs))
+              (or (built-in-macros head)
+                  (let [ns (namespace head)
+                        nm (name head)
+                        nms (symbol nm)]
+                    (if ns
+                      (let [nss (symbol ns)]
+                        (or
+                         (some-> env :macros (get nss) (get nms))
+                         (let [resolved-ns (get-in current-ns-state [:aliases nss] nss)]
+                           (get-in ns-state [:macros resolved-ns nms]))))
+                      (let [refers (:refers current-ns-state)]
+                        (when-let [macro-ns (get refers nms)]
+                          (get-in ns-state [:macros macro-ns nms])))))))))))))
+
 (defn transpile-form
   ([f] (transpile-form f nil))
   ([f env]
@@ -331,40 +365,7 @@
                              ::cc/keyword emit-keyword
                              ::cc/set emit-set
                              ::cc/special emit-special}
-                      ::anf/get-expander
-                      (fn [op env]
-                        (when (symbol? op)
-                          (let [ns-state (some-> (:ns-state env) deref)
-                                current (:current ns-state)
-                                current-ns-state (get ns-state current)
-                                excluded? (contains? current-ns-state op)
-                                head (strip-core-symbol op)]
-                            (when-not (or (:squint.compiler/skip-macro (meta op))
-                                          excluded?)
-                              (case head
-                                let (fn [form env & args]
-                                      (let [result (core-let env (first args) (rest args))]
-                                        ;; core-let returns (cljs.core/let* ...), normalize
-                                        (if (and (seq? result) (= 'cljs.core/let* (first result)))
-                                          (cons 'let* (rest result))
-                                          result)))
-                                fn (fn [form _env & sigs]
-                                     (apply core-fn form {} sigs))
-                                (or (built-in-macros head)
-                                    (let [ns (namespace head)
-                                          nm (name head)
-                                          nms (symbol nm)]
-                                      (if ns
-                                        (let [nss (symbol ns)]
-                                          (or
-                                           (some-> env :macros (get nss) (get nms))
-                                           (let [resolved-ns (get-in current-ns-state [:aliases nss] nss)]
-                                             (get-in ns-state [:macros resolved-ns nms]))))
-                                        (let [refers (:refers current-ns-state)]
-                                          (when-let [macro-ns (get refers nms)]
-                                            (get-in ns-state [:macros macro-ns nms])))))))))))
-                      } env))))))
-
+                      ::anf/get-expander (make-get-expander env)} env))))))
 (def ^:dynamic *jsx* false)
 
 (defn jsx [form]

src/squint/internal/cli.cljs

@@ -128,7 +128,8 @@ Use squint <subcommand> --help to show more info.")))
 Options:
 
 --no-run: do not run compiled expression
---show:   print compiled expression")
+--show:   print compiled expression
+--anf:    enable ANF transformation (eliminates IIFEs)")
       (let [e e #_(if (:repl opts)
                 (str/replace "(do %s\n)" "%s" e)
                 e)
@@ -226,7 +227,8 @@ Options:
   (cli/dispatch table
                 (.slice js/process.argv 2)
                 {:aliases {:h :help}
-                 :coerce {:elide-exports :boolean
+                 :coerce {:anf            :boolean
+                          :elide-exports :boolean
                           :elide-imports :boolean
                           :output-dir    :string
                           :repl          :boolean

test/squint/test_utils.cljs

@@ -53,11 +53,13 @@
    (if (string? expr)
      (let [{:keys [pragmas body]}
            (squint/compile-string* expr (merge {:elide-imports true
-                                                :core-alias "squint_core"}
+                                                :core-alias "squint_core"
+                                                :anf true}
                                                opts))]
        (str pragmas body))
      (squint/transpile-form expr (merge {:elide-imports true
-                                         :core-alias "squint_core"}
+                                         :core-alias "squint_core"
+                                         :anf true}
                                         opts)))))
 
 (defn js!