simon/ocaml-containers
1
0
Fork 0
mirror of https://github.com/c-cube/ocaml-containers.git synced 2025-12-06 11:15:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(sexp): set location properly when parsing a file

Browse source
This commit is contained in:
Simon Cruanes 2019-12-06 20:21:46 -06:00
parent 825e350da0
commit c2f8d6811b
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/sexp/CCSexp.ml
View file

@ -241,16 +241,24 @@ module Make(Sexp : SEXP) = struct
| Yield x -> Result.Ok x
| Fail s -> Result.Error s
let parse_chan ic : sexp or_error =
let set_file_ ?file buf =
let open Lexing in
match file with
| Some s -> buf.lex_start_p <- {buf.lex_start_p with pos_fname=s}
| None -> ()
let parse_chan_ ?file ic : sexp or_error =
let buf = Lexing.from_channel ic in
set_file_ ?file buf;
let d = Decoder.of_lexbuf buf in
match Decoder.next d with
| End -> Result.Error "unexpected end of file"
| Yield x -> Result.Ok x
| Fail e -> Result.Error e
let parse_chan_list ic =
let parse_chan_list_ ?file ic =
let buf = Lexing.from_channel ic in
set_file_ ?file buf;
let d = Decoder.of_lexbuf buf in
let rec iter acc = match Decoder.next d with
| End -> Result.Ok (List.rev acc)
@ -259,6 +267,9 @@ module Make(Sexp : SEXP) = struct
in
iter []
let parse_chan ic = parse_chan_ ic
let parse_chan_list ic = parse_chan_list_ ic
let parse_chan_gen ic =
let buf = Lexing.from_channel ic in
let d = Decoder.of_lexbuf buf in
@ -267,9 +278,9 @@ module Make(Sexp : SEXP) = struct
| Fail e -> Some (Result.Error e)
| Yield x -> Some (Result.Ok x)
let parse_file filename = _with_in filename parse_chan
let parse_file filename = _with_in filename (parse_chan_ ~file:filename)
let parse_file_list filename = _with_in filename parse_chan_list
let parse_file_list filename = _with_in filename (parse_chan_list_ ~file:filename)
end
type t = [