this repo has no description
Merge pull request #4 from jonludlam/414-compat
414 compat
authored by
Jon Ludlam
and committed by
GitHub
81d306e6
38491365
+43
-7
+2
-2
idl/dune
+2
-2
idl/dune
···
1
1
(library
2
2
(name js_top_worker_rpc)
3
-
(public_name js_top_worker.rpc)
3
+
(public_name js_top_worker-rpc)
4
4
(modules idl rpc rpcmarshal toplevel_api_gen)
5
5
(libraries rresult))
6
6
···
8
8
(name js_top_worker_client)
9
9
(public_name js_top_worker-client)
10
10
(modules js_top_worker_client)
11
-
(libraries js_top_worker_rpc lwt brr))
11
+
(libraries js_top_worker-rpc lwt brr))
12
12
13
13
(library
14
14
(name js_top_worker_rpc_def)
+2
js_top_worker-client.opam
+2
js_top_worker-client.opam
+20
js_top_worker-rpc.opam
+20
js_top_worker-rpc.opam
···
1
+
version: "0.0.1"
2
+
opam-version: "2.0"
3
+
maintainer: "jon@recoil.org"
4
+
authors: "various"
5
+
license: "ISC"
6
+
homepage: "https://github.com/jonludlam/js_top_worker"
7
+
bug-reports: "https://github.com/jonludlam/js_top_worker/issues"
8
+
depends: [
9
+
"ocaml" {>= "4.04"}
10
+
"dune" {>= "2.9.1"}
11
+
"rresult"
12
+
]
13
+
build : [
14
+
["dune" "subst"] {pinned}
15
+
["dune" "build" "-p" name "-j" jobs]
16
+
]
17
+
synopsis: "JS Toplevel worker - RPC functions"
18
+
description: """
19
+
An OCaml toplevel designed to run as a web worker
20
+
"""
+2
js_top_worker.opam
+2
js_top_worker.opam
+2
js_top_worker_rpc_def.opam
+2
js_top_worker_rpc_def.opam
+1
-1
lib/dune
+1
-1
lib/dune
+9
-3
lib/uTop_complete.ml
+9
-3
lib/uTop_complete.ml
···
23
23
(* +-----------------------------------------------------------------+
24
24
| Utils |
25
25
+-----------------------------------------------------------------+ *)
26
+
let get_desc x =
27
+
#if OCAML_VERSION >= (4, 14, 0)
28
+
Types.get_desc x
29
+
#else
30
+
x.Types.desc
31
+
#endif
26
32
27
33
(* Transform a non-empty list of strings into a long-identifier. *)
28
34
let longident_of_list = function
···
692
698
+-----------------------------------------------------------------+ *)
693
699
694
700
let rec find_method meth type_expr =
695
-
match type_expr.desc with
701
+
match get_desc type_expr with
696
702
| Tlink type_expr ->
697
703
find_method meth type_expr
698
704
| Tobject (type_expr, _) ->
···
716
722
None
717
723
718
724
let rec methods_of_type acc type_expr =
719
-
match type_expr.desc with
725
+
match get_desc type_expr with
720
726
| Tlink type_expr ->
721
727
methods_of_type acc type_expr
722
728
| Tobject (type_expr, _) ->
···
770
776
+-----------------------------------------------------------------+ *)
771
777
772
778
let rec labels_of_type acc type_expr =
773
-
match type_expr.desc with
779
+
match get_desc type_expr with
774
780
| Tlink te ->
775
781
labels_of_type acc te
776
782
| Tpoly (te, _) ->
+5
-1
lib/worker.cppo.ml
+5
-1
lib/worker.cppo.ml
···
330
330
| Parsetree.Ptop_def sstr ->
331
331
let oldenv = !Toploop.toplevel_env in
332
332
Typecore.reset_delayed_checks ();
333
-
#if OCAML_VERSION >= (4,9,0)
333
+
#if OCAML_VERSION >= (4,8,0) && OCAML_VERSION < (4,14,0)
334
334
let str, sg, sn, newenv = Typemod.type_toplevel_phrase oldenv sstr in
335
+
let sg' = Typemod.Signature_names.simplify newenv sn sg in
336
+
ignore (Includemod.signatures ~mark:Mark_positive oldenv sg sg');
337
+
#elif OCAML_VERSION >= (4,14,0)
338
+
let str, sg, sn, _, newenv = Typemod.type_toplevel_phrase oldenv sstr in
335
339
let sg' = Typemod.Signature_names.simplify newenv sn sg in
336
340
ignore (Includemod.signatures ~mark:Mark_positive oldenv sg sg');
337
341
#else