CLJS-2312: Miss-compile: Uncaught SyntaxError: Unexpected token default

Author: anmonteiro

src/main/cljs/cljs/pprint.cljs

@@ -2537,7 +2537,7 @@ of parameters as well."
 
   (merge                                ; create the result map
     (into (array-map) ; start with the default values, make sure the order is right
-          (reverse (for [[name [default-def]] (:params def)] [name [default-def offset]])))
+          (reverse (for [[name [default]] (:params def)] [name [default offset]])))
     (reduce #(apply assoc %1 %2) {} (filter #(first (nth % 1)) (zipmap (keys (:params def)) params))) ; add the specified parameters, filtering out nils
     flags)); and finally add the flags
 

src/main/cljs/cljs/stacktrace.cljc

@@ -576,11 +576,11 @@ goog.events.getProxy/f<@http://localhost:9000/out/goog/events/events.js:276:16"
                      (second (first columns)))))
            (adjust [mapped]
              (vec (map #(%1 %2) [inc inc identity] mapped)))]
-     (let [default-ret [line column nil]]
+     (let [default [line column nil]]
        ;; source maps are 0 indexed for lines
        (if-let [columns (get source-map (dec line))]
          (adjust (map (get-best-column columns column) [:line :col :name]))
-         default-ret)))))
+         default)))))
 
 (defn mapped-frame
   "Given opts and a canonicalized JavaScript stacktrace frame, return the
@@ -689,4 +689,4 @@ goog.events.getProxy/f<@http://localhost:9000/out/goog/events/events.js:276:16"
       :line 6
       :column 0}]
     sms {:output-dir "samples/hello/out"})
-  )
+  )

src/main/cljs/cljs/test.cljs

@@ -386,7 +386,7 @@
       first)))
 
 (defn mapped-line-and-column [filename line column]
-  (let [default-ret [filename line column]]
+  (let [default [filename line column]]
     (if-let [source-map (:source-map (get-current-env))]
       ;; source maps are 0 indexed for lines
       (if-let [columns (get-in source-map [filename (dec line)])]
@@ -400,8 +400,8 @@
                 mapping
                 (second (first columns))))
             [:source :line :col]))
-        default-ret)
-      default-ret)))
+        default)
+      default)))
 
 (defn file-and-line [exception depth]
   ;; TODO: flesh out
@@ -439,7 +439,7 @@
 (defn run-block
   "Invoke all functions in fns with no arguments. A fn can optionally
   return
-  
+
   an async test - is invoked with a continuation running left fns
 
   a seq of fns tagged per block - are invoked immediately after fn"

src/main/clojure/cljs/analyzer.cljc

@@ -1359,14 +1359,14 @@
      :children [test-expr then-expr else-expr]}))
 
 (defmethod parse 'case*
-  [op env [_ sym tests thens default-clause :as form] name _]
+  [op env [_ sym tests thens default :as form] name _]
   (assert (symbol? sym) "case* must switch on symbol")
   (assert (every? vector? tests) "case* tests must be grouped in vectors")
   (let [expr-env (assoc env :context :expr)
         v        (disallowing-recur (analyze expr-env sym))
         tests    (mapv #(mapv (fn [t] (analyze expr-env t)) %) tests)
         thens    (mapv #(analyze env %) thens)
-        default-clause  (analyze env default-clause)]
+        default  (analyze env default)]
     (assert (every? (fn [t]
                       (or
                         (-> t :info :const)
@@ -1375,8 +1375,8 @@
               (apply concat tests))
       "case* tests must be numbers, strings, or constants")
     {:env env :op :case* :form form
-     :v v :tests tests :thens thens :default default-clause
-     :children (vec (concat [v] tests thens (if default-clause [default-clause])))}))
+     :v v :tests tests :thens thens :default default
+     :children (vec (concat [v] tests thens (if default [default])))}))
 
 (defmethod parse 'throw
   [op env [_ throw :as form] name _]
@@ -1415,9 +1415,9 @@
         finally (when (seq fblock)
                   (analyze (assoc env :context :statement) `(do ~@(rest fblock))))
         e (when (or (seq cblocks) dblock) (gensym "e"))
-        default-block (if-let [[_ _ name & cb] dblock]
-                        `(cljs.core/let [~name ~e] ~@cb)
-                        `(throw ~e))
+        default (if-let [[_ _ name & cb] dblock]
+                  `(cljs.core/let [~name ~e] ~@cb)
+                  `(throw ~e))
         cblock (if (seq cblocks)
                  `(cljs.core/cond
                    ~@(mapcat
@@ -1426,8 +1426,8 @@
                         `[(cljs.core/instance? ~type ~e)
                           (cljs.core/let [~name ~e] ~@cb)])
                       cblocks)
-                   :else ~default-block)
-                 default-block)
+                   :else ~default)
+                 default)
         locals (:locals catchenv)
         locals (if e
                  (assoc locals e

src/main/clojure/cljs/compiler.cljc

@@ -349,16 +349,20 @@
                  (let [js-module-name (get-in cenv [:js-module-index (name var-name) :name])]
                    (or js-module-name (name var-name)))
                  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) {}).
+      ;; 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? ast)
-        ; Emit the arg map so shadowing is properly handled when munging
-        ; (prevents duplicate fn-param-names)
+        ;; Emit the arg map so shadowing is properly handled when munging
+        ;; (prevents duplicate fn-param-names)
         (emits (munge ast))
         (when-not (= :statement (:context env))
           (let [reserved (cond-> js-reserved
-                           (es5>= (:language-out options))
+                           (and (es5>= (:language-out options))
+                                ;; we can skip munging things like `my.ns.default`
+                                ;; but not standalone `default` variable names
+                                ;; as they're not valid ES5 - Antonio
+                                (some? (namespace var-name)))
                            (set/difference ana/es5-allowed))]
             (emit-wrap env
               (emits
@@ -1045,7 +1049,7 @@
 
        keyword?
        (emits f ".cljs$core$IFn$_invoke$arity$" (count args) "(" (comma-sep args) ")")
-       
+
        variadic-invoke
        (let [mfa (:max-fixed-arity variadic-invoke)]
         (emits f "(" (comma-sep (take mfa args))