permit conditional reading only in cljc files

Author: swannodette

src/clj/cljs/analyzer.clj

@@ -1964,7 +1964,9 @@
   ([^Reader rdr] (forms-seq* rdr nil))
   ([^Reader rdr filename]
    {:pre [(instance? Reader rdr)]}
-   (let [pbr (readers/indexing-push-back-reader
+   (let [opts (when (and filename (= (util/ext filename) "cljc"))
+                {:read-cond :allow :features #{:cljs}})
+         pbr (readers/indexing-push-back-reader
                (PushbackReader. rdr) 1 filename)
          data-readers tags/*cljs-data-readers*
          forms-seq_
@@ -1977,7 +1979,7 @@
                                   (apply merge
                                     ((juxt :requires :require-macros)
                                       (get-namespace *cljs-ns*)))]
-                          (reader/read pbr nil eof-sentinel))]
+                          (reader/read pbr nil eof-sentinel opts nil))]
                (if (identical? form eof-sentinel)
                  (.close rdr)
                  (cons form (forms-seq_))))))]
@@ -2161,7 +2163,7 @@
                    (util/debug-prn "Analyzing" (str res)))
                  (let [env (assoc (empty-env) :build-options opts)
                        ns (with-open [rdr (io/reader res)]
-                            (loop [ns nil forms (seq (forms-seq* rdr))]
+                            (loop [ns nil forms (seq (forms-seq* rdr (util/path res)))]
                               (if forms
                                 (let [form (first forms)
                                       env (assoc env :ns (get-namespace *cljs-ns*))

src/clj/cljs/compiler.clj

@@ -1013,7 +1013,7 @@
                                                :gen-line 0}))]
                 (emitln (compiled-by-string opts))
                 (with-open [rdr (io/reader src)]
-                  (loop [forms (ana/forms-seq* rdr)
+                  (loop [forms (ana/forms-seq* rdr (util/path src))
                          ns-name nil
                          deps nil]
                     (if (seq forms)

src/clj/cljs/util.clj

@@ -105,15 +105,20 @@
 (defn ^String filename [^File f]
   (.getName f))
 
-(defn ^String path [^URL url]
-  (.getPath url))
+(defn ^String path [x]
+  {:pre [(or (file? x) (url? x))]}
+  (cond
+    (file? x) (.getAbsolutePath ^File x)
+    (url? x) (.getPath ^URL x)))
 
 (defn ^String ext
-  "Given a file or url return the file extension."
-  [f]
+  "Given a file, url or string return the file extension."
+  [x]
+  {:pre [(or (file? x) (url? x) (string? x))]}
   (let [s (cond
-            (file? f) (filename f)
-            (url? f) (path f))]
+            (file? x) (filename x)
+            (url? x) (path x)
+            (string? x) x)]
     (last (string/split s #"\."))))
 
 (defn ^String get-name