Commit 39319d87 authored by bguillaum's avatar bguillaum
Browse files

version 0.16.0

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/semagramme/libcaml-grew/trunk@7574 7838e531-6607-4d57-9587-6c381814729c
parent 5a720a51
VERSION = 0.15.1 VERSION = 0.16.0
INSTALL_DIR_LIB = @OCAMLLIB@ INSTALL_DIR_LIB = @OCAMLLIB@
INSTALL_DIR = @prefix@/bin/ INSTALL_DIR = @prefix@/bin/
......
...@@ -200,7 +200,7 @@ module G_fs = struct ...@@ -200,7 +200,7 @@ module G_fs = struct
:: ("lemma", String line.Conll.lemma) :: ("lemma", String line.Conll.lemma)
:: ("cat", String line.Conll.pos1) :: ("cat", String line.Conll.pos1)
:: ("pos", String line.Conll.pos2) :: ("pos", String line.Conll.pos2)
:: ("num", Int line.Conll.num) :: ("position", Int line.Conll.num)
:: (List.map (fun (f,v) -> (f, String v)) line.Conll.morph) in :: (List.map (fun (f,v) -> (f, String v)) line.Conll.morph) in
List.sort G_feature.compare unsorted List.sort G_feature.compare unsorted
......
...@@ -39,7 +39,7 @@ module G_node = struct ...@@ -39,7 +39,7 @@ module G_node = struct
let fs = G_fs.build ast_node.Ast.fs in let fs = G_fs.build ast_node.Ast.fs in
let fs_with_num = match ast_node.Ast.position with let fs_with_num = match ast_node.Ast.position with
| None -> fs | None -> fs
| Some num -> G_fs.set_feat "num" (string_of_int num) fs in | Some num -> G_fs.set_feat "position" (string_of_int num) fs in
(ast_node.Ast.node_id, (ast_node.Ast.node_id,
{ fs = fs_with_num; { fs = fs_with_num;
pos = ast_node.Ast.position; pos = ast_node.Ast.position;
......
...@@ -460,19 +460,19 @@ pat_const: ...@@ -460,19 +460,19 @@ pat_const:
| qfn1 = QFN EQUAL qfn2 = QFN | qfn1 = QFN EQUAL qfn2 = QFN
{ localize (Ast.Feature_eq (qfn1, qfn2)) } { localize (Ast.Feature_eq (qfn1, qfn2)) }
(* X.num < Y.num *) (* X.position < Y.position *)
| qfn1 = QFN LT qfn2 = QFN | qfn1 = QFN LT qfn2 = QFN
{ localize (Ast.Feature_ineq (Ast.Lt, qfn1, qfn2)) } { localize (Ast.Feature_ineq (Ast.Lt, qfn1, qfn2)) }
(* X.num > Y.num *) (* X.position > Y.position *)
| qfn1 = QFN GT qfn2 = QFN | qfn1 = QFN GT qfn2 = QFN
{ localize (Ast.Feature_ineq (Ast.Gt, qfn1, qfn2)) } { localize (Ast.Feature_ineq (Ast.Gt, qfn1, qfn2)) }
(* X.num <= Y.num *) (* X.position <= Y.position *)
| qfn1 = QFN LE qfn2 = QFN | qfn1 = QFN LE qfn2 = QFN
{ localize (Ast.Feature_ineq (Ast.Le, qfn1, qfn2)) } { localize (Ast.Feature_ineq (Ast.Le, qfn1, qfn2)) }
(* X.num >= Y.num *) (* X.position >= Y.position *)
| qfn1 = QFN GE qfn2 = QFN | qfn1 = QFN GE qfn2 = QFN
{ localize (Ast.Feature_ineq (Ast.Ge, qfn1, qfn2)) } { localize (Ast.Feature_ineq (Ast.Ge, qfn1, qfn2)) }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment