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.

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

Support 4.12 #107

Merged
merged 14 commits into from
Oct 21, 2020
Merged

Support 4.12 #107

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
13d9077
allow 4.12 compiler
ceastlund Sep 23, 2020
2006329
first two steps in adding a new version
ceastlund Sep 23, 2020
d37c144
cinaps promotion for new parsetree
ceastlund Sep 23, 2020
55e58f8
add injectivity type
ceastlund Sep 23, 2020
6c6dde5
copy magic numbers
ceastlund Sep 23, 2020
2f72b9f
update readme
ceastlund Sep 23, 2020
58a1c45
generate new conversions
ceastlund Sep 23, 2020
e17c35f
updated conversion functions
ceastlund Sep 23, 2020
058ff45
restore compatibility with older compiler versions
ceastlund Oct 19, 2020
a238ef2
simplify some trivial identity transformations
ceastlund Oct 19, 2020
b45c85d
bump magic numbers
ceastlund Oct 19, 2020
afb05bc
identity functions in the opposite direction
ceastlund Oct 20, 2020
543959c
remove unneeded copy_position helpers
ceastlund Oct 20, 2020
0c16173
update opam constraint
ceastlund Oct 20, 2020
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
Prev Previous commit
Next Next commit
add injectivity type 
Signed-off-by: Carl Eastlund <[email protected]>
  • Loading branch information
@ceastlund
ceastlund committed Oct 19, 2020
commit 55e58f8df8736ef3649ef81cb8a884b72aa3dece
13 changes: 8 additions & 5 deletions src/ast_412.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,14 @@ module Asttypes = struct
loc : Location.t;
}


type variance (*IF_CURRENT = Asttypes.variance *) =
| Covariant
| Contravariant
| Invariant
| NoVariance

type injectivity (*IF_CURRENT = Asttypes.injectivity *) =
| Injective
| NoInjectivity
end

module Parsetree = struct
Expand Down Expand Up @@ -471,7 +474,7 @@ module Parsetree = struct
and type_declaration (*IF_CURRENT = Parsetree.type_declaration *) =
{
ptype_name: string loc;
ptype_params: (core_type * variance) list;
ptype_params: (core_type * (variance * injectivity)) list;
(* ('a1,...'an) t; None represents _*)
ptype_cstrs: (core_type * core_type * Location.t) list;
(* ... constraint T1=T1' ... constraint Tn=Tn' *)
Expand Down Expand Up @@ -539,7 +542,7 @@ module Parsetree = struct
and type_extension (*IF_CURRENT = Parsetree.type_extension *) =
{
ptyext_path: Longident.t loc;
ptyext_params: (core_type * variance) list;
ptyext_params: (core_type * (variance * injectivity)) list;
ptyext_constructors: extension_constructor list;
ptyext_private: private_flag;
ptyext_loc: Location.t;
Expand Down Expand Up @@ -640,7 +643,7 @@ module Parsetree = struct
and 'a class_infos (*IF_CURRENT = 'a Parsetree.class_infos *) =
{
pci_virt: virtual_flag;
pci_params: (core_type * variance) list;
pci_params: (core_type * (variance * injectivity)) list;
pci_name: string loc;
pci_expr: 'a;
pci_loc: Location.t;
Expand Down