Update embedded Grenadine to 0.1.12

Sync the primitive loop counter fixes from Grenadine 0.1.12.
Preserve Glojure-specific XML host integration while updating vendored code.
Avoid JVM auto-boxing warnings in downstream source compilation.

Author: ingydotnet

pkg/stdlib/grenadine/expander.cljc

@@ -295,7 +295,7 @@
                     original-coordinate
                     (get default-deps lib))]
             (if (contains? provided-libs (base-lib lib))
-              (recur pending queue index version-map exclusions cuts
+              (recur pending queue (long index) version-map exclusions cuts
                      order
                      (if trace?
                        (conj trace
@@ -313,7 +313,7 @@
                          {:warning :unsupported-coordinate
                           :lib lib
                           :coordinate coordinate})
-                  (recur pending queue index version-map exclusions cuts
+                  (recur pending queue (long index) version-map exclusions cuts
                          order trace))
                 (let [id (coord-id lib coordinate)
                       decision
@@ -356,7 +356,7 @@
                                :include (boolean include?)
                                :reason reason})
                         trace)]
-                  (recur pending queue index version-map
+                  (recur pending queue (long index) version-map
                          (:exclusions update) (:cuts update)
                          (if include? (conj order lib) order)
                          trace)))))

pkg/stdlib/grenadine/pom.cljc

@@ -142,9 +142,10 @@
                  (= \{ (nth value (inc i))))
           (if-let [end (find-property-end value (+ i 2))]
             (let [key (subs value (+ i 2) end)
-                  replacement (property-value properties key trail)]
-              (recur (inc end)
-                     (inc end)
+                  replacement (property-value properties key trail)
+                  next-index (long (inc end))]
+              (recur next-index
+                     next-index
                      (conj pieces
                            (subs value piece-start i)
                            (if (nil? replacement)

pkg/stdlib/grenadine/version.cljc

@@ -291,7 +291,7 @@
                 (range-error spec "an interval is missing its closing bracket"))
               (let [closer (nth value end)
                     content (subs value (inc index) end)]
-                (recur (inc end)
+                (recur (long (inc end))
                        (conj result (interval spec opener closer content)))))))))))
 
 (defn version-range?

pkg/stdlib/grenadine/xml.cljc

@@ -256,20 +256,20 @@
           (cond
             (starts-at? source i "<!--")
             (if-let [end (find-token source (+ i 4) "-->")]
-              (recur (+ end 3) stack roots)
+              (recur (long (+ end 3)) stack roots)
               (xml-error source i "Unterminated XML comment"))
 
             (starts-at? source i "<?")
             (if-let [end (find-token source (+ i 2) "?>")]
-              (recur (+ end 2) stack roots)
+              (recur (long (+ end 2)) stack roots)
               (xml-error source i "Unterminated XML processing instruction"))
 
             (starts-at? source i "<![CDATA[")
             (if-let [end (find-token source (+ i 9) "]]>")]
               (let [text (source-slice source (+ i 9) end)
                     [next-stack next-roots]
                     (append-content stack roots text)]
-                (recur (+ end 3) next-stack next-roots))
+                (recur (long (+ end 3)) next-stack next-roots))
               (xml-error source i "Unterminated XML CDATA section"))
 
             (starts-at? source i "</")
@@ -286,7 +286,7 @@
                              (str "Mismatched XML closing tag: " name)))
                 (let [[next-stack next-roots]
                       (append-content (pop stack) roots node)]
-                  (recur (inc close) next-stack next-roots))))
+                  (recur (long (inc close)) next-stack next-roots))))
 
             (starts-at? source i "<!")
             (xml-error source i
@@ -298,9 +298,9 @@
               (if self-closing?
                 (let [[next-stack next-roots]
                       (append-content stack roots node)]
-                  (recur next-i next-stack next-roots))
-                (recur next-i (conj stack node) roots))))
+                  (recur (long next-i) next-stack next-roots))
+                (recur (long next-i) (conj stack node) roots))))
           (let [end (or (find-char source i "<") (count source))
                 text (decode-text source i end)
                 [next-stack next-roots] (append-content stack roots text)]
-            (recur end next-stack next-roots)))))))
+            (recur (long end) next-stack next-roots)))))))