Finaly clean up formula representation.

[SXSI/xpathcomp.git] / src / runtime.ml

diff --git a/src/runtime.ml b/src/runtime.ml
index a02f7a8..5657f20 100644 (file)
--- a/src/runtime.ml
+++ b/src/runtime.ml
@@ -95,7 +95,7 @@ module Make (U : ResJIT.S) : S with type result_set = U.NS.t =
          let orig_s1, orig_s2 =
            Translist.fold (fun t (a1, a2) ->
                          let _, _, _, f = Transition.node t in
-                         let (_, _, fs1), (_, _, fs2) = Formula.st f in
+                         let fs1, fs2 = Formula.st f in
                            (StateSet.union a1 fs1, StateSet.union a2 fs2)
                       ) trl (StateSet.empty, StateSet.empty)
          in
@@ -422,7 +422,7 @@ let get_trans g auto tag states =
          then acc
              else
             let _, _, _, phi = Transition.node trs in
-                let (_,_,l), (_,_,r) = Formula.st phi in
+                let l, r = Formula.st phi in
                 (StateSet.union l lstates,
                  StateSet.union r rstates,
                  Translist.cons trs tacc)