Skip to content
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.

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

irmin.type: improve pp_ty #997

Merged
merged 11 commits into from
Apr 28, 2020
Merged

irmin.type: improve pp_ty #997

merged 11 commits into from
Apr 28, 2020

Conversation

craigfe
Copy link
Member

@craigfe craigfe commented Apr 17, 2020

Resolves #958.

This changes the pretty-printer for Irmin types to more closely match OCaml types (e.g. (unit * int) option rather than Option (Pair (Prim Unit, Prim Int))). It adds functionality for pretty-printing the components of algebraic types: record types are pretty-printed like OCaml object types and variants are pretty-printed similarly to OCaml polymorphic variants.

The tricky case here is recursive types, which were previously broken (would cause stack overflow when pretty-printed). Handling this properly requires preserving the unroll function passed to the mu combinator for later use. The type can then be pretty-printed by unrolling once with a type alias:

type my_recursive_record = { head : int; tail : my_recursive_record option } [@@deriving irmin]

(* gets pretty-printed as: *)
(< head : int; tail : my_recursive_record option > as my_recursive_record)

For recursive or mutually recursive types that are not algebraic, there is no sensible name for the type alias, so we pick them in some deterministic order.

This change also fixes an existing 'bug' in which the mu and mu2 fixpoints were unfolded once more than necessary (by returning the unfolded form). This was observable when pretty-printing the type.

craigfe added 10 commits April 17, 2020 10:04
This change also fixes an existing 'bug' in which the fixpoints were
unfolded once more than necessary (by returning the unfolded form). This
was observable when pretty-printing the type.
This representation is not exported to users, but is useful for e.g.
pretty-printing of recursive types.
Previously, pretty-printing a non-trivial use of the `mu` combinator
would result in stack overflow.
@samoht
Copy link
Member

samoht commented Apr 17, 2020

Nice!

Copy link
Contributor

@icristescu icristescu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is neat! sorry for taking so long to have a look at it.
I'm wondering is there is a reason to have ([ Empty | Node of ((tree * int * tree) as 'a) ] as tree) instead of ([ Empty | Node of node] as tree)?

Copy link
Contributor

@pascutto pascutto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, thanks.
Can you add a changelog entry for this?

@craigfe
Copy link
Member Author

craigfe commented Apr 27, 2020

This is neat! sorry for taking so long to have a look at it.
I'm wondering is there is a reason to have ([ Empty | Node of ((tree * int * tree) as 'a) ] as tree) instead of ([ Empty | Node of node] as tree)?

Your suggestion is certainly cleaner. I tried it, but decided against it for two reasons:

  • in general it's not easy to come up with nice semantic names like node for the recursive type. I tried tracking "name context" such as field/case names in recursive calls, which would allow inserting node here. Sadly it doesn't work for all cases (i.e. for non-algebraic data-types), so I picked the simpler / more consistent implementation.

  • in other cases the pretty-printer displays the entire type structure it knows about. Printing node here rather than (tree * int * tree) would be inconsistent. Not particularly a problem, but at some point we might want to be able to deserialise type representations too.

The as 'a turns out not to be necessary here, which we could detect (but I'm not sure it's worthwhile).

@craigfe
Copy link
Member Author

craigfe commented Apr 27, 2020

Can you add a changelog entry for this?

Done.

@@ -100,7 +103,7 @@ and 'a custom = {

and ('a, 'b) map = { x : 'a t; f : 'a -> 'b; g : 'b -> 'a; mwit : 'b Witness.t }

and 'a self = { mutable self : 'a t }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does embedding self_unroll into every recursive variant or record add any noticeable overhead? If I understand correctly, this new field is required to avoid stack overflows when pretty-printing, but does it also help outside of pretty-printing?

Copy link
Member Author

@craigfe craigfe Apr 27, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does embedding self_unroll into every recursive variant or record add any noticeable overhead?

I haven't measured, but I expect not. I imagine that the number of self values in most programs would be negligible.

If I understand correctly, this new field is required to avoid stack overflows when pretty-printing, but does it also help outside of pretty-printing?

It's currently just for pretty-printing.

If we ever have other cases where we recurse over the structure of representations without a corresponding value – such as if we ever support ∀ a. a Type.t -> a Type.t Type.tself_unroll will be necessary to avoid infinite recursion.

@pascutto pascutto merged commit f4a28b1 into mirage:master Apr 28, 2020
craigfe added a commit to craigfe/opam-repository that referenced this pull request Jun 26, 2020
…min-mirage-graphql, irmin-http, irmin-git, irmin-mem, irmin-mirage, irmin-unix, irmin-pack, irmin-graphql and irmin-mirage-git (2.2.0)

CHANGES:

#### Added

- **irmin**:
  - Added `Irmin.Type.empty` to represent an uninhabited type. (mirage/irmin#961, @craigfe)
  - Added `Store.Tree.concrete_t`. (mirage/irmin#1003, @craigfe)

- **ppx_irmin**
  - Added support for the `@nobuiltin` attribute, which can be used when
    shadowing primitive types such as `unit`. See `README_PPX` for details.
    (mirage/irmin#993, @craigfe)

  - Added support for a `lib` argument, which can be used to supply primitive
    type representations from modules other than `Irmin.Type`. (mirage/irmin#994, @craigfe)

#### Changed

- **irmin**:
  - Require OCaml 4.07 (mirage/irmin#961, @craigfe)
  - Add sanity checks when creating `Irmin.Type` records, variants and enums
    (mirage/irmin#956 and mirage/irmin#966, @liautaud):
     - `Irmin.Type.{sealr,sealv,enum}` will now raise `Invalid_argument` if two
       components have the same name;
     - `Irmin.Type.{field,case0,case1}` will now raise `Invalid_argument` if
       the component name is not a valid UTF-8 string.
  - Changed the JSON encoding of options and unit to avoid ambiguous cases
    (mirage/irmin#967, @liautaud):
    - `()` is now encoded as `{}`;
    - `None` is now encoded as `null`;
    - `Some x` is now encoded as `{"some": x}`;
    - Fields of records which have value `None` are still omitted;
    - Fields of records which have value `Some x` are still unboxed into `x`.

  - Changed pretty-printing of Irmin types to more closely resemble OCaml types.
    e.g. `pair int string` prints as `int * string`. (mirage/irmin#997, @craigfe)

  - The type `Irmin.S.tree` is now abstract. The previous form can be coerced
    to/from the abstract representation with the new functions
    `Irmin.S.Tree.{v,destruct}` respectively. (mirage/irmin#990, @craigfe)

- **irmin-mem**
  - Stores created with `KV` now expose their unit metadata type. (mirage/irmin#995,
    @craigfe)

#### Fixed

- **irmin-graphql**
  - Fixed an issue with keys inside `get_{contents,tree}` fields having
    incorrect ordering (mirage/irmin#989, @craigfe)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

irmin.type: pp_ty should show components of algebraic types
5 participants