Commit 15f0b98d authored by bguillaum's avatar bguillaum

adapt to type change in libcaml-conll

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/semagramme/libcaml-grew/trunk@9219 7838e531-6607-4d57-9587-6c381814729c
parent dd2d4df3
......@@ -22,12 +22,16 @@ module Loc = struct
type t = string * int
let empty = ("Not a file", -1)
let file f = (f, -1)
let file_line f l = (f,l)
let file_opt_line fo l = match fo with
| Some f -> file_line f l
| None -> file_line "No_file" l
let file f = (f, -1)
let file_opt_line_opt fo lo = match (fo,lo) with
| (_,Some l) -> file_opt_line fo l
| (Some f, None) -> file f
| (None, None) -> empty
let to_string (file,line) = sprintf "[file: %s, line: %d]" (Filename.basename file) line
let to_line (_,line) = line
......
......@@ -51,6 +51,7 @@ module Loc: sig
val file_line: string -> int -> t
val file_opt_line: string option -> int -> t
val file_opt_line_opt: string option -> int option -> t
val file: string -> t
val opt_set_line: int -> t option -> t option
......
......@@ -401,7 +401,7 @@ module G_graph = struct
let fusion =
List.map
(fun {Conll.first; last; fusion; mw_line_num} ->
let loc = Loc.file_opt_line conll.Conll.file mw_line_num in
let loc = Loc.file_opt_line_opt conll.Conll.file mw_line_num in
(
Id.gbuild ~loc first gtable,
(
......
Markdown is supported
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