summaryrefslogtreecommitdiff
path: root/dev-ml/js_of_ocaml/files
diff options
context:
space:
mode:
Diffstat (limited to 'dev-ml/js_of_ocaml/files')
-rw-r--r--dev-ml/js_of_ocaml/files/ocaml405.patch41
-rw-r--r--dev-ml/js_of_ocaml/files/ppx.patch11
2 files changed, 0 insertions, 52 deletions
diff --git a/dev-ml/js_of_ocaml/files/ocaml405.patch b/dev-ml/js_of_ocaml/files/ocaml405.patch
deleted file mode 100644
index 552dff425c46..000000000000
--- a/dev-ml/js_of_ocaml/files/ocaml405.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: js_of_ocaml-2.8.4/lib/ppx/ppx_js.ml
-===================================================================
---- js_of_ocaml-2.8.4.orig/lib/ppx/ppx_js.ml
-+++ js_of_ocaml-2.8.4/lib/ppx/ppx_js.ml
-@@ -162,7 +162,8 @@ let invoker ?(extra_types = []) uplift d
- {[ fun (type res t0 t1 ..) arg1 arg2 -> e ]}
- *)
- let local_types =
-- res :: List.map Arg.name (extra_types @ arguments)
-+ List.map Location.mknoloc
-+ (res :: List.map Arg.name (extra_types @ arguments))
- in
- let result = List.fold_right Exp.newtype local_types invoker in
-
-@@ -210,7 +211,7 @@ let method_call ~loc obj meth args =
- (Exp.fun_ ~loc ~attrs:[merlin_noloc] Label.nolabel None
- (Pat.var ~loc ~attrs:[merlin_noloc] (Location.mknoloc "x"))
- (Exp.send ~loc ~attrs:[merlin_noloc]
-- (Exp.ident ~loc:gloc (lid ~loc:gloc "x")) meth))]
-+ (Exp.ident ~loc:gloc (lid ~loc:gloc "x")) (Location.mknoloc meth)))]
- )
-
- (* {[ obj##.prop ]} generates
-@@ -244,7 +245,7 @@ let prop_get ~loc:_ ~prop_loc obj prop =
- (Exp.fun_ ~loc:gloc Label.nolabel None
- (Pat.var ~loc:gloc ~attrs:[merlin_noloc] (Location.mknoloc "x"))
- (Exp.send ~loc:prop_loc ~attrs:[merlin_noloc]
-- (Exp.ident ~loc:gloc (lid ~loc:gloc "x")) prop))
-+ (Exp.ident ~loc:gloc (lid ~loc:gloc "x")) (Location.mknoloc prop)))
- ]
- )
-
-@@ -289,7 +290,7 @@ let prop_set ~loc ~prop_loc obj prop val
- (Exp.fun_ ~loc Label.nolabel None
- (Pat.var ~loc:gloc ~attrs:[merlin_noloc] (Location.mknoloc "x"))
- (Exp.send ~loc:prop_loc ~attrs:[merlin_noloc]
-- (Exp.ident ~loc:gloc (lid ~loc:gloc "x")) prop))
-+ (Exp.ident ~loc:gloc (lid ~loc:gloc "x")) (Location.mknoloc prop)))
- ]
- )
-
diff --git a/dev-ml/js_of_ocaml/files/ppx.patch b/dev-ml/js_of_ocaml/files/ppx.patch
deleted file mode 100644
index c46293f546da..000000000000
--- a/dev-ml/js_of_ocaml/files/ppx.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: js_of_ocaml-2.8.4/lib/ppx_driver/ppx_js_driver.ml
-===================================================================
---- js_of_ocaml-2.8.4.orig/lib/ppx_driver/ppx_js_driver.ml
-+++ js_of_ocaml-2.8.4/lib/ppx_driver/ppx_js_driver.ml
-@@ -1,5 +1,5 @@
- let () =
- let js_mapper = Ppx_js.js_mapper [] in
-- Ppx_driver.register_transformation "js_of_ocaml"
-+ Ppx_driver.register_transformation_using_ocaml_current_ast "js_of_ocaml"
- ~impl:(js_mapper.Ast_mapper.structure js_mapper)
- ~intf:(js_mapper.Ast_mapper.signature js_mapper)