Skip to content

Move jkind name detection out of parser #1906

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

Merged
merged 14 commits into from
Nov 7, 2023
Merged

Move jkind name detection out of parser #1906

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
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
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
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
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
51 changes: 26 additions & 25 deletions ocaml/.depend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ parsing/ast_iterator.cmx : \
parsing/parsetree.cmi \
parsing/location.cmx \
parsing/jane_syntax.cmx \
parsing/jane_asttypes.cmi \
parsing/jane_asttypes.cmx \
parsing/ast_iterator.cmi
parsing/ast_iterator.cmi : \
parsing/parsetree.cmi \
Expand Down Expand Up @@ -357,7 +357,7 @@ parsing/ast_mapper.cmx : \
parsing/location.cmx \
utils/load_path.cmx \
parsing/jane_syntax.cmx \
parsing/jane_asttypes.cmi \
parsing/jane_asttypes.cmx \
parsing/docstrings.cmx \
utils/config.cmx \
utils/clflags.cmx \
Expand Down Expand Up @@ -394,7 +394,6 @@ parsing/builtin_attributes.cmo : \
parsing/longident.cmi \
parsing/location.cmi \
utils/language_extension.cmi \
parsing/jane_asttypes.cmi \
utils/config.cmi \
utils/clflags.cmi \
parsing/asttypes.cmi \
Expand All @@ -408,7 +407,6 @@ parsing/builtin_attributes.cmx : \
parsing/longident.cmx \
parsing/location.cmx \
utils/language_extension.cmx \
parsing/jane_asttypes.cmi \
utils/config.cmx \
utils/clflags.cmx \
parsing/asttypes.cmi \
Expand All @@ -418,8 +416,7 @@ parsing/builtin_attributes.cmx : \
parsing/builtin_attributes.cmi : \
parsing/parsetree.cmi \
utils/misc.cmi \
parsing/location.cmi \
parsing/jane_asttypes.cmi
parsing/location.cmi
parsing/camlinternalMenhirLib.cmo : \
parsing/camlinternalMenhirLib.cmi
parsing/camlinternalMenhirLib.cmx : \
Expand All @@ -442,7 +439,7 @@ parsing/depend.cmx : \
parsing/longident.cmx \
parsing/location.cmx \
parsing/jane_syntax.cmx \
parsing/jane_asttypes.cmi \
parsing/jane_asttypes.cmx \
utils/clflags.cmx \
parsing/builtin_attributes.cmx \
parsing/asttypes.cmi \
Expand All @@ -464,8 +461,14 @@ parsing/docstrings.cmx : \
parsing/docstrings.cmi : \
parsing/parsetree.cmi \
parsing/location.cmi
parsing/jane_asttypes.cmo : \
parsing/location.cmi \
parsing/jane_asttypes.cmi
parsing/jane_asttypes.cmx : \
parsing/location.cmx \
parsing/jane_asttypes.cmi
parsing/jane_asttypes.cmi : \
parsing/asttypes.cmi
parsing/location.cmi
parsing/jane_syntax.cmo : \
parsing/printast.cmi \
parsing/parsetree.cmi \
Expand All @@ -488,7 +491,7 @@ parsing/jane_syntax.cmx : \
utils/language_extension_kernel.cmx \
utils/language_extension.cmx \
parsing/jane_syntax_parsing.cmx \
parsing/jane_asttypes.cmi \
parsing/jane_asttypes.cmx \
parsing/asttypes.cmi \
parsing/ast_helper.cmx \
parsing/jane_syntax.cmi
Expand Down Expand Up @@ -598,7 +601,7 @@ parsing/parser.cmx : \
utils/language_extension.cmx \
parsing/jane_syntax_parsing.cmx \
parsing/jane_syntax.cmx \
parsing/jane_asttypes.cmi \
parsing/jane_asttypes.cmx \
parsing/docstrings.cmx \
utils/clflags.cmx \
parsing/camlinternalMenhirLib.cmx \
Expand Down Expand Up @@ -1080,6 +1083,7 @@ typing/jkind.cmo : \
utils/misc.cmi \
parsing/location.cmi \
utils/language_extension.cmi \
parsing/jane_syntax.cmi \
parsing/jane_asttypes.cmi \
typing/ident.cmi \
parsing/builtin_attributes.cmi \
Expand All @@ -1089,7 +1093,8 @@ typing/jkind.cmx : \
utils/misc.cmx \
parsing/location.cmx \
utils/language_extension.cmx \
parsing/jane_asttypes.cmi \
parsing/jane_syntax.cmx \
parsing/jane_asttypes.cmx \
typing/ident.cmx \
parsing/builtin_attributes.cmx \
typing/jkind.cmi
Expand All @@ -1098,7 +1103,8 @@ typing/jkind.cmi : \
parsing/parsetree.cmi \
parsing/location.cmi \
parsing/jane_asttypes.cmi \
typing/ident.cmi
typing/ident.cmi \
parsing/builtin_attributes.cmi
typing/mode.cmo : \
utils/misc.cmi \
typing/mode.cmi
Expand Down Expand Up @@ -1142,20 +1148,17 @@ typing/oprint.cmo : \
parsing/printast.cmi \
typing/outcometree.cmi \
utils/language_extension.cmi \
typing/jkind.cmi \
parsing/asttypes.cmi \
typing/oprint.cmi
typing/oprint.cmx : \
parsing/printast.cmx \
typing/outcometree.cmi \
utils/language_extension.cmx \
typing/jkind.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 @@ -1543,7 +1546,7 @@ typing/tast_iterator.cmo : \
typing/typedtree.cmi \
parsing/parsetree.cmi \
parsing/location.cmi \
parsing/jane_asttypes.cmi \
typing/jkind.cmi \
typing/env.cmi \
parsing/asttypes.cmi \
parsing/ast_iterator.cmi \
Expand All @@ -1552,22 +1555,22 @@ typing/tast_iterator.cmx : \
typing/typedtree.cmx \
parsing/parsetree.cmi \
parsing/location.cmx \
parsing/jane_asttypes.cmi \
typing/jkind.cmx \
typing/env.cmx \
parsing/asttypes.cmi \
parsing/ast_iterator.cmx \
typing/tast_iterator.cmi
typing/tast_iterator.cmi : \
typing/typedtree.cmi \
parsing/location.cmi \
parsing/jane_asttypes.cmi \
typing/jkind.cmi \
typing/env.cmi \
parsing/asttypes.cmi
typing/tast_mapper.cmo : \
typing/typedtree.cmi \
parsing/parsetree.cmi \
parsing/location.cmi \
parsing/jane_asttypes.cmi \
typing/jkind.cmi \
typing/env.cmi \
parsing/asttypes.cmi \
parsing/ast_mapper.cmi \
Expand All @@ -1576,15 +1579,15 @@ typing/tast_mapper.cmx : \
typing/typedtree.cmx \
parsing/parsetree.cmi \
parsing/location.cmx \
parsing/jane_asttypes.cmi \
typing/jkind.cmx \
typing/env.cmx \
parsing/asttypes.cmi \
parsing/ast_mapper.cmx \
typing/tast_mapper.cmi
typing/tast_mapper.cmi : \
typing/typedtree.cmi \
parsing/location.cmi \
parsing/jane_asttypes.cmi \
typing/jkind.cmi \
typing/env.cmi \
parsing/asttypes.cmi
typing/typeclass.cmo : \
Expand Down Expand Up @@ -1842,6 +1845,7 @@ typing/typedecl.cmi : \
typing/ident.cmi \
typing/errortrace.cmi \
typing/env.cmi \
parsing/builtin_attributes.cmi \
parsing/asttypes.cmi
typing/typedecl_properties.cmo : \
typing/types.cmi \
Expand Down Expand Up @@ -1929,7 +1933,6 @@ typing/typedtree.cmo : \
parsing/longident.cmi \
parsing/location.cmi \
typing/jkind.cmi \
parsing/jane_asttypes.cmi \
typing/ident.cmi \
typing/env.cmi \
parsing/asttypes.cmi \
Expand All @@ -1945,7 +1948,6 @@ typing/typedtree.cmx : \
parsing/longident.cmx \
parsing/location.cmx \
typing/jkind.cmx \
parsing/jane_asttypes.cmi \
typing/ident.cmx \
typing/env.cmx \
parsing/asttypes.cmi \
Expand All @@ -1961,7 +1963,6 @@ typing/typedtree.cmi : \
parsing/longident.cmi \
parsing/location.cmi \
typing/jkind.cmi \
parsing/jane_asttypes.cmi \
typing/ident.cmi \
typing/env.cmi \
parsing/asttypes.cmi
Expand Down Expand Up @@ -2192,7 +2193,7 @@ typing/typetexp.cmx : \
utils/language_extension.cmx \
typing/jkind.cmx \
parsing/jane_syntax.cmx \
parsing/jane_asttypes.cmi \
parsing/jane_asttypes.cmx \
typing/errortrace.cmx \
typing/env.cmx \
typing/ctype.cmx \
Expand Down
Loading