X-Git-Url: http://git.nguyen.vg/gitweb/?p=tatoo.git;a=blobdiff_plain;f=src%2Fformula.ml;h=f4022f91e6346bdf3c43412c186a8e4dada91fb5;hp=14fd76f6c8201dcfed18381b9cfcf3604c16358e;hb=6b66008811639324be623a42037b60e02056772c;hpb=ddd758716b1cd691c8748d2e86c179e803b1d3af diff --git a/src/formula.ml b/src/formula.ml index 14fd76f..f4022f9 100644 --- a/src/formula.ml +++ b/src/formula.ml @@ -5,23 +5,30 @@ (* Kim Nguyen, LRI UMR8623 *) (* Université Paris-Sud & CNRS *) (* *) -(* Copyright 2010-2012 Université Paris-Sud and Centre National de la *) +(* Copyright 2010-2013 Université Paris-Sud and Centre National de la *) (* Recherche Scientifique. All rights reserved. This file is *) (* distributed under the terms of the GNU Lesser General Public *) (* License, with the special exception on linking described in file *) (* ../LICENSE. *) (* *) (***********************************************************************) + +(* + Time-stamp: +*) + INCLUDE "utils.ml" open Format + + type move = [ `Left | `Right | `Epsilon | `Up1 | `Up2 ] type 'formula expr = | False | True | Or of 'formula * 'formula | And of 'formula * 'formula - | Move of move * bool * State.t + | Atom of move * bool * State.t type 'hcons node = { pos : 'hcons expr; @@ -36,7 +43,7 @@ module rec Node : Hcons.S and Data : Hashtbl.HashedType with type t = Node.t node = struct type t = Node.t node - let equal x y = (*x.size == y.size &&*) + let equal x y = match x.pos, y.pos with | a,b when a == b -> true | Or(xf1, xf2), Or(yf1, yf2)