Temporary commit for grammar stuff.

diff --git a/src/grammar2.ml b/src/grammar2.ml
index a7ccb09..ca21d0a 100644 (file)
--- a/src/grammar2.ml
+++ b/src/grammar2.ml
@@ -307,11 +307,12 @@ type t_symbol = t_type Node.t
 type tn_symbol = [ any_type ] Node.t
 
 
-type partial =
-    Leaf of node
+type 'a partial =
+  | Cache of 'a
+  | Leaf of int*int * StateSet.t array * node
   | Node0 of tn_symbol (* No parameters *)
-  | Node1 of tn_symbol * partial
-  | Node2 of tn_symbol * partial * partial
+  | Node1 of tn_symbol * 'a partial
+  | Node2 of tn_symbol * 'a partial * 'a partial
 
 
 let is_nil  (t : t_symbol) =
@@ -402,3 +403,104 @@ let get_id2_rank (r : rhs) : int =
   | C1 | C5 | C6 -> 1
   | C4 -> 2
 
+let is_attribute g tag =
+  tag > 4 && (to_string g tag).[0] == '2'
+
+let dummy_param : 'a partial = Leaf (~-1,~-1, [||], Node.nil)
+
+(*
+let rec start_skip g idx count =
+  if idx < Node.null then count else
+    let symbol = start_tag g idx in
+    if is_terminal g symbol then
+      let symbol = terminal symbol in
+      if symbol == nil_symbol then count else
+       let count = count+1 in
+       let fs = start_first_child g idx in
+       let countl = start_skip g fs count in
+       start_skip g fs countl
+    else
+      let nt = non_terminal symbol in
+      let rhs = get_rule g nt in
+      let nparam = get_rank rhs in
+      match nparam with
+      | 0 -> rule_skip g nt dummy_param dummy_param count
+      | 1 -> rule_skip g nt (Leaf(0,StateSet.empty, Node.nil,start_first_child g idx)) dummy_param count
+      | 2 ->
+       let fc = start_first_child g idx in
+       let ns = start_next_sibling g fc in
+       rule_skip g nt (Leaf (0,[||],fc)) (Leaf (1,[||],ns)) count
+      | _ -> assert false
+
+and rule_skip g t y0 y1 count =
+  let rhs = get_rule g t in
+  let id1 = get_id1 rhs in
+  let id2 = get_id2 rhs in
+  let conf = get_conf rhs in
+  if is_non_terminal g id1 then
+    let id1 = non_terminal id1 in
+    match conf with
+    | C0 ->rule_skip g id1 (Node0 id2) dummy_param count
+    | C1 -> rule_skip g id1 (Node1(id2,y0)) dummy_param count
+    | C2 -> rule_skip g id1 (Node0 id2) y0 count
+    | C3 -> rule_skip g id1 y0 (Node0 id2) count
+    | C4 -> rule_skip g id1 (Node2(id2, y0, y1)) dummy_param count
+    | C5 -> rule_skip g id1 (Node1(id2, y0)) y1 count
+    | C6 -> rule_skip g id1 y0 (Node1(id2, y1)) count
+  else
+    let id1 = terminal id1 in
+    match conf with
+    | C0 | C1 -> assert false
+    | C2  -> terminal_skip g id1 (Node0 id2) y0 count
+    | C3  -> terminal_skip g id1 y0 (Node0 id2) count
+    | C4  -> assert false
+    | C5  -> terminal_skip g id1 (Node1(id2, y0)) y1 count
+    | C6  -> terminal_skip g id1 y0 (Node1(id2, y1)) count
+
+and terminal_skip g (symbol : t_symbol) y0 y1 count =
+  if symbol == nil_symbol then count else
+    let count = count + 1 in
+    let countl = partial_skip g y0 count in
+    partial_skip g y1 countl
+
+and partial_skip g l count =
+  match l with
+  | Cache _ -> assert false
+  | Leaf (_,_,_, id) -> start_skip g id count
+  | Node0 id ->
+    if (terminal id) == nil_symbol then count
+    else
+      rule_skip g (non_terminal id) dummy_param dummy_param count
+
+  | Node1 (id, y0) ->
+    rule_skip g (non_terminal id) y0 dummy_param count
+
+  | Node2 (id, y0, y1) ->
+
+    if is_terminal g id then
+      terminal_skip g (terminal id) y0 y1 count
+    else
+      rule_skip g (non_terminal id) y0 y1 count
+
+
+let dispatch_param0 conf id2 y0 y1 =
+  match conf with
+  | C0 -> Node0 id2
+  | C1 -> Node1(id2,y0)
+  | C2 -> Node0 id2
+  | C3 -> Node0 id2
+  | C4 -> Node2(id2, y0, y1)
+  | C5 -> Node1(id2, y0)
+  | C6 -> y0
+
+let dispatch_param1 conf id2 y0 y1 =
+  match conf with
+  | C0 -> dummy_param
+  | C1 -> dummy_param
+  | C2 -> y0
+  | C3 -> Node0 id2
+  | C4 -> dummy_param
+  | C5 -> y1
+  | C6 -> Node1(id2, y1)
+
+*)

diff --git a/src/grammar2.mli b/src/grammar2.mli
index e2efc85..c884ff1 100644 (file)
--- a/src/grammar2.mli
+++ b/src/grammar2.mli
@@ -12,12 +12,12 @@ type n_symbol = n_type Node.t
 type t_symbol = t_type Node.t
 type tn_symbol = [ any_type ] Node.t
 
-
-type partial =
-    Leaf of node
-  | Node0 of tn_symbol
-  | Node1 of tn_symbol * partial
-  | Node2 of tn_symbol * partial * partial
+type 'a partial =
+  | Cache of 'a
+  | Leaf of int*int * StateSet.t array * node
+  | Node0 of tn_symbol (* No parameters *)
+  | Node1 of tn_symbol * 'a partial
+  | Node2 of tn_symbol * 'a partial * 'a partial
 
 type conf = C0 | C1 | C2 | C3 | C4 | C5 | C6
 
@@ -43,3 +43,14 @@ val get_id2_rank : rhs -> int
 val get_id2_pos : rhs -> int
 val get_id1 : rhs -> tn_symbol
 val get_id2 : rhs -> tn_symbol
+
+val is_attribute : t -> Tag.t -> bool
+(*
+val start_skip : t -> node -> int -> int
+val rule_skip : t -> n_symbol -> 'a partial -> 'a partial -> int -> int
+*)
+val dummy_param : 'a partial
+(*
+val dispatch_param0 : conf -> tn_symbol -> 'a partial -> 'a partial -> 'a partial
+val dispatch_param1 : conf -> tn_symbol -> 'a partial -> 'a partial -> 'a partial
+*)