Skip to content

Commit

Permalink
Fixes the off-by-one line numbering in Chrome source inspector, and e…
Browse files Browse the repository at this point in the history 
…mits column information for several binding forms.
  • Loading branch information
@sgrove @swannodette
sgrove authored and swannodette committed Sep 15, 2013
1 parent e917034 commit e3df5da
Show file tree
Hide file tree
Showing 3 changed files with 119 additions and 27 deletions.
14 changes: 14 additions & 0 deletions samples/hello/src/hello/core.cljs
View file
Expand Up @@ -6,3 +6,17 @@

(defn ^:export sum [xs]
(bar/sum xs))

(defn ^:export let-works? [day month year]
(let [hour (first day)
minutes (first hour)
seconds (last hour)]
(.log js/console "Date: " year month day)
(str year month day hour minutes seconds)))

(defn bailey [proton neutron electron & comedies]
(apply + proton neutron electron)
(map identity comedies))

(defn videotape [& rainbows]
(map :params rainbows))
22 changes: 20 additions & 2 deletions src/clj/cljs/analyzer.clj
View file
Expand Up @@ -395,7 +395,17 @@
:line (get-line name env)
:column (get-col name env)
:tag (-> name meta :tag)
:shadow (when locals (locals name))}]
:shadow (when locals (locals name))
;; Give the fn params the same shape
;; as a :var, so it gets routed
;; correctly in the compiler
:op :var
:env (merge (select-keys env [:context])
{:line (get-line name env)
:column (get-col name env)})
:info {:name name
:shadow (when locals (locals name))}
:binding-form? true}]
[(assoc locals name param) (conj params param)]))
[locals []] param-names)
fixed-arity (count (if variadic (butlast params) params))
Expand Down Expand Up @@ -520,7 +530,15 @@
(-> init-expr :tag)
(-> init-expr :info :tag))
:local true
:shadow (-> env :locals name)}
:shadow (-> env :locals name)
;; Give let* bindings same shape as var so
;; they get routed correctly in the compiler
:op :var
:env {:line (get-line name env)
:column (get-col name env)}
:info {:name name
:shadow (-> env :locals name)}
:binding-form? true}
be (if (= (:op init-expr) :fn)
(merge be
{:fn-var true
Expand Down
110 changes: 85 additions & 25 deletions src/clj/cljs/compiler.clj
View file
Expand Up @@ -46,17 +46,22 @@

(defonce ns-first-segments (atom '#{"cljs" "clojure"}))

; Helper fn
(defn shadow-depth [s]
(let [{:keys [name info]} s]
(loop [d 0, {:keys [shadow]} info]
(cond
shadow (recur (inc d) shadow)
(@ns-first-segments (str name)) (inc d)
:else d))))

(defn munge
([s] (munge s js-reserved))
([s reserved]
(if (map? s)
; Unshadowing
(let [{:keys [name field] :as info} s
depth (loop [d 0, {:keys [shadow]} info]
(cond
shadow (recur (inc d) shadow)
(@ns-first-segments (str name)) (inc d)
:else d))
depth (shadow-depth s)
renamed (*lexical-renames* (System/identityHashCode s))
munged-name (munge (cond field (str "self__." name)
renamed renamed
Expand Down Expand Up @@ -220,13 +225,23 @@
(let [minfo {:gcol @*cljs-gen-col*
:gline @*cljs-gen-line*
:name var-name}]
(update-in m [line]
; Dec the line number for 0-indexed line numbers.
; tools.reader has 0-indexed line number, chrome
; expects 1-indexed source maps.
(update-in m [(dec line)]
(fnil (fn [m]
(update-in m [(or column 0)]
(fnil (fn [v] (conj v minfo)) [])))
(sorted-map)))))))))
(when-not (= :statement (:context env))
(emit-wrap env (emits (munge info))))))
; We need a way to write bindings out to source maps and javascript
; without getting wrapped in an emit-wrap calls, otherwise we get
; e.g. (function greet(return x, return y) {}).
(if (:binding-form? arg)
; Emit the arg map so shadowing is properly handled when munging
; (prevents duplicate fn-param-names)
(emits (munge arg))
(when-not (= :statement (:context env))
(emit-wrap env (emits (munge info)))))))

(defmethod emit :meta
[{:keys [expr meta env]}]
Expand Down Expand Up @@ -364,27 +379,57 @@
(defn emit-apply-to
[{:keys [name params env]}]
(let [arglist (gensym "arglist__")
delegate-name (str (munge name) "__delegate")
params (map munge params)]
delegate-name (str (munge name) "__delegate")]
(emitln "(function (" arglist "){")
(doseq [[i param] (map-indexed vector (drop-last 2 params))]
(emits "var " param " = cljs.core.first(")
(emits "var ")
(emit param)
(emits " = cljs.core.first(")
(emitln arglist ");")
(emitln arglist " = cljs.core.next(" arglist ");"))
(if (< 1 (count params))
(do
(emitln "var " (last (butlast params)) " = cljs.core.first(" arglist ");")
(emitln "var " (last params) " = cljs.core.rest(" arglist ");")
(emitln "return " delegate-name "(" (string/join ", " params) ");"))
(emits "var ")
(emit (last (butlast params)))
(emitln " = cljs.core.first(" arglist ");")
(emits "var ")
(emit (last params))
(emitln " = cljs.core.rest(" arglist ");")
(emits "return " delegate-name "(")
(doseq [param params]
(emit param)
(when-not (= param (last params)) (emits ",")))
(emitln ");"))
(do
(emitln "var " (last params) " = cljs.core.seq(" arglist ");")
(emitln "return " delegate-name "(" (string/join ", " params) ");")))
(emits "var ")
(emit (last params))
(emitln " = cljs.core.seq(" arglist ");")
(emits "return " delegate-name "(")
(doseq [param params]
(emit param)
(when-not (= param (last params)) (emits ",")))
(emitln ");")))
(emits "})")))

(defn emit-fn-params [params]
(doseq [param params]
(emit param)
; Avoid extraneous comma (function greet(x, y, z,)
(when-not (= param (last params))
(emits ","))))

(defn emit-fn-method
[{:keys [type name variadic params expr env recurs max-fixed-arity]}]
(emit-wrap env
(emitln "(function " (munge name) "(" (comma-sep (map munge params)) "){")
; Should we emit source-map for this inner declaration?
; It may be unnecessary.
; hello.core.greet = (function greet(){})
; e.g. Do we need a source-map entry for this? --^

; If so, we can't just munge the name and spit out a string.
(emits "(function " (munge name) "(")
(emit-fn-params params)
(emits "){")
(when type
(emitln "var self__ = this;"))
(when recurs (emitln "while(true){"))
Expand All @@ -399,10 +444,13 @@
(emit-wrap env
(let [name (or name (gensym))
mname (munge name)
params (map munge params)
delegate-name (str mname "__delegate")]
(emitln "(function() { ")
(emitln "var " delegate-name " = function (" (comma-sep params) "){")
(emits "var " delegate-name " = function (")
(doseq [param params]
(emit param)
(when-not (= param (last params)) (emits ",")))
(emits "){")
(when recurs (emitln "while(true){"))
(emits expr)
(when recurs
Expand All @@ -417,11 +465,19 @@
(when type
(emitln "var self__ = this;"))
(when variadic
(emitln "var " (last params) " = null;")
(emits "var ")
(emit (last params))
(emits " = null;")
(emitln "if (arguments.length > " (dec (count params)) ") {")
(emitln " " (last params) " = cljs.core.array_seq(Array.prototype.slice.call(arguments, " (dec (count params)) "),0);")
(emits " ")
(emit (last params))
(emits " = cljs.core.array_seq(Array.prototype.slice.call(arguments, " (dec (count params)) "),0);")
(emitln "} "))
(emitln "return " delegate-name ".call(" (string/join ", " (cons "this" params)) ");")
(emits "return " delegate-name ".call(this,")
(doseq [param params]
(emit param)
(when-not (= param (last params)) (emits ",")))
(emits ");")
(emitln "};")

(emitln mname ".cljs$lang$maxFixedArity = " max-fixed-arity ";")
Expand Down Expand Up @@ -453,7 +509,7 @@
(let [has-name? (and name true)
name (or name (gensym))
mname (munge name)
maxparams (map munge (apply max-key count (map :params methods)))
maxparams (apply max-key count (map :params methods))
mmap (into {}
(map (fn [method]
[(munge (symbol (str mname "__" (count (:params method)))))
Expand All @@ -474,7 +530,9 @@
(concat (butlast maxparams) ['var_args])
maxparams)) "){")
(when variadic
(emitln "var " (last maxparams) " = var_args;"))
(emits "var ")
(emit (last maxparams))
(emitln " = var_args;"))
(emitln "switch(arguments.length){")
(doseq [[n meth] ms]
(if (:variadic meth)
Expand Down Expand Up @@ -540,7 +598,9 @@
(gensym (str (:name %) "-")))
bindings)))]
(doseq [{:keys [init] :as binding} bindings]
(emitln "var " (munge binding) " = " init ";"))
(emits "var ")
(emit binding) ; Binding will be treated as a var
(emits " = " init ";"))
(when is-loop (emitln "while(true){"))
(emits expr)
(when is-loop
Expand Down

0 comments on commit e3df5da

Please sign in to comment.