fix issue with merging disjunctions

Author: matthewfl

src/clojure/dyna/prefix_trie.clj

@@ -307,7 +307,7 @@
 
   (trie-reorder-keys [this new-order]
     ;; the arity between the keys could include adding in new keys.  In which case this is going to have to identify new values for this
-    (assert (>= (count new-order) arity))
+    (dyna-assert (>= (count new-order) arity))
     (if (= new-order (vec (range arity)))
       this  ;; there is no change so just return this without making any changes
       (let [new-contains-wildcard (reduce bit-or 0 (map (fn [i] (if (or (nil? (nth new-order i))

src/clojure/dyna/rexpr_disjunction.clj

@@ -212,8 +212,9 @@
                                   (if (is-disjunct-op? new-child-rexpr)
                                     (let [child-trie ^PrefixTrie (:rexprs new-child-rexpr)
                                           child-vars (:disjunction-variables new-child-rexpr)
+                                          known-values (vec (map #(get-value-in-context % child-context) child-vars))
                                           new-order (vec (map (zipmap child-vars (range)) dj-vars))
-                                          t-reordered (trie-reorder-keys child-trie new-order)]
+                                          t-reordered (trie-reorder-keys-subselect child-trie new-order known-values)]
                                       (vswap! ret-children trie-merge t-reordered)
                                       (vswap! num-children #(+ 2 %)) ;; there should be at least 2 children getting added, so we will still return a trie in the end
                                       )