Skip to content

Commit

Permalink
Merge branch 'master' of github.com:/reasonml/reason
Browse files Browse the repository at this point in the history
* 'master' of github.com:/reasonml/reason:
  chore: port to ppxlib (#2711)
  fix: binary parser (#2713)
  Improve functor printing. (#2683)
  chore: remove old BS_NO_COMPILER_PATCH flag (#2710)
  Improve printing of modules types with one line inside (#2709)
  generate opam files with dune (#2704)
  • Loading branch information
davesnx committed Apr 25, 2023
2 parents 33d181c + fc97ab2 commit da042bc
Show file tree
Hide file tree
Showing 133 changed files with 4,682 additions and 92,660 deletions.
6 changes: 5 additions & 1 deletion HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
## 3.9 (unreleased)

- Reduce the amount of parentheses around functor usage. [#2683](https://github.com/reasonml/reason/pull/2683)
- Print module type body on separate line (@SanderSpies) [#2709](https://github.com/reasonml/reason/pull/2709)
- Fix missing patterns around contraint pattern (a pattern with a type annotation).
- Fix top level extension printing
- Remove the dependency on the `result` package, which isn't needed for OCaml
4.03 and above (@anmonteiro) [2703](https://github.com/reasonml/reason/pull/2703)
4.03 and above (@anmonteiro) [#2703](https://github.com/reasonml/reason/pull/2703)
- Fix the binary parser by converting to the internal AST version used by
Reason (@anmonteiro) [#2713](https://github.com/reasonml/reason/pull/2713)

## 3.8.2

Expand Down
58 changes: 57 additions & 1 deletion dune-project
Original file line number Diff line number Diff line change
@@ -1,7 +1,63 @@
(lang dune 2.8)
(lang dune 2.9)

(name reason)

(using menhir 2.0)

(cram enable)

(version 3.8.2)

(generate_opam_files true)

(source
(github reasonml/reason))

(authors "Jordan Walke <[email protected]>")

(maintainers
"Jordan Walke <[email protected]>"
"Antonio Nuno Monteiro <[email protected]>")

(homepage "https://reasonml.github.io/")

(bug_reports "https://github.com/reasonml/reason/issues")

(license "MIT")

(package
(name reason)
(synopsis "Reason: Syntax & Toolchain for OCaml")
(description
"Reason gives OCaml a new syntax that is remniscient of languages like\nJavaScript. It's also the umbrella project for a set of tools for the OCaml &\nJavaScript ecosystem.")
(depends
(ocaml
(and
(>= "4.03")
(< "5.1")))
(ocamlfind :build)
(dune-build-info
(>= 2.9.3))
(menhir
(>= "20180523"))
(merlin-extend
(>= "0.6"))
fix
ppx_derivers
(ppxlib
(>= "0.28.0"))))

(package
(name rtop)
(synopsis "Reason toplevel")
(description
"rtop is the toplevel (or REPL) for Reason, based on utop (https://github.com/diml/utop).")
(depends
(ocaml
(and
(>= "4.03")
(< "5.1")))
(reason
(= :version))
(utop
(>= "2.0"))))
1 change: 1 addition & 0 deletions esy.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"@opam/merlin-extend": " >= 0.6",
"@opam/ocamlfind": "1.9.5",
"@opam/ppx_derivers": "< 2.0.0",
"@opam/ppxlib": "> 0.28.x",
"@opam/utop": " >= 1.17.0",
"ocaml": " >= 4.3.0 < 4.15.0"
},
Expand Down
Loading

0 comments on commit da042bc

Please sign in to comment.