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

Reroute legacy immediate support for jkinds #1907

Merged
merged 46 commits into from
Nov 8, 2023
Merged

Reroute legacy immediate support for jkinds #1907

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
65c6399
Change parsetree layouts to strings
ncik-roberts Sep 29, 2023
5f1e6c3
make depend
ncik-roberts Oct 3, 2023
e454d29
Striate jkind annotations from attributes
ncik-roberts Oct 3, 2023
993cb2f
Restore check and add test that `type t : unboxed` isn't allowed
ncik-roberts Oct 3, 2023
42113b1
Fix build
ncik-roberts Oct 5, 2023
aaac3aa
Main changes
ncik-roberts Oct 4, 2023
0bf4f76
Restore a similar behavior to [legacy_immediate]
ncik-roberts Oct 4, 2023
45330e6
Change tests to not use `[@@void]`, `[@@value]`, etc.
ncik-roberts Oct 4, 2023
80fa08f
Change tests to use new error message
ncik-roberts Oct 4, 2023
a8d5366
Disallow multiple sources of jkind
ncik-roberts Oct 4, 2023
99e48fd
Rename `legacy_immediate` to `is_type_decl`
ncik-roberts Oct 4, 2023
e069ab0
`make bootstrap`
ncik-roberts Oct 5, 2023
8bd58ec
Minor changes suggested in review
ncik-roberts Nov 2, 2023
257142d
More minor changes suggested in review
ncik-roberts Nov 2, 2023
27a6a97
More minor changes suggested in review
ncik-roberts Nov 2, 2023
1a6554e
Update ocaml/typing/jkind.ml
ncik-roberts Nov 2, 2023
8d878af
Revert change that I can't explain
ncik-roberts Nov 2, 2023
b0c3e92
Merge remote-tracking branch 'origin/nroberts/layouts-are-strings-in-…
ncik-roberts Nov 2, 2023
b70b61f
Store both typed/untyped jkind annotation in typedtree, and delete `c…
ncik-roberts Nov 2, 2023
9f9809c
Remove misleading comment
ncik-roberts Nov 2, 2023
dac6448
Add CRs for doubling-down on backward-incompatible change
ncik-roberts Nov 2, 2023
48ff923
Update ocaml/typing/types.mli
ncik-roberts Nov 2, 2023
18811e1
Make predefs less confusing if printed
ncik-roberts Nov 2, 2023
88cb0bf
Merge branch 'nroberts/layouts-are-strings-in-parsetree' into nrobert…
ncik-roberts Nov 2, 2023
6cb081e
Resolve merge conflicts and fix build
ncik-roberts Nov 2, 2023
5febf29
Remove obviated module
ncik-roberts Nov 2, 2023
2cf3307
Add missing case to comment
ncik-roberts Nov 2, 2023
9513267
Drop the needless is_type_decl param
ncik-roberts Nov 2, 2023
9ccf2a8
Split Location argument into its components
ncik-roberts Nov 3, 2023
2b55486
Remove no-longer-necessary builtin attrs
ncik-roberts Nov 3, 2023
ff20c84
make depend
ncik-roberts Nov 3, 2023
f80a089
Layout annotations in untypeast
ncik-roberts Nov 3, 2023
ad661f0
Merge remote-tracking branch 'origin/main' into nroberts/layouts-are-…
ncik-roberts Nov 3, 2023
64711b5
Resolve merge conflicts and update whitespace in tests
ncik-roberts Nov 3, 2023
6966628
Merge branch 'nroberts/layouts-are-strings-in-parsetree' into nrobert…
ncik-roberts Nov 3, 2023
783b618
Fix merge conflicts
ncik-roberts Nov 6, 2023
42c9c53
make {depend,boot,parser}
ncik-roberts Nov 7, 2023
9dc1246
Merge branch 'main' into nroberts/jane-syntax-for-layouts
ncik-roberts Nov 7, 2023
f1d53a8
Resolve merge conflicts due to squash+merge
ncik-roberts Nov 8, 2023
4e928f7
Fix tests broken by error message change
ncik-roberts Nov 8, 2023
d28f3c1
Resolve merge conflicts in typing-layouts-float64
ncik-roberts Nov 8, 2023
0a6697c
make fmt
ncik-roberts Nov 8, 2023
7501070
Remove test unintentionally added back in the merge
ncik-roberts Nov 8, 2023
5b2bd0c
Collapse *_beta versions of layouts tests with their stable versions …
ncik-roberts Nov 8, 2023
5b4f845
git rm files that I intended to remove in 5b2bd0c2
ncik-roberts Nov 8, 2023
d160a95
Suggestion from review
ncik-roberts Nov 8, 2023
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
Resolve merge conflicts and update whitespace in tests
  • Loading branch information
@ncik-roberts
ncik-roberts committed Nov 3, 2023
commit 64711b5dd0ac77871a1d306a6498950522adae55
48 changes: 7 additions & 41 deletions ocaml/.depend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,15 +463,12 @@ parsing/docstrings.cmi : \
parsing/location.cmi
parsing/jane_asttypes.cmo : \
parsing/location.cmi \
parsing/asttypes.cmi \
parsing/jane_asttypes.cmi
parsing/jane_asttypes.cmx : \
parsing/location.cmx \
parsing/asttypes.cmi \
parsing/jane_asttypes.cmi
parsing/jane_asttypes.cmi : \
parsing/location.cmi \
parsing/asttypes.cmi
parsing/location.cmi
parsing/jane_syntax.cmo : \
parsing/printast.cmi \
parsing/parsetree.cmi \
Expand Down Expand Up @@ -1151,20 +1148,17 @@ typing/oprint.cmo : \
parsing/printast.cmi \
typing/outcometree.cmi \
utils/language_extension.cmi \
parsing/jane_asttypes.cmi \
parsing/asttypes.cmi \
typing/oprint.cmi
typing/oprint.cmx : \
parsing/printast.cmx \
typing/outcometree.cmi \
utils/language_extension.cmx \
parsing/jane_asttypes.cmx \
parsing/asttypes.cmi \
typing/oprint.cmi
typing/oprint.cmi : \
typing/outcometree.cmi
typing/outcometree.cmi : \
parsing/jane_asttypes.cmi \
parsing/asttypes.cmi
typing/parmatch.cmo : \
utils/warnings.cmi \
Expand Down Expand Up @@ -1362,7 +1356,6 @@ typing/printtyp.cmo : \
parsing/longident.cmi \
parsing/location.cmi \
typing/jkind.cmi \
parsing/jane_asttypes.cmi \
typing/ident.cmi \
typing/errortrace.cmi \
typing/env.cmi \
Expand All @@ -1389,7 +1382,6 @@ typing/printtyp.cmx : \
parsing/longident.cmx \
parsing/location.cmx \
typing/jkind.cmx \
parsing/jane_asttypes.cmx \
typing/ident.cmx \
typing/errortrace.cmx \
typing/env.cmx \
Expand Down Expand Up @@ -1552,74 +1544,50 @@ typing/subst.cmi : \
typing/ident.cmi
typing/tast_iterator.cmo : \
typing/typedtree.cmi \
<<<<<<< HEAD
typing/jkind.cmi \
=======
parsing/parsetree.cmi \
parsing/location.cmi \
parsing/jane_asttypes.cmi \
>>>>>>> origin/main
typing/jkind.cmi \
typing/env.cmi \
parsing/asttypes.cmi \
parsing/ast_iterator.cmi \
typing/tast_iterator.cmi
typing/tast_iterator.cmx : \
typing/typedtree.cmx \
<<<<<<< HEAD
typing/jkind.cmx \
=======
parsing/parsetree.cmi \
parsing/location.cmx \
parsing/jane_asttypes.cmi \
>>>>>>> origin/main
typing/jkind.cmx \
typing/env.cmx \
parsing/asttypes.cmi \
parsing/ast_iterator.cmx \
typing/tast_iterator.cmi
typing/tast_iterator.cmi : \
typing/typedtree.cmi \
<<<<<<< HEAD
typing/jkind.cmi \
=======
parsing/location.cmi \
parsing/jane_asttypes.cmi \
>>>>>>> origin/main
typing/jkind.cmi \
typing/env.cmi \
parsing/asttypes.cmi
typing/tast_mapper.cmo : \
typing/typedtree.cmi \
<<<<<<< HEAD
typing/jkind.cmi \
=======
parsing/parsetree.cmi \
parsing/location.cmi \
parsing/jane_asttypes.cmi \
>>>>>>> origin/main
typing/jkind.cmi \
typing/env.cmi \
parsing/asttypes.cmi \
parsing/ast_mapper.cmi \
typing/tast_mapper.cmi
typing/tast_mapper.cmx : \
typing/typedtree.cmx \
<<<<<<< HEAD
typing/jkind.cmx \
=======
parsing/parsetree.cmi \
parsing/location.cmx \
parsing/jane_asttypes.cmi \
>>>>>>> origin/main
typing/jkind.cmx \
typing/env.cmx \
parsing/asttypes.cmi \
parsing/ast_mapper.cmx \
typing/tast_mapper.cmi
typing/tast_mapper.cmi : \
typing/typedtree.cmi \
<<<<<<< HEAD
typing/jkind.cmi \
=======
parsing/location.cmi \
parsing/jane_asttypes.cmi \
>>>>>>> origin/main
typing/jkind.cmi \
typing/env.cmi \
parsing/asttypes.cmi
typing/typeclass.cmo : \
Expand Down Expand Up @@ -2282,7 +2250,6 @@ typing/untypeast.cmo : \
utils/misc.cmi \
parsing/longident.cmi \
parsing/location.cmi \
typing/jkind.cmi \
parsing/jane_syntax.cmi \
typing/ident.cmi \
typing/env.cmi \
Expand All @@ -2297,7 +2264,6 @@ typing/untypeast.cmx : \
utils/misc.cmx \
parsing/longident.cmx \
parsing/location.cmx \
typing/jkind.cmx \
parsing/jane_syntax.cmx \
typing/ident.cmx \
typing/env.cmx \
Expand Down
Loading
Loading