CLJS-1386: Symbols should be added to the constants table

Author: swannodette

src/main/clojure/cljs/analyzer.cljc

@@ -357,12 +357,16 @@
 
 (defn gen-constant-id [value]
   (let [prefix (cond
-                 (keyword? value) "constant$keyword$"
+                 (keyword? value) "cst$kw$"
+                 (symbol? value)  "cst$sym$"
                  :else
                  (throw
                    #?(:clj (Exception. (str "constant type " (type value) " not supported"))
                       :cljs (js/Error. (str "constant type " (type value) " not supported")))))
-        name (-> value (str) (subs 1) (string/replace "-" "_DASH_") (munge) (string/replace "." "$"))]
+        name   (if (keyword? value)
+                 (subs (str value) 1)
+                 (str value))
+        name   (-> name (string/replace "-" "_DASH_") (munge) (string/replace "." "$"))]
     (symbol (str prefix name))))
 
 (defn- register-constant!
@@ -2227,7 +2231,9 @@
   "Finds the var associated with sym"
   [env sym]
   (if ^boolean (:quoted? env)
-    (analyze-wrap-meta {:op :constant :env env :form sym :tag 'cljs.core/Symbol})
+    (do
+      (register-constant! env sym)
+      (analyze-wrap-meta {:op :constant :env env :form sym :tag 'cljs.core/Symbol}))
     (let [{:keys [line column]} (meta sym)
           env  (if-not (nil? line)
                  (assoc env :line line)

src/main/clojure/cljs/compiler.cljc

@@ -250,16 +250,9 @@
     (emit-constant (hash kw))
     (emits ")")))
 
-(defmethod emit-constant #?(:clj clojure.lang.Keyword :cljs Keyword) [x]
-  (if (-> @env/*compiler* :options :emit-constants)
-    (let [value (-> @env/*compiler* ::ana/constant-table x)]
-      (emits "cljs.core." value))
-    (emits-keyword x)
-    ))
-
-(defmethod emit-constant #?(:clj clojure.lang.Symbol :cljs Symbol) [x]
-  (let [ns     (namespace x)
-        name   (name x)
+(defn emits-symbol [sym]
+  (let [ns     (namespace sym)
+        name   (name sym)
         symstr (if-not (nil? ns)
                  (str ns "/" name)
                  name)]
@@ -270,11 +263,23 @@
     (emits ",")
     (emit-constant symstr)
     (emits ",")
-    (emit-constant (hash x))
+    (emit-constant (hash sym))
     (emits ",")
     (emit-constant nil)
     (emits ")")))
 
+(defmethod emit-constant #?(:clj clojure.lang.Keyword :cljs Keyword) [x]
+  (if (-> @env/*compiler* :options :emit-constants)
+    (let [value (-> @env/*compiler* ::ana/constant-table x)]
+      (emits "cljs.core." value))
+    (emits-keyword x)))
+
+(defmethod emit-constant #?(:clj clojure.lang.Symbol :cljs Symbol) [x]
+  (if (-> @env/*compiler* :options :emit-constants)
+    (let [value (-> @env/*compiler* ::ana/constant-table x)]
+      (emits "cljs.core." value))
+    (emits-symbol x)))
+
 ;; tagged literal support
 
 (defmethod emit-constant #?(:clj java.util.Date :cljs js/Date) [^java.util.Date date]
@@ -1293,11 +1298,17 @@
 ;; TODO: needs fixing, table will include other things than keywords - David
 
 (defn emit-constants-table [table]
-  (doseq [[keyword value] table]
-    (let [ns   (namespace keyword)
-          name (name keyword)]
+  (doseq [[sym value] table]
+    (let [ns   (namespace sym)
+          name (name sym)]
       (emits "cljs.core." value " = ")
-      (emits-keyword keyword)
+      (cond
+        (keyword? sym) (emits-keyword sym)
+        (symbol? sym) (emits-symbol sym)
+        :else (throw
+                (ex-info
+                  (str "Cannot emit constant for type " (type sym))
+                  {:error :invalid-constant-type})))
       (emits ";\n"))))
 
 #?(:clj