| True
| Or of 'formula * 'formula
| And of 'formula * 'formula
- | Move of (move * bool * State.t)
- | Label of QNameSet.t
+ | Move of move * bool * State.t
type 'hcons node = {
pos : 'hcons expr;
| Or(xf1, xf2), Or(yf1, yf2)
| And(xf1, xf2), And(yf1,yf2) -> (xf1 == yf1) && (xf2 == yf2)
| Move(d1, p1, s1), Move(d2 ,p2 ,s2) -> d1 == d2 && p1 == p2 && s1 == s2
- | Label s1, Label s2 -> s1 == s2
| _ -> false
let hash f =
HASHINT3(PRIME3, Uid.to_int f1.Node.id, Uid.to_int f2.Node.id)
| Move(d, p, s) -> HASHINT4(PRIME5, hash_const_variant d,vb p,s)
- | Label s -> HASHINT2(PRIME7, Uid.to_int s.QNameSet.id)
end
type t = Node.t
let uid x = x.Node.id
let equal = Node.equal
let expr f = f.Node.node.pos
-(*let st f = f.Node.node.st*)
-(*let size f = f.Node.node.size*)
+
let compare f1 f2 = compare f1.Node.id f2.Node.id
let prio f =
match expr f with
| True | False -> 10
| Move _ -> 8
- | Label _ -> 7
| And _ -> 6
| Or _ -> 1
(print ppf f1);
fprintf ppf " %s " Pretty.vee;
(print ppf f2);
- | Label s -> fprintf ppf "%a" QNameSet.print s
| Move(dir, b, s) ->
let _ = flush_str_formatter() in
let fmt = str_formatter in
let of_bool = function true -> true_ | false -> false_
-
-module Infix = struct
- let ( +| ) f1 f2 = or_ f1 f2
-
- let ( *& ) f1 f2 = and_ f1 f2
-
- let ( *+ ) d s = atom_ d true s
- let ( *- ) d s = atom_ d false s
-end
| True
| Or of 'formula * 'formula
| And of 'formula * 'formula
- | Move of (move * bool * State.t)
- | Label of QNameSet.t
+ | Move of move * bool * State.t
(** View of the internal representation of a formula,
used for pattern matching *)
val of_bool : bool -> t
(** Convert an ocaml Boolean value to a formula *)
-
-module Infix : sig
- val ( +| ) : t -> t -> t
- val ( *& ) : t -> t -> t
- val ( *+ ) : move -> StateSet.elt -> t
- val ( *- ) : move -> StateSet.elt -> t
-end
-(** Module to facilitate infix notations of formulae.
- Just [open Formla.Infix] and write:
- [let f = `Left *+ q1 +| `Right *+ q2 in ...]
-*)
*)
module F = Formula
+module A = Ata
(* to force ocaml build to add Formula to the dependency chain even if
we don't use it yet*)
module Ast =
struct
- type path = Absolute of step list | AbsoluteDoS of step list| Relative of step list
+ type path = Absolute of step list | Relative of step list
and step = axis * test *predicate
and axis = Self | Attribute | Child | Descendant | DescendantOrSelf | FollowingSibling
| Parent | Ancestor | AncestorOrSelf | PrecedingSibling | Preceding | Following
let rec print fmt p =
let l = match p with
| Absolute l -> pp fmt "/"; l
- | AbsoluteDoS l -> pp fmt "/";
- print_step fmt (DescendantOrSelf,Simple QNameSet.any,Expr True);
- pp fmt "/"; l
| Relative l -> l
in
Pretty.print_list ~sep:"/" print_step fmt l
print_axis r a; Format.flush_str_formatter()
-
-
EXTEND Gram
GLOBAL: query;
;
path : [
- [ "//" ; l = slist -> AbsoluteDoS (List.rev l) ]
- | [ "/" ; l = slist -> Absolute (List.rev l) ]
+ [ "/" ; l = slist -> Absolute (List.rev l) ]
| [ l = slist -> Relative (List.rev l) ]
]
;
| Some(t) -> (axis,t,p)
| None -> (Child,Simple (QNameSet.singleton (QName.of_string (axis_to_string axis))),p)
in match a with
- | Following -> [ (DescendantOrSelf,t,p);
- (FollowingSibling, t_star,Expr(True));
+ | Following -> [ (DescendantOrSelf,t,p);
+ (FollowingSibling, t_star,Expr(True));
(Ancestor, t_star ,Expr(True)) ]
| Preceding -> [ (DescendantOrSelf,t,p);
module Ast :
sig
- type path = Absolute of step list | AbsoluteDoS of step list
- | Relative of step list
+ type path = Absolute of step list | Relative of step list
and step = axis * test * predicate
and axis = Self | Attribute | Child | Descendant | DescendantOrSelf