Minimal update to make utop build on OCaml 4.07.0+rc1 (#238)
This commit is contained in:
parent
1b4bd052c6
commit
0bee8c9297
|
@ -541,7 +541,13 @@ let list_global_names () =
|
||||||
| Env.Env_constraints (summary, _) ->
|
| Env.Env_constraints (summary, _) ->
|
||||||
loop acc summary
|
loop acc summary
|
||||||
#endif
|
#endif
|
||||||
|
#if OCAML_VERSION >= (4, 07, 0)
|
||||||
|
| Env.Env_copy_types (summary, _) ->
|
||||||
|
loop acc summary
|
||||||
|
| Env.Env_open(summary, _skip, path) ->
|
||||||
|
#else
|
||||||
| Env.Env_open(summary, path) ->
|
| Env.Env_open(summary, path) ->
|
||||||
|
#endif
|
||||||
match try Some (Path_map.find path !local_names_by_path) with Not_found -> None with
|
match try Some (Path_map.find path !local_names_by_path) with Not_found -> None with
|
||||||
| Some names ->
|
| Some names ->
|
||||||
loop (String_set.union acc names) summary
|
loop (String_set.union acc names) summary
|
||||||
|
@ -604,7 +610,13 @@ let list_global_fields () =
|
||||||
| Env.Env_constraints (summary, _) ->
|
| Env.Env_constraints (summary, _) ->
|
||||||
loop acc summary
|
loop acc summary
|
||||||
#endif
|
#endif
|
||||||
|
#if OCAML_VERSION >= (4, 07, 0)
|
||||||
|
| Env.Env_copy_types (summary, _) ->
|
||||||
|
loop acc summary
|
||||||
|
| Env.Env_open(summary, _skip, path) ->
|
||||||
|
#else
|
||||||
| Env.Env_open(summary, path) ->
|
| Env.Env_open(summary, path) ->
|
||||||
|
#endif
|
||||||
match try Some (Path_map.find path !local_fields_by_path) with Not_found -> None with
|
match try Some (Path_map.find path !local_fields_by_path) with Not_found -> None with
|
||||||
| Some fields ->
|
| Some fields ->
|
||||||
loop (String_set.union acc fields) summary
|
loop (String_set.union acc fields) summary
|
||||||
|
|
Loading…
Reference in New Issue