Skip to content

Prepare for 5.2 AST bump #340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Prepare for 5.2 AST bump #340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b11831
Prepare for 5.2 AST bump
patricoferris Oct 26, 2024
c72a9e0
Bump ppxlib to 0.36
smorimoto Apr 19, 2025
ab51aec
Bump OCaml lower bound constraints to 4.08 for ppxlib 0.36
smorimoto Apr 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/workflows/workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand Down
14 changes: 7 additions & 7 deletions dune-project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)))

Expand All @@ -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)))
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions ppx/tyxml_ppx.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tyxml-jsx.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
4 changes: 2 additions & 2 deletions tyxml-ppx.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
4 changes: 2 additions & 2 deletions tyxml-syntax.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion tyxml.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down