haskal
/
utop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update for Asttypes.arg_label changes in 4.03. 

This is required for utop to compile on 4.03.0+beta2.
This commit is contained in:
whitequark 2016-04-11 19:34:42 +00:00
parent fcee98b6f6
commit 80f4b60058
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/lib/uTop_main.cppo.ml
View File

@ -1394,10 +1394,19 @@ let interact ~search_path ~unit ~loc:(fname, lnum, cnum, _) ~values =
| Texp_apply (_, args) -> begin | Texp_apply (_, args) -> begin
try try
match match
#if OCAML_VERSION >= (4, 03, 0)
List.find (fun (lab, _) -> lab = Asttypes.Labelled "loc" ) args,
List.find (fun (lab, _) -> lab = Asttypes.Labelled "values") args
#else
List.find (fun (lab, _, _) -> lab = "loc" ) args, List.find (fun (lab, _, _) -> lab = "loc" ) args,
List.find (fun (lab, _, _) -> lab = "values") args List.find (fun (lab, _, _) -> lab = "values") args
#endif
with with
#if OCAML_VERSION >= (4, 03, 0)
| (Asttypes.Labelled _, Some l), (Asttypes.Labelled _, Some v) ->
#else
| (_, Some l, Required), (_, Some v, Required) -> | (_, Some l, Required), (_, Some v, Required) ->
#endif
let pos = l.exp_loc.loc_start in let pos = l.exp_loc.loc_start in
if pos.pos_fname = fname && if pos.pos_fname = fname &&
pos.pos_lnum = lnum && pos.pos_lnum = lnum &&