Add port of dream to direct-style and 5.00.0 compat

.github/workflows/ci.yml

@@ -30,4 +30,6 @@ jobs:
     - name: ~~~ Install dune ~~~
       run: opam install dune.2.9.2
     - name: ~~~ Build with the Duniverse ~~~
-      run: opam exec -- dune runtest
+      run: |
+        opam exec -- dune build
+        opam exec -- dune runtest

README.md

@@ -19,7 +19,7 @@ $ opam switch create 5.00.0+trunk
 $ opam install dune.2.9.2 
 ```
 
-From there you can make sure the small `Eio_main` function works from the `README.md` by running `dune runtest`.
+From there you can make sure the small `Eio_main` function works from the `README.md` by running `dune runtest`. There is an `example` directory too that can be built with `dune build`.
 
 Then create a `src` directory for your project, build it using the vendored libraries and run `dune build`. As `5.00.0+trunk` progresses more things are likely to break so you could be unfortunate enough to get a new 5.00.0 compiler that deprecates some more libraries and causes things to break. Feel free to open an issue if that is the case!
 

docs/TODO.md

@@ -1,4 +1,8 @@
 # Changes in the duniverse
 
  - Fmt ephemeron API changes
- - Mdx executable dependency issue (fixed à la https://github.com/ocurrent/ocaml-ci/blob/98057c00918e793142c6b10049df9c522ae29cd1/service/dune)
+ - Mdx executable dependency issue (fixed à la https://github.com/ocurrent/ocaml-ci/blob/98057c00918e793142c6b10049df9c522ae29cd1/service/dune)
+ - Bigarray compat issues:
+   + Mmap
+   + Lwt.unix
+   + Multipart_form (note we use an older 0.3.0 version for Dream's Eio port)

dune-project

@@ -1,4 +1,3 @@
 (lang dune 2.9)
 (name multicore-monorepo)
-; (using mdx 0.1)
 (using mdx 0.1)

duniverse/angstrom/.gitignore

@@ -0,0 +1,12 @@
+.*.sw[a-z]
+*~
+_build/
+_tests/
+lib_test/tests_
+setup.log
+setup.data
+*.native
+*.byte
+*.docdir
+*.install
+.merlin

duniverse/angstrom/.travis.yml

@@ -0,0 +1,18 @@
+language: c
+sudo: false
+services:
+  - docker
+install: wget https://raw.githubusercontent.com/ocaml/ocaml-travisci-skeleton/master/.travis-docker.sh
+script: bash -ex ./.travis-docker.sh
+env:
+  global:
+  - DISTRO="ubuntu"
+  - PINS="angstrom-async:. angstrom-lwt-unix:. angstrom:."
+  - PACKAGE="angstrom"
+  - TESTS=true
+  - EXTRA_DEPS="ppx_let"
+  - POST_INSTALL_HOOK="opam install --with-test angstrom-async angstrom-lwt-unix && opam exec -- make examples"
+  matrix:
+  - OCAML_VERSION="4.08"
+  - OCAML_VERSION="4.07"
+  - OCAML_VERSION="4.06"

duniverse/angstrom/LICENSE

@@ -0,0 +1,30 @@
+Copyright (c) 2016, Inhabited Type LLC
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the author nor the names of his contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS ``AS IS'' AND ANY EXPRESS
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.

duniverse/angstrom/META.angstrom.template

@@ -0,0 +1,16 @@
+# JBUILDER_GEN
+
+package "unix" (
+  description = "Deprecated. Use angstrom-unix directly"
+  requires = "angstrom-unix"
+)
+
+package "lwt-unix" (
+  description = "Deprecated. Use angstrom-lwt-unix directly"
+  requires = "angstrom-lwt-unix"
+)
+
+package "async" (
+  description = "Deprecated. Use angstrom-async directly"
+  requires = "angstrom-async"
+)

duniverse/angstrom/Makefile

@@ -0,0 +1,24 @@
+.PHONY: all build clean test install uninstall doc examples
+
+build:
+	dune build
+
+all: build
+
+test:
+	dune runtest
+
+examples:
+	dune build @examples
+
+install:
+	dune install
+
+uninstall:
+	dune uninstall
+
+doc:
+	dune build @doc
+
+clean:
+	rm -rf _build *.install

duniverse/angstrom/README.md

@@ -0,0 +1,152 @@
+# Angstrom
+
+Angstrom is a parser-combinator library that makes it easy to write efficient,
+expressive, and reusable parsers suitable for high-performance applications. It
+exposes monadic and applicative interfaces for composition, and supports
+incremental input through buffered and unbuffered interfaces. Both interfaces
+give the user total control over the blocking behavior of their application,
+with the unbuffered interface enabling zero-copy IO. Parsers are backtracking
+by default and support unbounded lookahead.
+
+[![Build Status](https://travis-ci.com/inhabitedtype/angstrom.svg?branch=master)](https://travis-ci.com/inhabitedtype/angstrom)
+
+
+## Installation
+
+Install the library and its dependencies via [OPAM][opam]:
+
+[opam]: http://opam.ocaml.org/
+
+```bash
+opam install angstrom
+```
+
+## Usage
+
+Angstrom is written with network protocols and serialization formats in mind.
+As such, its source distribution includes implementations of various RFCs that
+are illustrative of real-world applications of the library. These include an
+[HTTP parser][http] and a [JSON parser][json].
+
+[http]: https://github.com/inhabitedtype/angstrom/blob/master/examples/rFC2616.ml
+[json]: https://github.com/inhabitedtype/angstrom/blob/master/examples/rFC7159.ml
+
+In addition, it is an informal tradition for OCaml parser-combinator libraries
+to include in their READMEs a parser for a simple arithmetic expression
+language. The code below implements a parser for such a language and computes
+the numerical result of the expression as it is being parsed. Because Angstrom
+is written with network protocols and serialization libraries in mind, it does
+not include combinators for creating infix expression parsers. Such
+combinators, e.g., `chainl1`, are nevertheless simple to define.
+
+```ocaml
+open Angstrom
+
+let parens p = char '(' *> p <* char ')'
+let add = char '+' *> return (+)
+let sub = char '-' *> return (-)
+let mul = char '*' *> return ( * )
+let div = char '/' *> return (/)
+let integer =
+  take_while1 (function '0' .. '9' -> true | _ -> false) >>| int_of_string
+
+let chainl1 e op =
+  let rec go acc =
+    (lift2 (fun f x -> f acc x) op e >>= go) <|> return acc in
+  e >>= fun init -> go init
+
+let expr : int t =
+  fix (fun expr ->
+    let factor = parens expr <|> integer in
+    let term   = chainl1 factor (mul <|> div) in
+    chainl1 term (add <|> sub))
+
+let eval (str:string) : int =
+  match parse_string ~consume:All expr str with
+  | Ok v      -> v
+  | Error msg -> failwith msg
+```
+
+For an explanation of the infix operators and other combinators used in the
+implementation of this example, see the documentation in the [`mli`][mli].
+
+[mli]: https://github.com/inhabitedtype/angstrom/blob/master/lib/angstrom.mli
+
+
+## Comparison to Other Libraries
+
+There are several other parser-combinator libraries available for OCaml that
+may suit your needs, and are worth considering. Most of them are derivatives of
+or inspired by [Parsec][]. As such, they require the use of a `try` combinator
+to achieve backtracking, rather than providing it by default. They also all use
+something akin to a lazy character stream as the underlying input abstraction.
+While this suits Haskell quite nicely, it requires blocking read calls when the
+entire input is not immediately available&mdash;an approach that is inherently
+incompatible with monadic concurrency libraries such as [Async] and [Lwt], and
+writing high-performance, concurrent applications in general. Another
+consequence of this approach to modeling and retrieving input is that the
+parsers cannot iterate over sections of input in a tight loop, which adversely
+affects performance.
+
+Below is a table that compares the features of Angstrom against the those of
+other parser-combinator libraries.
+
+[parsec]: https://hackage.haskell.org/package/parsec
+[async]: https://github.com/janestreet/async
+[lwt]: https://ocsigen.org/lwt/
+
+
+Feature \ Library                   | Angstrom | [mparser] | [planck] | [opal] |
+------------------------------------|:--------:|:---------:|:--------:|:------:|
+Monadic interface                   | ✅        | ✅         | ✅        | ✅      |
+Backtracking by default             | ✅        | ❌         | ❌        | ❌      |
+Unbounded lookahead                 | ✅        | ✅         | ✅        | ❌      |
+Reports line numbers in errors      | ❌        | ✅         | ❌        | ❌      |
+Efficient `take_while`/`skip_while` | ✅        | ❌         | ❌        | ❌      |
+Unbuffered (zero-copy) interface    | ✅        | ❌         | ❌        | ❌      |
+Non-blocking incremental interface  | ✅        | ❌         | ❌        | ❌      |
+Async Support                       | ✅        | ❌         | ❌        | ❌      |
+Lwt Support                         | ✅        | ❌         | ❌        | ❌      |
+
+[mparser]: https://github.com/cakeplus/mparser
+[opal]: https://github.com/pyrocat101/opal
+[planck]: https://bitbucket.org/camlspotter/planck
+
+
+## Development
+
+To install development dependencies, pin the package from the root of the
+repository:
+
+```bash
+opam pin add -n angstrom .
+opam install --deps-only angstrom
+```
+
+After this, you may install a development version of the library using the
+install command as usual.
+
+For building and running the tests during development, you will need to install
+the `alcotest` package:
+
+```bash
+opam install alcotest
+make test
+```
+
+## Acknowledgements
+
+This library started off as a direct port of the inimitable [attoparsec][]
+library. While the original approach of continuation-passing still survives in
+the source code, several modifications have been made in order to adapt the
+ideas to OCaml, and in the process allow for more efficient memory usage and
+integration with monadic concurrency libraries. This library will undoubtedly
+diverge further as time goes on, but its name will stand as an homage to its
+origin.
+
+[attoparsec]: https://github.com/bos/attoparsec
+
+
+## License
+
+BSD3, see LICENSE file for its text.

duniverse/angstrom/angstrom-async.opam

@@ -0,0 +1,20 @@
+version: "0.15.0"
+opam-version: "2.0"
+maintainer: "Spiros Eliopoulos <spiros@inhabitedtype.com>"
+authors: [ "Spiros Eliopoulos <spiros@inhabitedtype.com>" ]
+license: "BSD-3-clause"
+homepage: "https://github.com/inhabitedtype/angstrom"
+bug-reports: "https://github.com/inhabitedtype/angstrom/issues"
+dev-repo: "git+https://github.com/inhabitedtype/angstrom.git"
+build: [
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+]
+depends: [
+  "ocaml" {>= "4.04.1"}
+  "dune" {>= "1.0"}
+  "angstrom" {>= "0.7.0"}
+  "async" {>= "v0.10.0"}
+]
+synopsis: "Async support for Angstrom"

duniverse/angstrom/angstrom-lwt-unix.opam

@@ -0,0 +1,21 @@
+version: "0.15.0"
+opam-version: "2.0"
+maintainer: "Spiros Eliopoulos <spiros@inhabitedtype.com>"
+authors: [ "Spiros Eliopoulos <spiros@inhabitedtype.com>" ]
+license: "BSD-3-clause"
+homepage: "https://github.com/inhabitedtype/angstrom"
+bug-reports: "https://github.com/inhabitedtype/angstrom/issues"
+dev-repo: "git+https://github.com/inhabitedtype/angstrom.git"
+build: [
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+]
+depends: [
+  "ocaml" {>= "4.03.0"}
+  "dune" {>= "1.0"}
+  "angstrom"
+  "lwt"
+  "base-unix"
+]
+synopsis: "Lwt_unix support for Angstrom"

duniverse/angstrom/angstrom-unix.opam

@@ -0,0 +1,20 @@
+version: "0.15.0"
+opam-version: "2.0"
+maintainer: "Spiros Eliopoulos <spiros@inhabitedtype.com>"
+authors: [ "Spiros Eliopoulos <spiros@inhabitedtype.com>" ]
+license: "BSD-3-clause"
+homepage: "https://github.com/inhabitedtype/angstrom"
+bug-reports: "https://github.com/inhabitedtype/angstrom/issues"
+dev-repo: "git+https://github.com/inhabitedtype/angstrom.git"
+build: [
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+]
+depends: [
+  "ocaml" {>= "4.03.0"}
+  "dune" {>= "1.0"}
+  "angstrom"
+  "base-unix"
+]
+synopsis: "Unix support for Angstrom"

duniverse/angstrom/angstrom.opam

@@ -0,0 +1,31 @@
+version: "0.15.0"
+opam-version: "2.0"
+maintainer: "Spiros Eliopoulos <spiros@inhabitedtype.com>"
+authors: [ "Spiros Eliopoulos <spiros@inhabitedtype.com>" ]
+license: "BSD-3-clause"
+homepage: "https://github.com/inhabitedtype/angstrom"
+bug-reports: "https://github.com/inhabitedtype/angstrom/issues"
+dev-repo: "git+https://github.com/inhabitedtype/angstrom.git"
+build: [
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+]
+depends: [
+  "ocaml" {>= "4.04.0"}
+  "dune" {>= "1.8"}
+  "alcotest" {with-test & >= "0.8.1"}
+  "bigstringaf"
+  "result"
+  "ppx_let" {with-test & >= "0.14.0"}
+  "ocaml-syntax-shims" {build}
+]
+synopsis: "Parser combinators built for speed and memory-efficiency"
+description: """
+Angstrom is a parser-combinator library that makes it easy to write efficient,
+expressive, and reusable parsers suitable for high-performance applications. It
+exposes monadic and applicative interfaces for composition, and supports
+incremental input through buffered and unbuffered interfaces. Both interfaces
+give the user total control over the blocking behavior of their application,
+with the unbuffered interface enabling zero-copy IO. Parsers are backtracking by
+default and support unbounded lookahead."""