Merge pull request #340 from patricoferris/5.2-ast-bump

Prepare for 5.2 AST bump

Author: smorimoto

.github/workflows/workflow.yml

@@ -21,9 +21,7 @@ jobs:
           - 4
         include:
           - os: ubuntu-latest
-            ocaml-compiler: "4.04"
-          - os: ubuntu-latest
-            ocaml-compiler: "4.04"
+            ocaml-compiler: "4.08"
 
     runs-on: ${{ matrix.os }}
 

dune-project

@@ -22,10 +22,10 @@ The TyXML JSX allow to write TyXML documents with reason's JSX syntax.
 It works with textual trees, virtual DOM trees, or any TyXML module.
 ")
  (depends
-  (ocaml (>= 4.04))
+  (ocaml (>= 4.08))
   (tyxml (= :version))
   (tyxml-syntax (= :version))
-  (ppxlib (>= 0.18))
+  (ppxlib (>= 0.36))
   (alcotest :with-test)
   (reason :with-test)))
 
@@ -42,20 +42,20 @@ The TyXML PPX allow to write TyXML documents using the traditional HTML syntax.
 It works with textual trees, virtual DOM trees, or any TyXML module.
 ")
  (depends
-  (ocaml (>= 4.04))
+  (ocaml (>= 4.08))
   (tyxml (= :version))
   (tyxml-syntax (= :version))
   (markup (>= 0.7.2))
-  (ppxlib (>= 0.18))
+  (ppxlib (>= 0.36))
   (re (>= 1.5.0))
   (alcotest :with-test)))
 
 (package
  (name tyxml-syntax)
  (synopsis "Common layer for the JSX and PPX syntaxes for Tyxml")
  (depends
-  (ocaml (>= 4.03))
-  (ppxlib (>= 0.18))
+  (ocaml (>= 4.08))
+  (ppxlib (>= 0.36))
   (re (>= 1.5.0))
   (uutf (>= 1.0.0))
   (alcotest :with-test)))
@@ -65,7 +65,7 @@ It works with textual trees, virtual DOM trees, or any TyXML module.
  (synopsis "A library for building correct HTML and SVG documents")
  (description "TyXML provides a set of convenient combinators that uses the OCaml type system to ensure the validity of the generated documents. TyXML can be used with any representation of HTML and SVG: the textual one, provided directly by this package, or DOM trees (`js_of_ocaml-tyxml`) virtual DOM (`virtual-dom`) and reactive or replicated trees (`eliom`). You can also create your own representation and use it to instantiate a new set of combinators.")
  (depends
-  (ocaml (>= 4.03))
+  (ocaml (>= 4.08))
   (re (>= 1.5.0))
   (uutf (>= 1.0.0))
   seq

ppx/tyxml_ppx.ml

@@ -378,12 +378,12 @@ let markup_cases ~lang ~modname cases =
 let rec markup_function ~lang ~modname e =
   let loc = e.pexp_loc in
   match e.pexp_desc with
-  | Pexp_fun (label,def,pat,content) ->
+  | Pexp_function (params, constraint_, (Pfunction_body content)) ->
     let content = markup_function ~lang ~modname content in
-    {e with pexp_desc = Pexp_fun (label,def,pat,content)}
-  | Pexp_function cases ->
+    {e with pexp_desc = Pexp_function (params, constraint_, (Pfunction_body content))}
+  | Pexp_function (params, constraint_, (Pfunction_cases (cases, loc, attr))) ->
     let cases = markup_cases ~lang ~modname cases in
-    {e with pexp_desc = Pexp_function cases}
+    {e with pexp_desc = Pexp_function (params, constraint_, (Pfunction_cases (cases, loc, attr)))}
   | _ ->
     markup_to_expr_with_implementation lang modname loc @@
     application_to_list e

tyxml-jsx.opam

@@ -18,10 +18,10 @@ doc: "https://ocsigen.org/tyxml/latest/manual/intro"
 bug-reports: "https://github.com/ocsigen/tyxml/issues"
 depends: [
   "dune" {>= "2.7"}
-  "ocaml" {>= "4.04"}
+  "ocaml" {>= "4.08"}
   "tyxml" {= version}
   "tyxml-syntax" {= version}
-  "ppxlib" {>= "0.18"}
+  "ppxlib" {>= "0.36"}
   "alcotest" {with-test}
   "reason" {with-test}
   "odoc" {with-doc}

tyxml-ppx.opam

@@ -18,11 +18,11 @@ doc: "https://ocsigen.org/tyxml/latest/manual/intro"
 bug-reports: "https://github.com/ocsigen/tyxml/issues"
 depends: [
   "dune" {>= "2.7"}
-  "ocaml" {>= "4.04"}
+  "ocaml" {>= "4.08"}
   "tyxml" {= version}
   "tyxml-syntax" {= version}
   "markup" {>= "0.7.2"}
-  "ppxlib" {>= "0.18"}
+  "ppxlib" {>= "0.36"}
   "re" {>= "1.5.0"}
   "alcotest" {with-test}
   "odoc" {with-doc}

tyxml-syntax.opam

@@ -9,8 +9,8 @@ doc: "https://ocsigen.org/tyxml/latest/manual/intro"
 bug-reports: "https://github.com/ocsigen/tyxml/issues"
 depends: [
   "dune" {>= "2.7"}
-  "ocaml" {>= "4.03"}
-  "ppxlib" {>= "0.18"}
+  "ocaml" {>= "4.08"}
+  "ppxlib" {>= "0.36"}
   "re" {>= "1.5.0"}
   "uutf" {>= "1.0.0"}
   "alcotest" {with-test}

tyxml.opam

@@ -11,7 +11,7 @@ doc: "https://ocsigen.org/tyxml/latest/manual/intro"
 bug-reports: "https://github.com/ocsigen/tyxml/issues"
 depends: [
   "dune" {>= "2.7"}
-  "ocaml" {>= "4.03"}
+  "ocaml" {>= "4.08"}
   "re" {>= "1.5.0"}
   "uutf" {>= "1.0.0"}
   "seq"