From 9ad79e1c9b87c862ccb7ad6aad37d90414123c76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20AMIARD?= Date: Fri, 15 Jun 2012 15:53:26 +0200 Subject: [PATCH] Decouple analyzer from compiler The analyzer is now living in it's own file, with all related functions. The rest of the compiler has been updated so that references to the analyze part of the compiler now references the analyzer namespace. --- src/clj/cljs/analyzer.clj | 938 +++++++++++++++++++++++++++++++++++ src/clj/cljs/closure.clj | 11 +- src/clj/cljs/compiler.clj | 947 +----------------------------------- src/clj/cljs/core.clj | 28 +- src/clj/cljs/repl.clj | 37 +- src/clj/cljs/repl/rhino.clj | 5 +- 6 files changed, 994 insertions(+), 972 deletions(-) create mode 100644 src/clj/cljs/analyzer.clj diff --git a/src/clj/cljs/analyzer.clj b/src/clj/cljs/analyzer.clj new file mode 100644 index 0000000000..8edcc2f61f --- /dev/null +++ b/src/clj/cljs/analyzer.clj @@ -0,0 +1,938 @@ +; Copyright (c) Rich Hickey. All rights reserved. +; The use and distribution terms for this software are covered by the +; Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php) +; which can be found in the file epl-v10.html at the root of this distribution. +; By using this software in any fashion, you are agreeing to be bound by +; the terms of this license. +; You must not remove this notice, or any other, from this software. + +(set! *warn-on-reflection* true) + +(ns cljs.analyzer + (:refer-clojure :exclude [macroexpand-1]) + (:require [clojure.java.io :as io] + [clojure.string :as string] + [cljs.tagged-literals :as tags]) + (:import java.lang.StringBuilder)) + +(declare resolve-var) +(declare resolve-existing-var) +(declare warning) +(def ^:dynamic *cljs-warn-on-undeclared* false) +(declare confirm-bindings) +(declare ^:dynamic *cljs-file*) + +(defonce namespaces (atom '{cljs.core {:name cljs.core} + cljs.user {:name cljs.user}})) + +(defn reset-namespaces! [] + (reset! namespaces + '{cljs.core {:name cljs.core} + cljs.user {:name cljs.user}})) + +(defn get-namespace [key] + (@namespaces key)) + +(defn set-namespace [key val] + (swap! namespaces assoc key val)) + +(def ^:dynamic *cljs-ns* 'cljs.user) +(def ^:dynamic *cljs-file* nil) +(def ^:dynamic *cljs-warn-on-redef* true) +(def ^:dynamic *cljs-warn-on-dynamic* true) +(def ^:dynamic *cljs-warn-on-fn-var* true) +(def ^:dynamic *cljs-warn-fn-arity* true) +(def ^:dynamic *unchecked-if* (atom false)) +(def ^:dynamic *cljs-static-fns* false) +(def ^:dynamic *cljs-macros-path* "/cljs/core") +(def ^:dynamic *cljs-macros-is-classpath* true) +(def -cljs-macros-loaded (atom false)) + +(defn load-core [] + (when (not @-cljs-macros-loaded) + (reset! -cljs-macros-loaded true) + (if *cljs-macros-is-classpath* + (load *cljs-macros-path*) + (load-file *cljs-macros-path*)))) + +(defmacro with-core-macros + [path & body] + `(do + (when (not= *cljs-macros-path* ~path) + (reset! -cljs-macros-loaded false)) + (binding [*cljs-macros-path* ~path] + ~@body))) + +(defmacro with-core-macros-file + [path & body] + `(do + (when (not= *cljs-macros-path* ~path) + (reset! -cljs-macros-loaded false)) + (binding [*cljs-macros-path* ~path + *cljs-macros-is-classpath* false] + ~@body))) + +(defn empty-env [] + {:ns (@namespaces *cljs-ns*) :context :statement :locals {}}) + +(defmacro ^:private debug-prn + [& args] + `(.println System/err (str ~@args))) + +(defn warning [env s] + (binding [*out* *err*] + (println + (str s (when (:line env) + (str " at line " (:line env) " " *cljs-file*)))))) + +(defn confirm-var-exists [env prefix suffix] + (when *cljs-warn-on-undeclared* + (let [crnt-ns (-> env :ns :name)] + (when (= prefix crnt-ns) + (when-not (-> @namespaces crnt-ns :defs suffix) + (warning env + (str "WARNING: Use of undeclared Var " prefix "/" suffix))))))) + +(defn resolve-ns-alias [env name] + (let [sym (symbol name)] + (get (:requires (:ns env)) sym sym))) + +(defn core-name? + "Is sym visible from core in the current compilation namespace?" + [env sym] + (and (get (:defs (@namespaces 'cljs.core)) sym) + (not (contains? (-> env :ns :excludes) sym)))) + +(defn resolve-existing-var [env sym] + (if (= (namespace sym) "js") + {:name sym :ns 'js} + (let [s (str sym) + lb (-> env :locals sym)] + (cond + lb lb + + (namespace sym) + (let [ns (namespace sym) + ns (if (= "clojure.core" ns) "cljs.core" ns) + full-ns (resolve-ns-alias env ns)] + (confirm-var-exists env full-ns (symbol (name sym))) + (merge (get-in @namespaces [full-ns :defs (symbol (name sym))]) + {:name (symbol (str full-ns) (str (name sym))) + :ns full-ns})) + + (.contains s ".") + (let [idx (.indexOf s ".") + prefix (symbol (subs s 0 idx)) + suffix (subs s (inc idx)) + lb (-> env :locals prefix)] + (if lb + {:name (symbol (str (:name lb) suffix))} + (do + (confirm-var-exists env prefix (symbol suffix)) + (merge (get-in @namespaces [prefix :defs (symbol suffix)]) + {:name (if (= "" prefix) (symbol suffix) (symbol (str prefix) suffix)) + :ns prefix})))) + + (get-in @namespaces [(-> env :ns :name) :uses sym]) + (let [full-ns (get-in @namespaces [(-> env :ns :name) :uses sym])] + (merge + (get-in @namespaces [full-ns :defs sym]) + {:name (symbol (str full-ns) (str sym)) + :ns (-> env :ns :name)})) + + :else + (let [full-ns (if (core-name? env sym) + 'cljs.core + (-> env :ns :name))] + (confirm-var-exists env full-ns sym) + (merge (get-in @namespaces [full-ns :defs sym]) + {:name (symbol (str full-ns) (str sym)) + :ns full-ns})))))) + +(defn resolve-var [env sym] + (if (= (namespace sym) "js") + {:name sym} + (let [s (str sym) + lb (-> env :locals sym)] + (cond + lb lb + + (namespace sym) + (let [ns (namespace sym) + ns (if (= "clojure.core" ns) "cljs.core" ns)] + {:name (symbol (str (resolve-ns-alias env ns)) (name sym))}) + + (.contains s ".") + (let [idx (.indexOf s ".") + prefix (symbol (subs s 0 idx)) + suffix (subs s idx) + lb (-> env :locals prefix)] + (if lb + {:name (symbol (str (:name lb) suffix))} + {:name sym})) + + (get-in @namespaces [(-> env :ns :name) :uses sym]) + (let [full-ns (get-in @namespaces [(-> env :ns :name) :uses sym])] + (merge + (get-in @namespaces [full-ns :defs sym]) + {:name (symbol (str full-ns) (name sym))})) + + :else + (let [ns (if (core-name? env sym) + 'cljs.core + (-> env :ns :name))] + {:name (symbol (str ns) (name sym))}))))) + +(defn confirm-bindings [env names] + (doseq [name names] + (let [env (merge env {:ns (@namespaces *cljs-ns*)}) + ev (resolve-existing-var env name)] + (when (and *cljs-warn-on-dynamic* + ev (not (-> ev :dynamic))) + (warning env + (str "WARNING: " (:name ev) " not declared ^:dynamic")))))) + +(declare analyze analyze-symbol analyze-seq) + +(def specials '#{if def fn* do let* loop* letfn* throw try* recur new set! ns deftype* defrecord* . js* & quote}) + +(def ^:dynamic *recur-frames* nil) +(def ^:dynamic *loop-lets* nil) + +(defmacro disallowing-recur [& body] + `(binding [*recur-frames* (cons nil *recur-frames*)] ~@body)) + +(defn analyze-block + "returns {:statements .. :ret ..}" + [env exprs] + (let [statements (disallowing-recur + (seq (map #(analyze (assoc env :context :statement) %) (butlast exprs)))) + ret (if (<= (count exprs) 1) + (analyze env (first exprs)) + (analyze (assoc env :context (if (= :statement (:context env)) :statement :return)) (last exprs)))] + {:statements statements :ret ret})) + +(defmulti parse (fn [op & rest] op)) + +(defmethod parse 'if + [op env [_ test then else :as form] name] + (let [test-expr (disallowing-recur (analyze (assoc env :context :expr) test)) + then-expr (analyze env then) + else-expr (analyze env else)] + {:env env :op :if :form form + :test test-expr :then then-expr :else else-expr + :unchecked @*unchecked-if* + :children [test-expr then-expr else-expr]})) + +(defmethod parse 'throw + [op env [_ throw :as form] name] + (let [throw-expr (disallowing-recur (analyze (assoc env :context :expr) throw))] + {:env env :op :throw :form form + :throw throw-expr + :children [throw-expr]})) + +(defn- block-children [{:keys [statements ret]}] + (conj (vec statements) ret)) + +(defmethod parse 'try* + [op env [_ & body :as form] name] + (let [body (vec body) + catchenv (update-in env [:context] #(if (= :expr %) :return %)) + tail (peek body) + fblock (when (and (seq? tail) (= 'finally (first tail))) + (rest tail)) + finally (when fblock + (analyze-block + (assoc env :context :statement) + fblock)) + body (if finally (pop body) body) + tail (peek body) + cblock (when (and (seq? tail) + (= 'catch (first tail))) + (rest tail)) + name (first cblock) + locals (:locals catchenv) + locals (if name + (assoc locals name {:name name}) + locals) + catch (when cblock + (analyze-block (assoc catchenv :locals locals) (rest cblock))) + body (if name (pop body) body) + try (when body + (analyze-block (if (or name finally) catchenv env) body))] + (when name (assert (not (namespace name)) "Can't qualify symbol in catch")) + {:env env :op :try* :form form + :try try + :finally finally + :name name + :catch catch + :children (vec (mapcat block-children + [try catch finally]))})) + +(defmethod parse 'def + [op env form name] + (let [pfn (fn + ([_ sym] {:sym sym}) + ([_ sym init] {:sym sym :init init}) + ([_ sym doc init] {:sym sym :doc doc :init init})) + args (apply pfn form) + sym (:sym args) + tag (-> sym meta :tag) + protocol (-> sym meta :protocol) + dynamic (-> sym meta :dynamic) + ns-name (-> env :ns :name)] + (assert (not (namespace sym)) "Can't def ns-qualified name") + (let [env (if (or (and (not= ns-name 'cljs.core) + (core-name? env sym)) + (get-in @namespaces [ns-name :uses sym])) + (let [ev (resolve-existing-var (dissoc env :locals) sym)] + (when *cljs-warn-on-redef* + (warning env + (str "WARNING: " sym " already refers to: " (symbol (str (:ns ev)) (str sym)) + " being replaced by: " (symbol (str ns-name) (str sym))))) + (swap! namespaces update-in [ns-name :excludes] conj sym) + (update-in env [:ns :excludes] conj sym)) + env) + name (:name (resolve-var (dissoc env :locals) sym)) + init-expr (when (contains? args :init) + (disallowing-recur + (analyze (assoc env :context :expr) (:init args) sym))) + fn-var? (and init-expr (= (:op init-expr) :fn)) + export-as (when-let [export-val (-> sym meta :export)] + (if (= true export-val) name export-val)) + doc (or (:doc args) (-> sym meta :doc))] + (when-let [v (get-in @namespaces [ns-name :defs sym])] + (when (and *cljs-warn-on-fn-var* + (not (-> sym meta :declared)) + (and (:fn-var v) (not fn-var?))) + (warning env + (str "WARNING: " (symbol (str ns-name) (str sym)) + " no longer fn, references are stale")))) + (swap! namespaces update-in [ns-name :defs sym] + (fn [m] + (let [m (assoc (or m {}) :name name)] + (merge m + (when tag {:tag tag}) + (when dynamic {:dynamic true}) + (when-let [line (:line env)] + {:file *cljs-file* :line line}) + ;; the protocol a protocol fn belongs to + (when protocol + {:protocol protocol}) + ;; symbol for reified protocol + (when-let [protocol-symbol (-> sym meta :protocol-symbol)] + {:protocol-symbol protocol-symbol}) + (when fn-var? + {:fn-var true + ;; protocol implementation context + :protocol-impl (:protocol-impl init-expr) + ;; inline protocol implementation context + :protocol-inline (:protocol-inline init-expr) + :variadic (:variadic init-expr) + :max-fixed-arity (:max-fixed-arity init-expr) + :method-params (map (fn [m] + (:params m)) + (:methods init-expr))}))))) + (merge {:env env :op :def :form form + :name name :doc doc :init init-expr} + (when tag {:tag tag}) + (when dynamic {:dynamic true}) + (when export-as {:export export-as}) + (when init-expr {:children [init-expr]}))))) + +(defn- analyze-fn-method [env locals meth gthis] + (letfn [(uniqify [[p & r]] + (when p + (cons (if (some #{p} r) (gensym (str p)) p) + (uniqify r))))] + (let [params (first meth) + variadic (boolean (some '#{&} params)) + params (vec (uniqify (remove '#{&} params))) + fixed-arity (count (if variadic (butlast params) params)) + body (next meth) + locals (reduce (fn [m name] + (assoc m name {:name name + :tag (-> name meta :tag)})) + locals params) + recur-frame {:names params :flag (atom nil)} + block (binding [*recur-frames* (cons recur-frame *recur-frames*)] + (analyze-block (assoc env :context :return :locals locals) body))] + (merge {:env env :variadic variadic :params params :max-fixed-arity fixed-arity + :gthis gthis :recurs @(:flag recur-frame)} + block)))) + +(defmethod parse 'fn* + [op env [_ & args :as form] name] + (let [[name meths] (if (symbol? (first args)) + [(first args) (next args)] + [name (seq args)]) + ;;turn (fn [] ...) into (fn ([]...)) + meths (if (vector? (first meths)) (list meths) meths) + locals (:locals env) + locals (if name (assoc locals name {:name name}) locals) + fields (-> form meta ::fields) + protocol-impl (-> form meta :protocol-impl) + protocol-inline (-> form meta :protocol-inline) + gthis (and fields (gensym "this__")) + locals (reduce (fn [m fld] + (assoc m fld + {:name (symbol (str gthis "." fld)) + :field true + :mutable (-> fld meta :mutable) + :tag (-> fld meta :tag)})) + locals fields) + + menv (if (> (count meths) 1) (assoc env :context :expr) env) + menv (merge menv + {:protocol-impl protocol-impl + :protocol-inline protocol-inline}) + methods (map #(analyze-fn-method menv locals % gthis) meths) + max-fixed-arity (apply max (map :max-fixed-arity methods)) + variadic (boolean (some :variadic methods)) + locals (if name (assoc locals name {:name name :fn-var true + :variadic variadic + :max-fixed-arity max-fixed-arity + :method-params (map :params methods)})) + methods (if name + ;; a second pass with knowledge of our function-ness/arity + ;; lets us optimize self calls + (map #(analyze-fn-method menv locals % gthis) meths) + methods)] + ;;todo - validate unique arities, at most one variadic, variadic takes max required args + {:env env :op :fn :form form :name name :methods methods :variadic variadic + :recur-frames *recur-frames* :loop-lets *loop-lets* + :jsdoc [(when variadic "@param {...*} var_args")] + :max-fixed-arity max-fixed-arity + :protocol-impl protocol-impl + :protocol-inline protocol-inline + :children (vec (mapcat block-children + methods))})) + +(defmethod parse 'letfn* + [op env [_ bindings & exprs :as form] name] + (assert (and (vector? bindings) (even? (count bindings))) "bindings must be vector of even number of elements") + (let [n->fexpr (into {} (map (juxt first second) (partition 2 bindings))) + names (keys n->fexpr) + n->gsym (into {} (map (juxt identity #(gensym (str % "__"))) names)) + gsym->n (into {} (map (juxt n->gsym identity) names)) + context (:context env) + bes (reduce (fn [bes n] + (let [g (n->gsym n)] + (conj bes {:name g + :tag (-> n meta :tag) + :local true}))) + [] + names) + meth-env (reduce (fn [env be] + (let [n (gsym->n (be :name))] + (assoc-in env [:locals n] be))) + (assoc env :context :expr) + bes) + [meth-env finits] + (reduce (fn [[env finits] n] + (let [finit (analyze meth-env (n->fexpr n)) + be (-> (get-in env [:locals n]) + (assoc :init finit))] + [(assoc-in env [:locals n] be) + (conj finits finit)])) + [meth-env []] + names) + {:keys [statements ret]} + (analyze-block (assoc meth-env :context (if (= :expr context) :return context)) exprs) + bes (vec (map #(get-in meth-env [:locals %]) names))] + {:env env :op :letfn :bindings bes :statements statements :ret ret :form form + :children (into (vec (map :init bes)) + (conj (vec statements) ret))})) + +(defmethod parse 'do + [op env [_ & exprs :as form] _] + (let [block (analyze-block env exprs)] + (merge {:env env :op :do :form form :children (block-children block)} block))) + +(defn analyze-let + [encl-env [_ bindings & exprs :as form] is-loop] + (assert (and (vector? bindings) (even? (count bindings))) "bindings must be vector of even number of elements") + (let [context (:context encl-env) + [bes env] + (disallowing-recur + (loop [bes [] + env (assoc encl-env :context :expr) + bindings (seq (partition 2 bindings))] + (if-let [[name init] (first bindings)] + (do + (assert (not (or (namespace name) (.contains (str name) "."))) (str "Invalid local name: " name)) + (let [init-expr (analyze env init) + be {:name (gensym (str name "__")) + :init init-expr + :tag (or (-> name meta :tag) + (-> init-expr :tag) + (-> init-expr :info :tag)) + :local true}] + (recur (conj bes be) + (assoc-in env [:locals name] be) + (next bindings)))) + [bes env]))) + recur-frame (when is-loop {:names (vec (map :name bes)) :flag (atom nil)}) + {:keys [statements ret]} + (binding [*recur-frames* (if recur-frame (cons recur-frame *recur-frames*) *recur-frames*) + *loop-lets* (cond + is-loop (or *loop-lets* ()) + *loop-lets* (cons {:names (vec (map :name bes))} *loop-lets*))] + (analyze-block (assoc env :context (if (= :expr context) :return context)) exprs))] + {:env encl-env :op :let :loop is-loop + :bindings bes :statements statements :ret ret :form form + :children (into (vec (map :init bes)) + (conj (vec statements) ret))})) + +(defmethod parse 'let* + [op encl-env form _] + (analyze-let encl-env form false)) + +(defmethod parse 'loop* + [op encl-env form _] + (analyze-let encl-env form true)) + +(defmethod parse 'recur + [op env [_ & exprs :as form] _] + (let [context (:context env) + frame (first *recur-frames*) + exprs (disallowing-recur (vec (map #(analyze (assoc env :context :expr) %) exprs)))] + (assert frame "Can't recur here") + (assert (= (count exprs) (count (:names frame))) "recur argument count mismatch") + (reset! (:flag frame) true) + (assoc {:env env :op :recur :form form} + :frame frame + :exprs exprs + :children exprs))) + +(defmethod parse 'quote + [_ env [_ x] _] + {:op :constant :env env :form x}) + +(defmethod parse 'new + [_ env [_ ctor & args :as form] _] + (disallowing-recur + (let [enve (assoc env :context :expr) + ctorexpr (analyze enve ctor) + argexprs (vec (map #(analyze enve %) args)) + known-num-fields (:num-fields (resolve-existing-var env ctor)) + argc (count args)] + (when (and known-num-fields (not= known-num-fields argc)) + (warning env + (str "WARNING: Wrong number of args (" argc ") passed to " ctor))) + + {:env env :op :new :form form :ctor ctorexpr :args argexprs + :children (into [ctorexpr] argexprs)}))) + +(defmethod parse 'set! + [_ env [_ target val alt :as form] _] + (let [[target val] (if alt + ;; (set! o -prop val) + [`(. ~target ~val) alt] + [target val])] + (disallowing-recur + (let [enve (assoc env :context :expr) + targetexpr (cond + ;; TODO: proper resolve + (= target '*unchecked-if*) + (do + (reset! *unchecked-if* val) + ::set-unchecked-if) + + (symbol? target) + (do + (let [local (-> env :locals target)] + (assert (or (nil? local) + (and (:field local) + (:mutable local))) + "Can't set! local var or non-mutable field")) + (analyze-symbol enve target)) + + :else + (when (seq? target) + (let [targetexpr (analyze-seq enve target nil)] + (when (:field targetexpr) + targetexpr)))) + valexpr (analyze enve val)] + (assert targetexpr "set! target must be a field or a symbol naming a var") + (cond + (= targetexpr ::set-unchecked-if) {:env env :op :no-op} + :else {:env env :op :set! :form form :target targetexpr :val valexpr + :children [targetexpr valexpr]}))))) + +(defn munge-path [ss] + (clojure.lang.Compiler/munge (str ss))) + +(defn ns->relpath [s] + (str (string/replace (munge-path s) \. \/) ".cljs")) + +(declare analyze-file) + +(defn analyze-deps [deps] + (doseq [dep deps] + (when-not (:defs (@namespaces dep)) + (let [relpath (ns->relpath dep)] + (when (io/resource relpath) + (analyze-file relpath)))))) + +(defmethod parse 'ns + [_ env [_ name & args :as form] _] + (let [docstring (if (string? (first args)) (first args) nil) + args (if docstring (next args) args) + excludes + (reduce (fn [s [k exclude xs]] + (if (= k :refer-clojure) + (do + (assert (= exclude :exclude) "Only [:refer-clojure :exclude [names]] form supported") + (assert (not (seq s)) "Only one :refer-clojure form is allowed per namespace definition") + (into s xs)) + s)) + #{} args) + deps (atom #{}) + valid-forms (atom #{:use :use-macros :require :require-macros}) + error-msg (fn [spec msg] (str msg "; offending spec: " (pr-str spec))) + parse-require-spec (fn parse-require-spec [macros? spec] + (assert (or (symbol? spec) (vector? spec)) + (error-msg spec "Only [lib.ns & options] and lib.ns specs supported in :require / :require-macros")) + (when (vector? spec) + (assert (symbol? (first spec)) + (error-msg spec "Library name must be specified as a symbol in :require / :require-macros")) + (assert (odd? (count spec)) + (error-msg spec "Only :as alias and :refer [names] options supported in :require")) + (assert (every? #{:as :refer} (map first (partition 2 (next spec)))) + (error-msg spec "Only :as and :refer options supported in :require / :require-macros")) + (assert (let [fs (frequencies (next spec))] + (and (<= (fs :as 0) 1) + (<= (fs :refer 0) 1))) + (error-msg spec "Each of :as and :refer options may only be specified once in :require / :require-macros"))) + (if (symbol? spec) + (recur macros? [spec :as spec]) + (let [[lib & opts] spec + {alias :as referred :refer} (apply hash-map opts) + [rk uk] (if macros? [:require-macros :use-macros] [:require :use])] + (assert (or (symbol? alias) (nil? alias)) + (error-msg spec ":as must be followed by a symbol in :require / :require-macros")) + (assert (or (and (vector? referred) (every? symbol? referred)) + (nil? referred)) + (error-msg spec ":refer must be followed by a vector of symbols in :require / :require-macros")) + (swap! deps conj lib) + (merge (when alias {rk {alias lib}}) + (when referred {uk (apply hash-map (interleave referred (repeat lib)))}))))) + use->require (fn use->require [[lib kw referred :as spec]] + (assert (and (symbol? lib) (= :only kw) (vector? referred) (every? symbol? referred)) + (error-msg spec "Only [lib.ns :only [names]] specs supported in :use / :use-macros")) + [lib :refer referred]) + {uses :use requires :require uses-macros :use-macros requires-macros :require-macros :as params} + (reduce (fn [m [k & libs]] + (assert (#{:use :use-macros :require :require-macros} k) + "Only :refer-clojure, :require, :require-macros, :use and :use-macros libspecs supported") + (assert (@valid-forms k) + (str "Only one " k " form is allowed per namespace definition")) + (swap! valid-forms disj k) + (apply merge-with merge m + (map (partial parse-require-spec (contains? #{:require-macros :use-macros} k)) + (if (contains? #{:use :use-macros} k) + (map use->require libs) + libs)))) + {} (remove (fn [[r]] (= r :refer-clojure)) args))] + (when (seq @deps) + (analyze-deps @deps)) + (set! *cljs-ns* name) + (load-core) + (doseq [nsym (concat (vals requires-macros) (vals uses-macros))] + (clojure.core/require nsym)) + (swap! namespaces #(-> % + (assoc-in [name :name] name) + (assoc-in [name :excludes] excludes) + (assoc-in [name :uses] uses) + (assoc-in [name :requires] requires) + (assoc-in [name :uses-macros] uses-macros) + (assoc-in [name :requires-macros] + (into {} (map (fn [[alias nsym]] + [alias (find-ns nsym)]) + requires-macros))))) + {:env env :op :ns :form form :name name :uses uses :requires requires + :uses-macros uses-macros :requires-macros requires-macros :excludes excludes})) + +(defmethod parse 'deftype* + [_ env [_ tsym fields pmasks :as form] _] + (let [t (:name (resolve-var (dissoc env :locals) tsym))] + (swap! namespaces update-in [(-> env :ns :name) :defs tsym] + (fn [m] + (let [m (assoc (or m {}) + :name t + :type true + :num-fields (count fields))] + (merge m + {:protocols (-> tsym meta :protocols)} + (when-let [line (:line env)] + {:file *cljs-file* + :line line}))))) + {:env env :op :deftype* :form form :t t :fields fields :pmasks pmasks})) + +(defmethod parse 'defrecord* + [_ env [_ tsym fields pmasks :as form] _] + (let [t (:name (resolve-var (dissoc env :locals) tsym))] + (swap! namespaces update-in [(-> env :ns :name) :defs tsym] + (fn [m] + (let [m (assoc (or m {}) :name t :type true)] + (merge m + {:protocols (-> tsym meta :protocols)} + (when-let [line (:line env)] + {:file *cljs-file* + :line line}))))) + {:env env :op :defrecord* :form form :t t :fields fields :pmasks pmasks})) + +;; dot accessor code + +(def ^:private property-symbol? #(boolean (and (symbol? %) (re-matches #"^-.*" (name %))))) + +(defn- classify-dot-form + [[target member args]] + [(cond (nil? target) ::error + :default ::expr) + (cond (property-symbol? member) ::property + (symbol? member) ::symbol + (seq? member) ::list + :default ::error) + (cond (nil? args) () + :default ::expr)]) + +(defmulti build-dot-form #(classify-dot-form %)) + +;; (. o -p) +;; (. (...) -p) +(defmethod build-dot-form [::expr ::property ()] + [[target prop _]] + {:dot-action ::access :target target :field (-> prop name (.substring 1) symbol)}) + +;; (. o -p ) +(defmethod build-dot-form [::expr ::property ::list] + [[target prop args]] + (throw (Error. (str "Cannot provide arguments " args " on property access " prop)))) + +(defn- build-method-call + "Builds the intermediate method call map used to reason about the parsed form during + compilation." + [target meth args] + (if (symbol? meth) + {:dot-action ::call :target target :method meth :args args} + {:dot-action ::call :target target :method (first meth) :args args})) + +;; (. o m 1 2) +(defmethod build-dot-form [::expr ::symbol ::expr] + [[target meth args]] + (build-method-call target meth args)) + +;; (. o m) +(defmethod build-dot-form [::expr ::symbol ()] + [[target meth args]] + (build-method-call target meth args)) + +;; (. o (m)) +;; (. o (m 1 2)) +(defmethod build-dot-form [::expr ::list ()] + [[target meth-expr _]] + (build-method-call target (first meth-expr) (rest meth-expr))) + +(defmethod build-dot-form :default + [dot-form] + (throw (Error. (str "Unknown dot form of " (list* '. dot-form) " with classification " (classify-dot-form dot-form))))) + +(defmethod parse '. + [_ env [_ target & [field & member+] :as form] _] + (disallowing-recur + (let [{:keys [dot-action target method field args]} (build-dot-form [target field member+]) + enve (assoc env :context :expr) + targetexpr (analyze enve target)] + (case dot-action + ::access {:env env :op :dot :form form + :target targetexpr + :field field + :children [targetexpr] + :tag (-> form meta :tag)} + ::call (let [argexprs (map #(analyze enve %) args)] + {:env env :op :dot :form form + :target targetexpr + :method method + :args argexprs + :children (into [targetexpr] argexprs) + :tag (-> form meta :tag)}))))) + +(defmethod parse 'js* + [op env [_ jsform & args :as form] _] + (assert (string? jsform)) + (if args + (disallowing-recur + (let [seg (fn seg [^String s] + (let [idx (.indexOf s "~{")] + (if (= -1 idx) + (list s) + (let [end (.indexOf s "}" idx)] + (cons (subs s 0 idx) (seg (subs s (inc end)))))))) + enve (assoc env :context :expr) + argexprs (vec (map #(analyze enve %) args))] + {:env env :op :js :segs (seg jsform) :args argexprs + :tag (-> form meta :tag) :form form :children argexprs})) + (let [interp (fn interp [^String s] + (let [idx (.indexOf s "~{")] + (if (= -1 idx) + (list s) + (let [end (.indexOf s "}" idx) + inner (:name (resolve-existing-var env (symbol (subs s (+ 2 idx) end))))] + (cons (subs s 0 idx) (cons inner (interp (subs s (inc end)))))))))] + {:env env :op :js :form form :code (apply str (interp jsform)) + :tag (-> form meta :tag)}))) + +(defn parse-invoke + [env [f & args :as form]] + (disallowing-recur + (let [enve (assoc env :context :expr) + fexpr (analyze enve f) + argexprs (vec (map #(analyze enve %) args)) + argc (count args)] + (if (and *cljs-warn-fn-arity* (-> fexpr :info :fn-var)) + (let [{:keys [variadic max-fixed-arity method-params name]} (:info fexpr)] + (when (and (not (some #{argc} (map count method-params))) + (or (not variadic) + (and variadic (< argc max-fixed-arity)))) + (warning env + (str "WARNING: Wrong number of args (" argc ") passed to " name))))) + {:env env :op :invoke :form form :f fexpr :args argexprs + :tag (or (-> fexpr :info :tag) (-> form meta :tag)) :children (into [fexpr] argexprs)}))) + +(defn analyze-symbol + "Finds the var associated with sym" + [env sym] + (let [ret {:env env :form sym} + lb (-> env :locals sym)] + (if lb + (assoc ret :op :var :info lb) + (assoc ret :op :var :info (resolve-existing-var env sym))))) + +(defn get-expander [sym env] + (let [mvar + (when-not (or (-> env :locals sym) ;locals hide macros + (and (or (-> env :ns :excludes sym) + (get-in @namespaces [(-> env :ns :name) :excludes sym])) + (not (or (-> env :ns :uses-macros sym) + (get-in @namespaces [(-> env :ns :name) :uses-macros sym]))))) + (if-let [nstr (namespace sym)] + (when-let [ns (cond + (= "clojure.core" nstr) (find-ns 'cljs.core) + (.contains nstr ".") (find-ns (symbol nstr)) + :else + (-> env :ns :requires-macros (get (symbol nstr))))] + (.findInternedVar ^clojure.lang.Namespace ns (symbol (name sym)))) + (if-let [nsym (-> env :ns :uses-macros sym)] + (.findInternedVar ^clojure.lang.Namespace (find-ns nsym) sym) + (.findInternedVar ^clojure.lang.Namespace (find-ns 'cljs.core) sym))))] + (when (and mvar (.isMacro ^clojure.lang.Var mvar)) + @mvar))) + +(defn macroexpand-1 [env form] + (let [op (first form)] + (if (specials op) + form + (if-let [mac (and (symbol? op) (get-expander op env))] + (binding [*ns* (create-ns *cljs-ns*)] + (apply mac form env (rest form))) + (if (symbol? op) + (let [opname (str op)] + (cond + (= (first opname) \.) (let [[target & args] (next form)] + (with-meta (list* '. target (symbol (subs opname 1)) args) + (meta form))) + (= (last opname) \.) (with-meta + (list* 'new (symbol (subs opname 0 (dec (count opname)))) (next form)) + (meta form)) + :else form)) + form))))) + +(defn analyze-seq + [env form name] + (let [env (assoc env :line + (or (-> form meta :line) + (:line env)))] + (let [op (first form)] + (assert (not (nil? op)) "Can't call nil") + (let [mform (macroexpand-1 env form)] + (if (identical? form mform) + (if (specials op) + (parse op env form name) + (parse-invoke env form)) + (analyze env mform name)))))) + +(declare analyze-wrap-meta) + +(defn analyze-map + [env form name] + (let [expr-env (assoc env :context :expr) + simple-keys? (every? #(or (string? %) (keyword? %)) + (keys form)) + ks (disallowing-recur (vec (map #(analyze expr-env % name) (keys form)))) + vs (disallowing-recur (vec (map #(analyze expr-env % name) (vals form))))] + (analyze-wrap-meta {:op :map :env env :form form + :keys ks :vals vs :simple-keys? simple-keys? + :children (vec (interleave ks vs))} + name))) + +(defn analyze-vector + [env form name] + (let [expr-env (assoc env :context :expr) + items (disallowing-recur (vec (map #(analyze expr-env % name) form)))] + (analyze-wrap-meta {:op :vector :env env :form form :items items :children items} name))) + +(defn analyze-set + [env form name] + (let [expr-env (assoc env :context :expr) + items (disallowing-recur (vec (map #(analyze expr-env % name) form)))] + (analyze-wrap-meta {:op :set :env env :form form :items items :children items} name))) + +(defn analyze-wrap-meta [expr name] + (let [form (:form expr)] + (if (meta form) + (let [env (:env expr) ; take on expr's context ourselves + expr (assoc-in expr [:env :context] :expr) ; change expr to :expr + meta-expr (analyze-map (:env expr) (meta form) name)] + {:op :meta :env env :form form + :meta meta-expr :expr expr :children [meta-expr expr]}) + expr))) + +(defn analyze + "Given an environment, a map containing {:locals (mapping of names to bindings), :context + (one of :statement, :expr, :return), :ns (a symbol naming the + compilation ns)}, and form, returns an expression object (a map + containing at least :form, :op and :env keys). If expr has any (immediately) + nested exprs, must have :children [exprs...] entry. This will + facilitate code walking without knowing the details of the op set." + ([env form] (analyze env form nil)) + ([env form name] + (let [form (if (instance? clojure.lang.LazySeq form) + (or (seq form) ()) + form)] + (load-core) + (cond + (symbol? form) (analyze-symbol env form) + (and (seq? form) (seq form)) (analyze-seq env form name) + (map? form) (analyze-map env form name) + (vector? form) (analyze-vector env form name) + (set? form) (analyze-set env form name) + :else {:op :constant :env env :form form})))) + +(defn analyze-file + [f] + (let [res (if (= \/ (first f)) f (io/resource f))] + (assert res (str "Can't find " f " in classpath")) + (binding [*cljs-ns* 'cljs.user + *cljs-file* (.getPath ^java.net.URL res)] + (with-open [r (io/reader res)] + (let [env (empty-env) + pbr (clojure.lang.LineNumberingPushbackReader. r) + eof (Object.)] + (loop [r (read pbr false eof false)] + (let [env (assoc env :ns (get-namespace *cljs-ns*))] + (when-not (identical? eof r) + (analyze env r) + (recur (read pbr false eof false)))))))))) + diff --git a/src/clj/cljs/closure.clj b/src/clj/cljs/closure.clj index 07220f3577..f8953e91a3 100644 --- a/src/clj/cljs/closure.clj +++ b/src/clj/cljs/closure.clj @@ -34,6 +34,7 @@ JavaScript or a deps file for use during development. " (:require [cljs.compiler :as comp] + [cljs.analyzer :as ana] [clojure.java.io :as io] [clojure.string :as string]) (:import java.io.File @@ -319,9 +320,9 @@ [forms] (comp/with-core-cljs (with-out-str - (binding [comp/*cljs-ns* 'cljs.user] + (binding [ana/*cljs-ns* 'cljs.user] (doseq [form forms] - (comp/emit (comp/analyze (comp/empty-env) form))))))) + (comp/emit (ana/analyze (ana/empty-env) form))))))) (defn output-directory [opts] (or (:output-dir opts) "out")) @@ -858,7 +859,7 @@ (defn build "Given a source which can be compiled, produce runnable JavaScript." [source opts] - (comp/reset-namespaces!) + (ana/reset-namespaces!) (let [opts (if (= :nodejs (:target opts)) (merge {:optimizations :simple} opts) opts) @@ -867,10 +868,10 @@ :ups-libs (:libs ups-deps) :ups-foreign-libs (:foreign-libs ups-deps) :ups-externs (:externs ups-deps))] - (binding [comp/*cljs-static-fns* + (binding [ana/*cljs-static-fns* (or (and (= (opts :optimizations) :advanced)) (:static-fns opts) - comp/*cljs-static-fns*)] + ana/*cljs-static-fns*)] (let [compiled (-compile source all-opts) compiled (concat (if (coll? compiled) compiled [compiled]) diff --git a/src/clj/cljs/compiler.clj b/src/clj/cljs/compiler.clj index edfc8ef6a1..dac3ca3c57 100644 --- a/src/clj/cljs/compiler.clj +++ b/src/clj/cljs/compiler.clj @@ -12,16 +12,11 @@ (:refer-clojure :exclude [munge macroexpand-1]) (:require [clojure.java.io :as io] [clojure.string :as string] - [cljs.tagged-literals :as tags]) + [cljs.tagged-literals :as tags] + [cljs.analyzer :as ana]) (:import java.lang.StringBuilder)) -(declare resolve-var) -(declare resolve-existing-var) -(declare warning) -(def ^:dynamic *cljs-warn-on-undeclared* false) -(declare confirm-bindings) (declare munge) -(declare ^:dynamic *cljs-file*) (def js-reserved #{"abstract" "boolean" "break" "byte" "case" @@ -37,71 +32,8 @@ "transient" "try" "typeof" "var" "void" "volatile" "while" "with" "yield" "methods"}) -(def cljs-reserved-file-names #{"deps.cljs"}) - -(defonce namespaces (atom '{cljs.core {:name cljs.core} - cljs.user {:name cljs.user}})) - -(defn reset-namespaces! [] - (reset! namespaces - '{cljs.core {:name cljs.core} - cljs.user {:name cljs.user}})) - -(defn get-namespace [key] - (@namespaces key)) - -(defn set-namespace [key val] - (swap! namespaces assoc key val)) - -(def ^:dynamic *cljs-ns* 'cljs.user) -(def ^:dynamic *cljs-file* nil) -(def ^:dynamic *cljs-warn-on-redef* true) -(def ^:dynamic *cljs-warn-on-dynamic* true) -(def ^:dynamic *cljs-warn-on-fn-var* true) -(def ^:dynamic *cljs-warn-fn-arity* true) -(def ^:dynamic *unchecked-if* (atom false)) -(def ^:dynamic *cljs-static-fns* false) (def ^:dynamic *position* nil) -(def ^:dynamic *cljs-macros-path* "/cljs/core") -(def ^:dynamic *cljs-macros-is-classpath* true) -(def -cljs-macros-loaded (atom false)) - -(defn load-core [] - (when (not @-cljs-macros-loaded) - (reset! -cljs-macros-loaded true) - (if *cljs-macros-is-classpath* - (load *cljs-macros-path*) - (load-file *cljs-macros-path*)))) - -(defmacro with-core-macros - [path & body] - `(do - (when (not= *cljs-macros-path* ~path) - (reset! -cljs-macros-loaded false)) - (binding [*cljs-macros-path* ~path] - ~@body))) - -(defmacro with-core-macros-file - [path & body] - `(do - (when (not= *cljs-macros-path* ~path) - (reset! -cljs-macros-loaded false)) - (binding [*cljs-macros-path* ~path - *cljs-macros-is-classpath* false] - ~@body))) - -(defn empty-env [] - {:ns (@namespaces *cljs-ns*) :context :statement :locals {}}) - -(defmacro ^:private debug-prn - [& args] - `(.println System/err (str ~@args))) - -(defn warning [env s] - (binding [*out* *err*] - (println - (str s (when (:line env) - (str " at line " (:line env) " " *cljs-file*)))))) +(def cljs-reserved-file-names #{"deps.cljs"}) (defn munge ([s] (munge s js-reserved)) @@ -114,113 +46,6 @@ (symbol ms) ms)))) -(defn confirm-var-exists [env prefix suffix] - (when *cljs-warn-on-undeclared* - (let [crnt-ns (-> env :ns :name)] - (when (= prefix crnt-ns) - (when-not (-> @namespaces crnt-ns :defs suffix) - (warning env - (str "WARNING: Use of undeclared Var " prefix "/" suffix))))))) - -(defn resolve-ns-alias [env name] - (let [sym (symbol name)] - (get (:requires (:ns env)) sym sym))) - -(defn core-name? - "Is sym visible from core in the current compilation namespace?" - [env sym] - (and (get (:defs (@namespaces 'cljs.core)) sym) - (not (contains? (-> env :ns :excludes) sym)))) - -(defn resolve-existing-var [env sym] - (if (= (namespace sym) "js") - {:name sym :ns 'js} - (let [s (str sym) - lb (-> env :locals sym)] - (cond - lb lb - - (namespace sym) - (let [ns (namespace sym) - ns (if (= "clojure.core" ns) "cljs.core" ns) - full-ns (resolve-ns-alias env ns)] - (confirm-var-exists env full-ns (symbol (name sym))) - (merge (get-in @namespaces [full-ns :defs (symbol (name sym))]) - {:name (symbol (str full-ns) (str (name sym))) - :ns full-ns})) - - (.contains s ".") - (let [idx (.indexOf s ".") - prefix (symbol (subs s 0 idx)) - suffix (subs s (inc idx)) - lb (-> env :locals prefix)] - (if lb - {:name (symbol (str (:name lb) suffix))} - (do - (confirm-var-exists env prefix (symbol suffix)) - (merge (get-in @namespaces [prefix :defs (symbol suffix)]) - {:name (if (= "" prefix) (symbol suffix) (symbol (str prefix) suffix)) - :ns prefix})))) - - (get-in @namespaces [(-> env :ns :name) :uses sym]) - (let [full-ns (get-in @namespaces [(-> env :ns :name) :uses sym])] - (merge - (get-in @namespaces [full-ns :defs sym]) - {:name (symbol (str full-ns) (str sym)) - :ns (-> env :ns :name)})) - - :else - (let [full-ns (if (core-name? env sym) - 'cljs.core - (-> env :ns :name))] - (confirm-var-exists env full-ns sym) - (merge (get-in @namespaces [full-ns :defs sym]) - {:name (symbol (str full-ns) (str sym)) - :ns full-ns})))))) - -(defn resolve-var [env sym] - (if (= (namespace sym) "js") - {:name sym} - (let [s (str sym) - lb (-> env :locals sym)] - (cond - lb lb - - (namespace sym) - (let [ns (namespace sym) - ns (if (= "clojure.core" ns) "cljs.core" ns)] - {:name (symbol (str (resolve-ns-alias env ns)) (name sym))}) - - (.contains s ".") - (let [idx (.indexOf s ".") - prefix (symbol (subs s 0 idx)) - suffix (subs s idx) - lb (-> env :locals prefix)] - (if lb - {:name (symbol (str (:name lb) suffix))} - {:name sym})) - - (get-in @namespaces [(-> env :ns :name) :uses sym]) - (let [full-ns (get-in @namespaces [(-> env :ns :name) :uses sym])] - (merge - (get-in @namespaces [full-ns :defs sym]) - {:name (symbol (str full-ns) (name sym))})) - - :else - (let [ns (if (core-name? env sym) - 'cljs.core - (-> env :ns :name))] - {:name (symbol (str ns) (name sym))}))))) - -(defn confirm-bindings [env names] - (doseq [name names] - (let [env (merge env {:ns (@namespaces *cljs-ns*)}) - ev (resolve-existing-var env name)] - (when (and *cljs-warn-on-dynamic* - ev (not (-> ev :dynamic))) - (warning env - (str "WARNING: " (:name ev) " not declared ^:dynamic")))))) - (defn- comma-sep [xs] (interpose "," xs)) @@ -734,16 +559,16 @@ (defmethod emit :invoke [{:keys [f args env] :as expr}] (let [info (:info f) - fn? (and *cljs-static-fns* + fn? (and ana/*cljs-static-fns* (not (:dynamic info)) (:fn-var info)) protocol (:protocol info) proto? (let [tag (infer-tag (first (:args expr)))] (and protocol tag - (or *cljs-static-fns* + (or ana/*cljs-static-fns* (:protocol-inline env)) (or (= protocol tag) - (when-let [ps (:protocols (resolve-existing-var (dissoc env :locals) tag))] + (when-let [ps (:protocols (ana/resolve-existing-var (dissoc env :locals) tag))] (ps protocol))))) opt-not? (and (= (:name info) 'cljs.core/not) (= (infer-tag (first (:args expr))) 'boolean)) @@ -804,7 +629,7 @@ (emits f "(" (comma-sep args) ")") :else - (if (and *cljs-static-fns* (= (:op f) :var)) + (if (and ana/*cljs-static-fns* (= (:op f) :var)) (let [fprop (str ".cljs$lang$arity$" (count args))] (emits "(" f fprop " ? " f fprop "(" (comma-sep args) ") : " f ".call(" (comma-sep (cons "null" args)) "))")) (emits f ".call(" (comma-sep (cons "null" args)) ")")))))) @@ -888,750 +713,6 @@ (emits (interleave (concat segs (repeat nil)) (concat args [nil])))))) -(declare analyze analyze-symbol analyze-seq) - -(def specials '#{if def fn* do let* loop* letfn* throw try* recur new set! ns deftype* defrecord* . js* & quote}) - -(def ^:dynamic *recur-frames* nil) -(def ^:dynamic *loop-lets* nil) - -(defmacro disallowing-recur [& body] - `(binding [*recur-frames* (cons nil *recur-frames*)] ~@body)) - -(defn analyze-block - "returns {:statements .. :ret ..}" - [env exprs] - (let [statements (disallowing-recur - (seq (map #(analyze (assoc env :context :statement) %) (butlast exprs)))) - ret (if (<= (count exprs) 1) - (analyze env (first exprs)) - (analyze (assoc env :context (if (= :statement (:context env)) :statement :return)) (last exprs)))] - {:statements statements :ret ret})) - -(defmulti parse (fn [op & rest] op)) - -(defmethod parse 'if - [op env [_ test then else :as form] name] - (let [test-expr (disallowing-recur (analyze (assoc env :context :expr) test)) - then-expr (analyze env then) - else-expr (analyze env else)] - {:env env :op :if :form form - :test test-expr :then then-expr :else else-expr - :unchecked @*unchecked-if* - :children [test-expr then-expr else-expr]})) - -(defmethod parse 'throw - [op env [_ throw :as form] name] - (let [throw-expr (disallowing-recur (analyze (assoc env :context :expr) throw))] - {:env env :op :throw :form form - :throw throw-expr - :children [throw-expr]})) - -(defn- block-children [{:keys [statements ret]}] - (conj (vec statements) ret)) - -(defmethod parse 'try* - [op env [_ & body :as form] name] - (let [body (vec body) - catchenv (update-in env [:context] #(if (= :expr %) :return %)) - tail (peek body) - fblock (when (and (seq? tail) (= 'finally (first tail))) - (rest tail)) - finally (when fblock - (analyze-block - (assoc env :context :statement) - fblock)) - body (if finally (pop body) body) - tail (peek body) - cblock (when (and (seq? tail) - (= 'catch (first tail))) - (rest tail)) - name (first cblock) - locals (:locals catchenv) - locals (if name - (assoc locals name {:name name}) - locals) - catch (when cblock - (analyze-block (assoc catchenv :locals locals) (rest cblock))) - body (if name (pop body) body) - try (when body - (analyze-block (if (or name finally) catchenv env) body))] - (when name (assert (not (namespace name)) "Can't qualify symbol in catch")) - {:env env :op :try* :form form - :try try - :finally finally - :name name - :catch catch - :children (vec (mapcat block-children - [try catch finally]))})) - -(defmethod parse 'def - [op env form name] - (let [pfn (fn - ([_ sym] {:sym sym}) - ([_ sym init] {:sym sym :init init}) - ([_ sym doc init] {:sym sym :doc doc :init init})) - args (apply pfn form) - sym (:sym args) - tag (-> sym meta :tag) - protocol (-> sym meta :protocol) - dynamic (-> sym meta :dynamic) - ns-name (-> env :ns :name)] - (assert (not (namespace sym)) "Can't def ns-qualified name") - (let [env (if (or (and (not= ns-name 'cljs.core) - (core-name? env sym)) - (get-in @namespaces [ns-name :uses sym])) - (let [ev (resolve-existing-var (dissoc env :locals) sym)] - (when *cljs-warn-on-redef* - (warning env - (str "WARNING: " sym " already refers to: " (symbol (str (:ns ev)) (str sym)) - " being replaced by: " (symbol (str ns-name) (str sym))))) - (swap! namespaces update-in [ns-name :excludes] conj sym) - (update-in env [:ns :excludes] conj sym)) - env) - name (:name (resolve-var (dissoc env :locals) sym)) - init-expr (when (contains? args :init) - (disallowing-recur - (analyze (assoc env :context :expr) (:init args) sym))) - fn-var? (and init-expr (= (:op init-expr) :fn)) - export-as (when-let [export-val (-> sym meta :export)] - (if (= true export-val) name export-val)) - doc (or (:doc args) (-> sym meta :doc))] - (when-let [v (get-in @namespaces [ns-name :defs sym])] - (when (and *cljs-warn-on-fn-var* - (not (-> sym meta :declared)) - (and (:fn-var v) (not fn-var?))) - (warning env - (str "WARNING: " (symbol (str ns-name) (str sym)) - " no longer fn, references are stale")))) - (swap! namespaces update-in [ns-name :defs sym] - (fn [m] - (let [m (assoc (or m {}) :name name)] - (merge m - (when tag {:tag tag}) - (when dynamic {:dynamic true}) - (when-let [line (:line env)] - {:file *cljs-file* :line line}) - ;; the protocol a protocol fn belongs to - (when protocol - {:protocol protocol}) - ;; symbol for reified protocol - (when-let [protocol-symbol (-> sym meta :protocol-symbol)] - {:protocol-symbol protocol-symbol}) - (when fn-var? - {:fn-var true - ;; protocol implementation context - :protocol-impl (:protocol-impl init-expr) - ;; inline protocol implementation context - :protocol-inline (:protocol-inline init-expr) - :variadic (:variadic init-expr) - :max-fixed-arity (:max-fixed-arity init-expr) - :method-params (map (fn [m] - (:params m)) - (:methods init-expr))}))))) - (merge {:env env :op :def :form form - :name name :doc doc :init init-expr} - (when tag {:tag tag}) - (when dynamic {:dynamic true}) - (when export-as {:export export-as}) - (when init-expr {:children [init-expr]}))))) - -(defn- analyze-fn-method [env locals meth gthis] - (letfn [(uniqify [[p & r]] - (when p - (cons (if (some #{p} r) (gensym (str p)) p) - (uniqify r))))] - (let [params (first meth) - variadic (boolean (some '#{&} params)) - params (vec (uniqify (remove '#{&} params))) - fixed-arity (count (if variadic (butlast params) params)) - body (next meth) - locals (reduce (fn [m name] - (assoc m name {:name name - :tag (-> name meta :tag)})) - locals params) - recur-frame {:names params :flag (atom nil)} - block (binding [*recur-frames* (cons recur-frame *recur-frames*)] - (analyze-block (assoc env :context :return :locals locals) body))] - (merge {:env env :variadic variadic :params params :max-fixed-arity fixed-arity - :gthis gthis :recurs @(:flag recur-frame)} - block)))) - -(defmethod parse 'fn* - [op env [_ & args :as form] name] - (let [[name meths] (if (symbol? (first args)) - [(first args) (next args)] - [name (seq args)]) - ;;turn (fn [] ...) into (fn ([]...)) - meths (if (vector? (first meths)) (list meths) meths) - locals (:locals env) - locals (if name (assoc locals name {:name name}) locals) - fields (-> form meta ::fields) - protocol-impl (-> form meta :protocol-impl) - protocol-inline (-> form meta :protocol-inline) - gthis (and fields (gensym "this__")) - locals (reduce (fn [m fld] - (assoc m fld - {:name (symbol (str gthis "." fld)) - :field true - :mutable (-> fld meta :mutable) - :tag (-> fld meta :tag)})) - locals fields) - - menv (if (> (count meths) 1) (assoc env :context :expr) env) - menv (merge menv - {:protocol-impl protocol-impl - :protocol-inline protocol-inline}) - methods (map #(analyze-fn-method menv locals % gthis) meths) - max-fixed-arity (apply max (map :max-fixed-arity methods)) - variadic (boolean (some :variadic methods)) - locals (if name (assoc locals name {:name name :fn-var true - :variadic variadic - :max-fixed-arity max-fixed-arity - :method-params (map :params methods)})) - methods (if name - ;; a second pass with knowledge of our function-ness/arity - ;; lets us optimize self calls - (map #(analyze-fn-method menv locals % gthis) meths) - methods)] - ;;todo - validate unique arities, at most one variadic, variadic takes max required args - {:env env :op :fn :form form :name name :methods methods :variadic variadic - :recur-frames *recur-frames* :loop-lets *loop-lets* - :jsdoc [(when variadic "@param {...*} var_args")] - :max-fixed-arity max-fixed-arity - :protocol-impl protocol-impl - :protocol-inline protocol-inline - :children (vec (mapcat block-children - methods))})) - -(defmethod parse 'letfn* - [op env [_ bindings & exprs :as form] name] - (assert (and (vector? bindings) (even? (count bindings))) "bindings must be vector of even number of elements") - (let [n->fexpr (into {} (map (juxt first second) (partition 2 bindings))) - names (keys n->fexpr) - n->gsym (into {} (map (juxt identity #(gensym (str % "__"))) names)) - gsym->n (into {} (map (juxt n->gsym identity) names)) - context (:context env) - bes (reduce (fn [bes n] - (let [g (n->gsym n)] - (conj bes {:name g - :tag (-> n meta :tag) - :local true}))) - [] - names) - meth-env (reduce (fn [env be] - (let [n (gsym->n (be :name))] - (assoc-in env [:locals n] be))) - (assoc env :context :expr) - bes) - [meth-env finits] - (reduce (fn [[env finits] n] - (let [finit (analyze meth-env (n->fexpr n)) - be (-> (get-in env [:locals n]) - (assoc :init finit))] - [(assoc-in env [:locals n] be) - (conj finits finit)])) - [meth-env []] - names) - {:keys [statements ret]} - (analyze-block (assoc meth-env :context (if (= :expr context) :return context)) exprs) - bes (vec (map #(get-in meth-env [:locals %]) names))] - {:env env :op :letfn :bindings bes :statements statements :ret ret :form form - :children (into (vec (map :init bes)) - (conj (vec statements) ret))})) - -(defmethod parse 'do - [op env [_ & exprs :as form] _] - (let [block (analyze-block env exprs)] - (merge {:env env :op :do :form form :children (block-children block)} block))) - -(defn analyze-let - [encl-env [_ bindings & exprs :as form] is-loop] - (assert (and (vector? bindings) (even? (count bindings))) "bindings must be vector of even number of elements") - (let [context (:context encl-env) - [bes env] - (disallowing-recur - (loop [bes [] - env (assoc encl-env :context :expr) - bindings (seq (partition 2 bindings))] - (if-let [[name init] (first bindings)] - (do - (assert (not (or (namespace name) (.contains (str name) "."))) (str "Invalid local name: " name)) - (let [init-expr (analyze env init) - be {:name (gensym (str name "__")) - :init init-expr - :tag (or (-> name meta :tag) - (-> init-expr :tag) - (-> init-expr :info :tag)) - :local true}] - (recur (conj bes be) - (assoc-in env [:locals name] be) - (next bindings)))) - [bes env]))) - recur-frame (when is-loop {:names (vec (map :name bes)) :flag (atom nil)}) - {:keys [statements ret]} - (binding [*recur-frames* (if recur-frame (cons recur-frame *recur-frames*) *recur-frames*) - *loop-lets* (cond - is-loop (or *loop-lets* ()) - *loop-lets* (cons {:names (vec (map :name bes))} *loop-lets*))] - (analyze-block (assoc env :context (if (= :expr context) :return context)) exprs))] - {:env encl-env :op :let :loop is-loop - :bindings bes :statements statements :ret ret :form form - :children (into (vec (map :init bes)) - (conj (vec statements) ret))})) - -(defmethod parse 'let* - [op encl-env form _] - (analyze-let encl-env form false)) - -(defmethod parse 'loop* - [op encl-env form _] - (analyze-let encl-env form true)) - -(defmethod parse 'recur - [op env [_ & exprs :as form] _] - (let [context (:context env) - frame (first *recur-frames*) - exprs (disallowing-recur (vec (map #(analyze (assoc env :context :expr) %) exprs)))] - (assert frame "Can't recur here") - (assert (= (count exprs) (count (:names frame))) "recur argument count mismatch") - (reset! (:flag frame) true) - (assoc {:env env :op :recur :form form} - :frame frame - :exprs exprs - :children exprs))) - -(defmethod parse 'quote - [_ env [_ x] _] - {:op :constant :env env :form x}) - -(defmethod parse 'new - [_ env [_ ctor & args :as form] _] - (disallowing-recur - (let [enve (assoc env :context :expr) - ctorexpr (analyze enve ctor) - argexprs (vec (map #(analyze enve %) args)) - known-num-fields (:num-fields (resolve-existing-var env ctor)) - argc (count args)] - (when (and known-num-fields (not= known-num-fields argc)) - (warning env - (str "WARNING: Wrong number of args (" argc ") passed to " ctor))) - - {:env env :op :new :form form :ctor ctorexpr :args argexprs - :children (into [ctorexpr] argexprs)}))) - -(defmethod parse 'set! - [_ env [_ target val alt :as form] _] - (let [[target val] (if alt - ;; (set! o -prop val) - [`(. ~target ~val) alt] - [target val])] - (disallowing-recur - (let [enve (assoc env :context :expr) - targetexpr (cond - ;; TODO: proper resolve - (= target '*unchecked-if*) - (do - (reset! *unchecked-if* val) - ::set-unchecked-if) - - (symbol? target) - (do - (let [local (-> env :locals target)] - (assert (or (nil? local) - (and (:field local) - (:mutable local))) - "Can't set! local var or non-mutable field")) - (analyze-symbol enve target)) - - :else - (when (seq? target) - (let [targetexpr (analyze-seq enve target nil)] - (when (:field targetexpr) - targetexpr)))) - valexpr (analyze enve val)] - (assert targetexpr "set! target must be a field or a symbol naming a var") - (cond - (= targetexpr ::set-unchecked-if) {:env env :op :no-op} - :else {:env env :op :set! :form form :target targetexpr :val valexpr - :children [targetexpr valexpr]}))))) - -(defn munge-path [ss] - (clojure.lang.Compiler/munge (str ss))) - -(defn ns->relpath [s] - (str (string/replace (munge-path s) \. \/) ".cljs")) - -(declare analyze-file) - -(defn analyze-deps [deps] - (doseq [dep deps] - (when-not (:defs (@namespaces dep)) - (let [relpath (ns->relpath dep)] - (when (io/resource relpath) - (analyze-file relpath)))))) - -(defmethod parse 'ns - [_ env [_ name & args :as form] _] - (let [docstring (if (string? (first args)) (first args) nil) - args (if docstring (next args) args) - excludes - (reduce (fn [s [k exclude xs]] - (if (= k :refer-clojure) - (do - (assert (= exclude :exclude) "Only [:refer-clojure :exclude [names]] form supported") - (assert (not (seq s)) "Only one :refer-clojure form is allowed per namespace definition") - (into s xs)) - s)) - #{} args) - deps (atom #{}) - valid-forms (atom #{:use :use-macros :require :require-macros}) - error-msg (fn [spec msg] (str msg "; offending spec: " (pr-str spec))) - parse-require-spec (fn parse-require-spec [macros? spec] - (assert (or (symbol? spec) (vector? spec)) - (error-msg spec "Only [lib.ns & options] and lib.ns specs supported in :require / :require-macros")) - (when (vector? spec) - (assert (symbol? (first spec)) - (error-msg spec "Library name must be specified as a symbol in :require / :require-macros")) - (assert (odd? (count spec)) - (error-msg spec "Only :as alias and :refer [names] options supported in :require")) - (assert (every? #{:as :refer} (map first (partition 2 (next spec)))) - (error-msg spec "Only :as and :refer options supported in :require / :require-macros")) - (assert (let [fs (frequencies (next spec))] - (and (<= (fs :as 0) 1) - (<= (fs :refer 0) 1))) - (error-msg spec "Each of :as and :refer options may only be specified once in :require / :require-macros"))) - (if (symbol? spec) - (recur macros? [spec :as spec]) - (let [[lib & opts] spec - {alias :as referred :refer} (apply hash-map opts) - [rk uk] (if macros? [:require-macros :use-macros] [:require :use])] - (assert (or (symbol? alias) (nil? alias)) - (error-msg spec ":as must be followed by a symbol in :require / :require-macros")) - (assert (or (and (vector? referred) (every? symbol? referred)) - (nil? referred)) - (error-msg spec ":refer must be followed by a vector of symbols in :require / :require-macros")) - (swap! deps conj lib) - (merge (when alias {rk {alias lib}}) - (when referred {uk (apply hash-map (interleave referred (repeat lib)))}))))) - use->require (fn use->require [[lib kw referred :as spec]] - (assert (and (symbol? lib) (= :only kw) (vector? referred) (every? symbol? referred)) - (error-msg spec "Only [lib.ns :only [names]] specs supported in :use / :use-macros")) - [lib :refer referred]) - {uses :use requires :require uses-macros :use-macros requires-macros :require-macros :as params} - (reduce (fn [m [k & libs]] - (assert (#{:use :use-macros :require :require-macros} k) - "Only :refer-clojure, :require, :require-macros, :use and :use-macros libspecs supported") - (assert (@valid-forms k) - (str "Only one " k " form is allowed per namespace definition")) - (swap! valid-forms disj k) - (apply merge-with merge m - (map (partial parse-require-spec (contains? #{:require-macros :use-macros} k)) - (if (contains? #{:use :use-macros} k) - (map use->require libs) - libs)))) - {} (remove (fn [[r]] (= r :refer-clojure)) args))] - (when (seq @deps) - (analyze-deps @deps)) - (set! *cljs-ns* name) - (load-core) - (doseq [nsym (concat (vals requires-macros) (vals uses-macros))] - (clojure.core/require nsym)) - (swap! namespaces #(-> % - (assoc-in [name :name] name) - (assoc-in [name :excludes] excludes) - (assoc-in [name :uses] uses) - (assoc-in [name :requires] requires) - (assoc-in [name :uses-macros] uses-macros) - (assoc-in [name :requires-macros] - (into {} (map (fn [[alias nsym]] - [alias (find-ns nsym)]) - requires-macros))))) - {:env env :op :ns :form form :name name :uses uses :requires requires - :uses-macros uses-macros :requires-macros requires-macros :excludes excludes})) - -(defmethod parse 'deftype* - [_ env [_ tsym fields pmasks :as form] _] - (let [t (:name (resolve-var (dissoc env :locals) tsym))] - (swap! namespaces update-in [(-> env :ns :name) :defs tsym] - (fn [m] - (let [m (assoc (or m {}) - :name t - :type true - :num-fields (count fields))] - (merge m - {:protocols (-> tsym meta :protocols)} - (when-let [line (:line env)] - {:file *cljs-file* - :line line}))))) - {:env env :op :deftype* :form form :t t :fields fields :pmasks pmasks})) - -(defmethod parse 'defrecord* - [_ env [_ tsym fields pmasks :as form] _] - (let [t (:name (resolve-var (dissoc env :locals) tsym))] - (swap! namespaces update-in [(-> env :ns :name) :defs tsym] - (fn [m] - (let [m (assoc (or m {}) :name t :type true)] - (merge m - {:protocols (-> tsym meta :protocols)} - (when-let [line (:line env)] - {:file *cljs-file* - :line line}))))) - {:env env :op :defrecord* :form form :t t :fields fields :pmasks pmasks})) - -;; dot accessor code - -(def ^:private property-symbol? #(boolean (and (symbol? %) (re-matches #"^-.*" (name %))))) - -(defn- classify-dot-form - [[target member args]] - [(cond (nil? target) ::error - :default ::expr) - (cond (property-symbol? member) ::property - (symbol? member) ::symbol - (seq? member) ::list - :default ::error) - (cond (nil? args) () - :default ::expr)]) - -(defmulti build-dot-form #(classify-dot-form %)) - -;; (. o -p) -;; (. (...) -p) -(defmethod build-dot-form [::expr ::property ()] - [[target prop _]] - {:dot-action ::access :target target :field (-> prop name (.substring 1) symbol)}) - -;; (. o -p ) -(defmethod build-dot-form [::expr ::property ::list] - [[target prop args]] - (throw (Error. (str "Cannot provide arguments " args " on property access " prop)))) - -(defn- build-method-call - "Builds the intermediate method call map used to reason about the parsed form during - compilation." - [target meth args] - (if (symbol? meth) - {:dot-action ::call :target target :method meth :args args} - {:dot-action ::call :target target :method (first meth) :args args})) - -;; (. o m 1 2) -(defmethod build-dot-form [::expr ::symbol ::expr] - [[target meth args]] - (build-method-call target meth args)) - -;; (. o m) -(defmethod build-dot-form [::expr ::symbol ()] - [[target meth args]] - (build-method-call target meth args)) - -;; (. o (m)) -;; (. o (m 1 2)) -(defmethod build-dot-form [::expr ::list ()] - [[target meth-expr _]] - (build-method-call target (first meth-expr) (rest meth-expr))) - -(defmethod build-dot-form :default - [dot-form] - (throw (Error. (str "Unknown dot form of " (list* '. dot-form) " with classification " (classify-dot-form dot-form))))) - -(defmethod parse '. - [_ env [_ target & [field & member+] :as form] _] - (disallowing-recur - (let [{:keys [dot-action target method field args]} (build-dot-form [target field member+]) - enve (assoc env :context :expr) - targetexpr (analyze enve target)] - (case dot-action - ::access {:env env :op :dot :form form - :target targetexpr - :field field - :children [targetexpr] - :tag (-> form meta :tag)} - ::call (let [argexprs (map #(analyze enve %) args)] - {:env env :op :dot :form form - :target targetexpr - :method method - :args argexprs - :children (into [targetexpr] argexprs) - :tag (-> form meta :tag)}))))) - -(defmethod parse 'js* - [op env [_ jsform & args :as form] _] - (assert (string? jsform)) - (if args - (disallowing-recur - (let [seg (fn seg [^String s] - (let [idx (.indexOf s "~{")] - (if (= -1 idx) - (list s) - (let [end (.indexOf s "}" idx)] - (cons (subs s 0 idx) (seg (subs s (inc end)))))))) - enve (assoc env :context :expr) - argexprs (vec (map #(analyze enve %) args))] - {:env env :op :js :segs (seg jsform) :args argexprs - :tag (-> form meta :tag) :form form :children argexprs})) - (let [interp (fn interp [^String s] - (let [idx (.indexOf s "~{")] - (if (= -1 idx) - (list s) - (let [end (.indexOf s "}" idx) - inner (:name (resolve-existing-var env (symbol (subs s (+ 2 idx) end))))] - (cons (subs s 0 idx) (cons inner (interp (subs s (inc end)))))))))] - {:env env :op :js :form form :code (apply str (interp jsform)) - :tag (-> form meta :tag)}))) - -(defn parse-invoke - [env [f & args :as form]] - (disallowing-recur - (let [enve (assoc env :context :expr) - fexpr (analyze enve f) - argexprs (vec (map #(analyze enve %) args)) - argc (count args)] - (if (and *cljs-warn-fn-arity* (-> fexpr :info :fn-var)) - (let [{:keys [variadic max-fixed-arity method-params name]} (:info fexpr)] - (when (and (not (some #{argc} (map count method-params))) - (or (not variadic) - (and variadic (< argc max-fixed-arity)))) - (warning env - (str "WARNING: Wrong number of args (" argc ") passed to " name))))) - {:env env :op :invoke :form form :f fexpr :args argexprs - :tag (or (-> fexpr :info :tag) (-> form meta :tag)) :children (into [fexpr] argexprs)}))) - -(defn analyze-symbol - "Finds the var associated with sym" - [env sym] - (let [ret {:env env :form sym} - lb (-> env :locals sym)] - (if lb - (assoc ret :op :var :info lb) - (assoc ret :op :var :info (resolve-existing-var env sym))))) - -(defn get-expander [sym env] - (let [mvar - (when-not (or (-> env :locals sym) ;locals hide macros - (and (or (-> env :ns :excludes sym) - (get-in @namespaces [(-> env :ns :name) :excludes sym])) - (not (or (-> env :ns :uses-macros sym) - (get-in @namespaces [(-> env :ns :name) :uses-macros sym]))))) - (if-let [nstr (namespace sym)] - (when-let [ns (cond - (= "clojure.core" nstr) (find-ns 'cljs.core) - (.contains nstr ".") (find-ns (symbol nstr)) - :else - (-> env :ns :requires-macros (get (symbol nstr))))] - (.findInternedVar ^clojure.lang.Namespace ns (symbol (name sym)))) - (if-let [nsym (-> env :ns :uses-macros sym)] - (.findInternedVar ^clojure.lang.Namespace (find-ns nsym) sym) - (.findInternedVar ^clojure.lang.Namespace (find-ns 'cljs.core) sym))))] - (when (and mvar (.isMacro ^clojure.lang.Var mvar)) - @mvar))) - -(defn macroexpand-1 [env form] - (let [op (first form)] - (if (specials op) - form - (if-let [mac (and (symbol? op) (get-expander op env))] - (binding [*ns* (create-ns *cljs-ns*)] - (apply mac form env (rest form))) - (if (symbol? op) - (let [opname (str op)] - (cond - (= (first opname) \.) (let [[target & args] (next form)] - (with-meta (list* '. target (symbol (subs opname 1)) args) - (meta form))) - (= (last opname) \.) (with-meta - (list* 'new (symbol (subs opname 0 (dec (count opname)))) (next form)) - (meta form)) - :else form)) - form))))) - -(defn analyze-seq - [env form name] - (let [env (assoc env :line - (or (-> form meta :line) - (:line env)))] - (let [op (first form)] - (assert (not (nil? op)) "Can't call nil") - (let [mform (macroexpand-1 env form)] - (if (identical? form mform) - (if (specials op) - (parse op env form name) - (parse-invoke env form)) - (analyze env mform name)))))) - -(declare analyze-wrap-meta) - -(defn analyze-map - [env form name] - (let [expr-env (assoc env :context :expr) - simple-keys? (every? #(or (string? %) (keyword? %)) - (keys form)) - ks (disallowing-recur (vec (map #(analyze expr-env % name) (keys form)))) - vs (disallowing-recur (vec (map #(analyze expr-env % name) (vals form))))] - (analyze-wrap-meta {:op :map :env env :form form - :keys ks :vals vs :simple-keys? simple-keys? - :children (vec (interleave ks vs))} - name))) - -(defn analyze-vector - [env form name] - (let [expr-env (assoc env :context :expr) - items (disallowing-recur (vec (map #(analyze expr-env % name) form)))] - (analyze-wrap-meta {:op :vector :env env :form form :items items :children items} name))) - -(defn analyze-set - [env form name] - (let [expr-env (assoc env :context :expr) - items (disallowing-recur (vec (map #(analyze expr-env % name) form)))] - (analyze-wrap-meta {:op :set :env env :form form :items items :children items} name))) - -(defn analyze-wrap-meta [expr name] - (let [form (:form expr)] - (if (meta form) - (let [env (:env expr) ; take on expr's context ourselves - expr (assoc-in expr [:env :context] :expr) ; change expr to :expr - meta-expr (analyze-map (:env expr) (meta form) name)] - {:op :meta :env env :form form - :meta meta-expr :expr expr :children [meta-expr expr]}) - expr))) - -(defn analyze - "Given an environment, a map containing {:locals (mapping of names to bindings), :context - (one of :statement, :expr, :return), :ns (a symbol naming the - compilation ns)}, and form, returns an expression object (a map - containing at least :form, :op and :env keys). If expr has any (immediately) - nested exprs, must have :children [exprs...] entry. This will - facilitate code walking without knowing the details of the op set." - ([env form] (analyze env form nil)) - ([env form name] - (let [form (if (instance? clojure.lang.LazySeq form) - (or (seq form) ()) - form)] - (load-core) - (cond - (symbol? form) (analyze-symbol env form) - (and (seq? form) (seq form)) (analyze-seq env form name) - (map? form) (analyze-map env form name) - (vector? form) (analyze-vector env form name) - (set? form) (analyze-set env form name) - :else {:op :constant :env env :form form})))) - -(defn analyze-file - [f] - (let [res (if (= \/ (first f)) f (io/resource f))] - (assert res (str "Can't find " f " in classpath")) - (binding [*cljs-ns* 'cljs.user - *cljs-file* (.getPath ^java.net.URL res)] - (with-open [r (io/reader res)] - (let [env (empty-env) - pbr (clojure.lang.LineNumberingPushbackReader. r) - eof (Object.)] - (loop [r (read pbr false eof false)] - (let [env (assoc env :ns (get-namespace *cljs-ns*))] - (when-not (identical? eof r) - (analyze env r) - (recur (read pbr false eof false)))))))))) - (defn forms-seq "Seq of forms in a Clojure or ClojureScript file." ([f] @@ -1655,24 +736,24 @@ (defmacro with-core-cljs "Ensure that core.cljs has been loaded." [& body] - `(do (when-not (:defs (get @namespaces 'cljs.core)) - (analyze-file "cljs/core.cljs")) + `(do (when-not (:defs (get @ana/namespaces 'cljs.core)) + (ana/analyze-file "cljs/core.cljs")) ~@body)) (defn compile-file* [src dest] (with-core-cljs (with-open [out ^java.io.Writer (io/make-writer dest {})] (binding [*out* out - *cljs-ns* 'cljs.user - *cljs-file* (.getPath ^java.io.File src) + ana/*cljs-ns* 'cljs.user + ana/*cljs-file* (.getPath ^java.io.File src) *data-readers* tags/*cljs-data-readers* *position* (atom [0 0])] (loop [forms (forms-seq src) ns-name nil deps nil] (if (seq forms) - (let [env (empty-env) - ast (analyze env (first forms))] + (let [env (ana/empty-env) + ast (ana/analyze env (first forms))] (do (emit ast) (if (= (:op ast) :ns) (recur (rest forms) (:name ast) (merge (:uses ast) (:requires ast))) @@ -1856,7 +937,7 @@ (analyze envx '(ns fred (:require [your.ns :as yn]) (:require-macros [clojure.core :as core]))) (defmacro js [form] - `(emit (analyze {:ns (@namespaces 'cljs.user) :context :statement :locals {}} '~form))) + `(emit (ana/analyze {:ns (@ana/namespaces 'cljs.user) :context :statement :locals {}} '~form))) (defn jscapture [form] "just grabs the js, doesn't print it" diff --git a/src/clj/cljs/core.clj b/src/clj/cljs/core.clj index 82d1014cc4..70c1509204 100644 --- a/src/clj/cljs/core.clj +++ b/src/clj/cljs/core.clj @@ -331,7 +331,7 @@ (symbol (core/str "-" sym))) (defmacro extend-type [tsym & impls] - (let [resolve #(let [ret (:name (cljs.compiler/resolve-var (dissoc &env :locals) %))] + (let [resolve #(let [ret (:name (cljs.analyzer/resolve-var (dissoc &env :locals) %))] (assert ret (core/str "Can't resolve: " %)) ret) impl-map (loop [ret {} s impls] @@ -340,12 +340,12 @@ (drop-while seq? (next s))) ret)) warn-if-not-protocol #(when-not (= 'Object %) - (if cljs.compiler/*cljs-warn-on-undeclared* - (if-let [var (cljs.compiler/resolve-existing-var (dissoc &env :locals) %)] + (if cljs.analyzer/*cljs-warn-on-undeclared* + (if-let [var (cljs.analyzer/resolve-existing-var (dissoc &env :locals) %)] (when-not (:protocol-symbol var) - (cljs.compiler/warning &env + (cljs.analyzer/warning &env (core/str "WARNING: Symbol " % " is not a protocol"))) - (cljs.compiler/warning &env + (cljs.analyzer/warning &env (core/str "WARNING: Can't resolve protocol symbol " %))))) skip-flag (set (-> tsym meta :skip-protocol-flag))] (if (base-type tsym) @@ -408,7 +408,7 @@ `(do ~@(mapcat assign-impls impl-map)))))) (defn- prepare-protocol-masks [env t impls] - (let [resolve #(let [ret (:name (cljs.compiler/resolve-var (dissoc env :locals) %))] + (let [resolve #(let [ret (:name (cljs.analyzer/resolve-var (dissoc env :locals) %))] (assert ret (core/str "Can't resolve: " %)) ret) impl-map (loop [ret {} s impls] @@ -443,7 +443,7 @@ (into (reduce (fn [v [f sigs]] (conj v (vary-meta (cons f (map #(cons (second %) (nnext %)) sigs)) - assoc :cljs.compiler/fields fields + assoc :cljs.analyzer/fields fields :protocol-impl true :protocol-inline inline))) [] @@ -454,11 +454,11 @@ (defn collect-protocols [impls env] (->> impls (filter symbol?) - (map #(:name (cljs.compiler/resolve-var (dissoc env :locals) %))) + (map #(:name (cljs.analyzer/resolve-var (dissoc env :locals) %))) (into #{}))) (defmacro deftype [t fields & impls] - (let [r (:name (cljs.compiler/resolve-var (dissoc &env :locals) t)) + (let [r (:name (cljs.analyzer/resolve-var (dissoc &env :locals) t)) [fpps pmasks] (prepare-protocol-masks &env t impls) protocols (collect-protocols impls &env) t (vary-meta t assoc @@ -569,7 +569,7 @@ (new ~rname ~@getters nil (dissoc ~ms ~@ks))))) (defmacro defrecord [rsym fields & impls] - (let [r (:name (cljs.compiler/resolve-var (dissoc &env :locals) rsym))] + (let [r (:name (cljs.analyzer/resolve-var (dissoc &env :locals) rsym))] `(let [] ~(emit-defrecord &env rsym r fields impls) (set! (.-cljs$lang$type ~r) true) @@ -579,7 +579,7 @@ ~r))) (defmacro defprotocol [psym & doc+methods] - (let [p (:name (cljs.compiler/resolve-var (dissoc &env :locals) psym)) + (let [p (:name (cljs.analyzer/resolve-var (dissoc &env :locals) psym)) psym (vary-meta psym assoc :protocol-symbol true) ns-name (-> &env :ns :name) fqn (fn [n] (symbol (core/str ns-name "." n))) @@ -613,7 +613,7 @@ (defmacro satisfies? "Returns true if x satisfies the protocol" [psym x] - (let [p (:name (cljs.compiler/resolve-var (dissoc &env :locals) psym)) + (let [p (:name (cljs.analyzer/resolve-var (dissoc &env :locals) psym)) prefix (protocol-prefix p) xsym (bool-expr (gensym)) [part bit] (fast-path-protocols p) @@ -652,7 +652,7 @@ tempnames (map (comp gensym name) names) binds (map vector names vals) resets (reverse (map vector names tempnames))] - (cljs.compiler/confirm-bindings &env names) + (cljs.analyzer/confirm-bindings &env names) `(let [~@(interleave tempnames names)] (try ~@(map @@ -717,7 +717,7 @@ test "'" (when (:line &env) (core/str " on line " (:line &env) " " - cljs.compiler/*cljs-file*))))) + cljs.analyzer/*cljs-file*))))) (assoc m test expr))) pairs (reduce (fn [m [test expr]] (if (seq? test) diff --git a/src/clj/cljs/repl.clj b/src/clj/cljs/repl.clj index 3410f9f84c..6d0bcab6a6 100644 --- a/src/clj/cljs/repl.clj +++ b/src/clj/cljs/repl.clj @@ -11,6 +11,7 @@ (:require [clojure.string :as string] [clojure.java.io :as io] [cljs.compiler :as comp] + [cljs.analyzer :as ana] [cljs.tagged-literals :as tags] [cljs.closure :as cljsc])) @@ -62,14 +63,14 @@ (evaluate-form repl-env env filename form identity)) ([repl-env env filename form wrap] (try - (let [ast (comp/analyze env form) + (let [ast (ana/analyze env form) js (comp/emit-str ast) - wrap-js (comp/emit-str (binding [comp/*cljs-warn-on-undeclared* false - comp/*cljs-warn-on-redef* false - comp/*cljs-warn-on-dynamic* false - comp/*cljs-warn-on-fn-var* false - comp/*cljs-warn-fn-arity* false] - (comp/analyze env (wrap form))))] + wrap-js (comp/emit-str (binding [ana/*cljs-warn-on-undeclared* false + ana/*cljs-warn-on-redef* false + ana/*cljs-warn-on-dynamic* false + ana/*cljs-warn-on-fn-var* false + ana/*cljs-warn-fn-arity* false] + (ana/analyze env (wrap form))))] (when (= (:op ast) :ns) (load-dependencies repl-env (into (vals (:requires ast)) (distinct (vals (:uses ast)))))) @@ -91,18 +92,18 @@ (defn load-stream [repl-env filename stream] (with-open [r (io/reader stream)] - (let [env (comp/empty-env) + (let [env (ana/empty-env) pbr (clojure.lang.LineNumberingPushbackReader. r) eof (Object.)] (loop [r (read pbr false eof false)] - (let [env (assoc env :ns (comp/get-namespace comp/*cljs-ns*))] + (let [env (assoc env :ns (ana/get-namespace ana/*cljs-ns*))] (when-not (identical? eof r) (evaluate-form repl-env env filename r) (recur (read pbr false eof false)))))))) (defn load-file [repl-env f] - (binding [comp/*cljs-ns* 'cljs.user] + (binding [ana/*cljs-ns* 'cljs.user] (let [res (if (= \/ (first f)) f (io/resource f))] (assert res (str "Can't find " f " in classpath")) (load-stream repl-env f res)))) @@ -119,7 +120,7 @@ (defn- eval-and-print [repl-env env form] (let [ret (evaluate-form repl-env - (assoc env :ns (comp/get-namespace comp/*cljs-ns*)) + (assoc env :ns (ana/get-namespace ana/*cljs-ns*)) "" form (wrap-fn form))] @@ -130,7 +131,7 @@ (prn nil)))))) (defn- read-next-form [] - (try {:status :success :form (binding [*ns* (create-ns comp/*cljs-ns*) + (try {:status :success :form (binding [*ns* (create-ns ana/*cljs-ns*) *data-readers* tags/*cljs-data-readers*] (read))} (catch Exception e @@ -141,9 +142,9 @@ (let [load-file-fn (fn [repl-env file] (load-file repl-env file))] {'in-ns (fn [_ quoted-ns] (let [ns-name (second quoted-ns)] - (when-not (comp/get-namespace ns-name) - (comp/set-namespace ns-name {:name ns-name})) - (set! comp/*cljs-ns* ns-name))) + (when-not (ana/get-namespace ns-name) + (ana/set-namespace ns-name {:name ns-name})) + (set! ana/*cljs-ns* ns-name))) 'load-file load-file-fn 'clojure.core/load-file load-file-fn 'load-namespace (fn [repl-env ns] (load-namespace repl-env ns))})) @@ -152,15 +153,15 @@ "Note - repl will reload core.cljs every time, even if supplied old repl-env" [repl-env & {:keys [verbose warn-on-undeclared special-fns]}] (prn "Type: " :cljs/quit " to quit") - (binding [comp/*cljs-ns* 'cljs.user + (binding [ana/*cljs-ns* 'cljs.user *cljs-verbose* verbose - comp/*cljs-warn-on-undeclared* warn-on-undeclared] + ana/*cljs-warn-on-undeclared* warn-on-undeclared] (let [env {:context :statement :locals {}} special-fns (merge default-special-fns special-fns) is-special-fn? (set (keys special-fns))] (-setup repl-env) (loop [] - (print (str "ClojureScript:" comp/*cljs-ns* "> ")) + (print (str "ClojureScript:" ana/*cljs-ns* "> ")) (flush) (let [{:keys [status form]} (read-next-form)] (cond diff --git a/src/clj/cljs/repl/rhino.clj b/src/clj/cljs/repl/rhino.clj index c71782f694..14b2d0db5d 100644 --- a/src/clj/cljs/repl/rhino.clj +++ b/src/clj/cljs/repl/rhino.clj @@ -11,6 +11,7 @@ (:require [clojure.string :as string] [clojure.java.io :as io] [cljs.compiler :as comp] + [cljs.analyzer :as ana] [cljs.repl :as repl]) (:import cljs.repl.IJavaScriptEnv [org.mozilla.javascript Context ScriptableObject])) @@ -76,7 +77,7 @@ "" 1))] (if-let [res (io/resource cljs-path)] - (binding [comp/*cljs-ns* 'cljs.user] + (binding [ana/*cljs-ns* 'cljs.user] (repl/load-stream repl-env res)) (if-let [res (io/resource js-path)] (-eval (io/reader res) repl-env js-path 1) @@ -93,7 +94,7 @@ (swap! loaded-libs (partial apply conj) missing))))) (defn rhino-setup [repl-env] - (let [env (comp/empty-env) + (let [env (ana/empty-env) scope (:scope repl-env)] (repl/load-file repl-env "cljs/core.cljs") (swap! loaded-libs conj "cljs.core")