version 0.22.1

- fix in dot output
- better error handling in conll parsing

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/semagramme/libcaml-grew/trunk@8171 7838e531-6607-4d57-9587-6c381814729c

config/Makefile.in

-VERSION = 0.22.0
+VERSION = 0.22.1
 
 INSTALL_DIR_LIB = @OCAMLLIB@
 INSTALL_DIR = @prefix@/bin/

src/grew_edge.ml

@@ -111,7 +111,7 @@ module Label = struct
         | Dash -> ["style=dashed"]
         | Solid when deco -> ["style=dotted"]
         | Solid -> []) in
-    sprintf "[label=\"%s\", %s}" style.text (String.concat ", " dot_items)
+    sprintf "[label=\"%s\", %s]" style.text (String.concat ", " dot_items)
 
   let from_string ?loc ?(locals=[||]) string =
     match !full with

src/libgrew_utils.ml

@@ -656,9 +656,10 @@ module Conll = struct
 
   let underscore s = if s = "" then "_" else s
   let parse_line file_name (line_num, line) =
-    try
     match Str.split (Str.regexp "\t") line with
       | [ num; phon; lemma; pos1; pos2; morph; govs; dep_labs; _; _ ] ->
+        begin
+          try
             let gov_list = if govs = "_" then [] else Str.split (Str.regexp "|") govs
             and lab_list = if dep_labs = "_" then [] else Str.split (Str.regexp "|") dep_labs in
             let deps = List.combine gov_list lab_list in
@@ -671,9 +672,9 @@ module Conll = struct
              morph = parse_morph file_name line_num morph;
              deps = deps;
             }
-        | l ->
-          Error.build ~loc:(file_name,line_num) "[Conll.load] illegal line, %d fields (10 are expected)\n>>>>>%s<<<<<<" (List.length l) line
           with exc -> Error.build ~loc:(file_name,line_num) "[Conll.load] illegal line, exc=%s\n>>>>>%s<<<<<<" (Printexc.to_string exc) line
+        end
+      | l -> Error.build ~loc:(file_name,line_num) "[Conll.load] illegal line, %d fields (10 are expected)\n>>>>>%s<<<<<<" (List.length l) line
 
   let load file_name =
     let lines = File.read_ln file_name in