Updated metadata processing to support arg-tags in 1.12

clojure · Oct 20, 2023 · fa946e8 · fa946e8
1 parent d368dcf
commit fa946e8
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/src/main/cljs/cljs/tools/reader/impl/errors.cljs b/src/main/cljs/cljs/tools/reader/impl/errors.cljs
@@ -187,7 +187,7 @@
    rdr
    "Metadata cannot be "
    (i/inspect x)
-   ". Metadata must be a Symbol, Keyword, String or Map."))
+   ". Metadata must be a Symbol, Keyword, String, Map or Vector."))
 
 (defn throw-bad-metadata-target [rdr target]
   (reader-error

diff --git a/src/main/cljs/cljs/tools/reader/impl/utils.cljs b/src/main/cljs/cljs/tools/reader/impl/utils.cljs
@@ -68,6 +68,7 @@
     (keyword? f) {f true}
     (symbol? f)  {:tag f}
     (string? f)  {:tag f}
+    (vector? f)  {:arg-tags f}
     :else        f))
 
 (def last-id (atom 0))

diff --git a/src/main/clojure/clojure/tools/reader/impl/errors.clj b/src/main/clojure/clojure/tools/reader/impl/errors.clj
@@ -171,7 +171,7 @@
    rdr
    "Metadata cannot be "
    (i/inspect x)
-   ". Metadata must be a Symbol, Keyword, String or Map."))
+   ". Metadata must be a Symbol, Keyword, String, Map or Vector."))
 
 (defn throw-bad-metadata-target [rdr target]
   (reader-error

diff --git a/src/main/clojure/clojure/tools/reader/impl/utils.clj b/src/main/clojure/clojure/tools/reader/impl/utils.clj
@@ -99,6 +99,7 @@
     (keyword? f) {f true}
     (symbol? f)  {:tag f}
     (string? f)  {:tag f}
+    (vector? f)  {:arg-tags f}
     :else        f))
 
 (defn make-var