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

Show file tree
Hide file tree
Changes from all commits
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
9 changes: 5 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,13 @@ over the diff to make sure the difference are relevant. The `ast_...`
files require some adjustments which should pop up when you do this
diff. Port the old adjustments to the new file as required.

Add migration functions:
- Manually compile the asts (`ocamlc -c src/ast_{NEW,OLD}.ml -I +compiler-libs -I _build/default/src/.migrate_parsetree.objs/byte/ -open Migrate_parsetree__`)
Add migration functions. In the commands below, set $OLD and $NEW to the
appropriate version numbers, e.g. 408 and 409:
- Manually compile the asts (`ocamlc -c src/ast_{$NEW,$OLD}.ml -I +compiler-libs -I _build/default/src/.migrate_parsetree.objs/byte/`)
- Using `tools/gencopy.exe` (`dune build tools/gencopy.exe`), generate copy code to and from previous version (assuming it is 408):
```
_build/default/tools/gencopy.exe -I . -I src/ -I +compiler-libs -map Ast_409:Ast_408 Ast_409.Parsetree.{expression,expr,pattern,pat,core_type,typ,toplevel_phrase} Ast_409.Outcometree.{out_phrase,out_type_extension} > src/migrate_parsetree_409_408_migrate.ml
_build/default/tools/gencopy.exe -I . -I src/ -I +compiler-libs -map Ast_408:Ast_409 Ast_408.Parsetree.{expression,expr,pattern,pat,core_type,typ,toplevel_phrase} Ast_408.Outcometree.{out_phrase,out_type_extension} > src/migrate_parsetree_408_409_migrate.ml
_build/default/tools/gencopy.exe -I . -I src/ -I +compiler-libs -map Ast_$NEW:Ast_$OLD Ast_$NEW.Parsetree.{expression,pattern,core_type,toplevel_phrase} > src/migrate_${NEW}_${OLD}.ml
_build/default/tools/gencopy.exe -I . -I src/ -I +compiler-libs -map Ast_$OLD:Ast_$NEW Ast_$OLD.Parsetree.{expression,pattern,core_type,toplevel_phrase} > src/migrate_${OLD}_${NEW}.ml
```
- Fix the generated code by implementing new cases

Expand Down
2 changes: 1 addition & 1 deletion ocaml-migrate-parsetree.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ build: [
]
depends: [
"dune" {>= "1.11"}
"ocaml" {>= "4.02.3" & < "4.12"}
"ocaml" {>= "4.02.3" & < "4.13"}
]
synopsis: "Convert OCaml parsetrees between different versions"
description: """
Expand Down
Loading