Skip to content

Modal kind jane syntax encoding #2350

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 12 commits into from
May 14, 2024
Merged

Modal kind jane syntax encoding #2350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a9d7ac2
add Structure_item_encodable
alanechang Feb 22, 2024
89b9cb1
mode list instead of mode_expr
alanechang Mar 11, 2024
85e10c0
formatting
alanechang Mar 11, 2024
92a28ae
remove failing test
alanechang Mar 11, 2024
4d26514
define Jkind.Const
alanechang Mar 11, 2024
d9b4ace
fix formatting and upstream compatibility
alanechang Mar 11, 2024
a443107
fix upstream
alanechang Mar 11, 2024
abd19ce
bootstrap
alanechang Mar 11, 2024
8f592c7
code formatting and test coverage
alanechang Mar 12, 2024
681930c
Some improvements during review
goldfirere May 13, 2024
aa952d7
Merge remote-tracking branch 'origin/main' into aec/modal-kind-jane-s…
liam923 May 13, 2024
c16b962
Update test for new test script language
liam923 May 13, 2024
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
5 changes: 2 additions & 3 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"*.mlp": "ocaml",
"smmintrin.h": "c",
"tmmintrin.h": "c",
"pmmintrin.h": "c",
"*.tbl": "c"
"pmmintrin.h": "c"
}
}
}
47 changes: 13 additions & 34 deletions ocaml/.depend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,27 +347,24 @@ parsing/ast_iterator.cmo : \
parsing/parsetree.cmi \
parsing/location.cmi \
parsing/jane_syntax.cmi \
parsing/jane_asttypes.cmi \
parsing/ast_iterator.cmi
parsing/ast_iterator.cmx : \
parsing/parsetree.cmi \
parsing/location.cmx \
parsing/jane_syntax.cmx \
parsing/jane_asttypes.cmx \
parsing/ast_iterator.cmi
parsing/ast_iterator.cmi : \
parsing/parsetree.cmi \
parsing/location.cmi \
parsing/jane_syntax.cmi \
parsing/jane_asttypes.cmi
parsing/jane_syntax.cmi
parsing/ast_mapper.cmo : \
parsing/parsetree.cmi \
utils/misc.cmi \
parsing/longident.cmi \
parsing/location.cmi \
utils/load_path.cmi \
typing/jkind.cmi \
parsing/jane_syntax.cmi \
parsing/jane_asttypes.cmi \
parsing/docstrings.cmi \
utils/config.cmi \
utils/clflags.cmi \
Expand All @@ -380,8 +377,8 @@ parsing/ast_mapper.cmx : \
parsing/longident.cmx \
parsing/location.cmx \
utils/load_path.cmx \
typing/jkind.cmx \
parsing/jane_syntax.cmx \
parsing/jane_asttypes.cmx \
parsing/docstrings.cmx \
utils/config.cmx \
utils/clflags.cmx \
Expand All @@ -391,8 +388,7 @@ parsing/ast_mapper.cmx : \
parsing/ast_mapper.cmi : \
parsing/parsetree.cmi \
parsing/location.cmi \
parsing/jane_syntax.cmi \
parsing/jane_asttypes.cmi
parsing/jane_syntax.cmi
parsing/asttypes.cmi : \
parsing/location.cmi
parsing/attr_helper.cmo : \
Expand Down Expand Up @@ -455,7 +451,6 @@ parsing/depend.cmo : \
parsing/longident.cmi \
parsing/location.cmi \
parsing/jane_syntax.cmi \
parsing/jane_asttypes.cmi \
utils/clflags.cmi \
parsing/builtin_attributes.cmi \
parsing/asttypes.cmi \
Expand All @@ -466,7 +461,6 @@ parsing/depend.cmx : \
parsing/longident.cmx \
parsing/location.cmx \
parsing/jane_syntax.cmx \
parsing/jane_asttypes.cmx \
utils/clflags.cmx \
parsing/builtin_attributes.cmx \
parsing/asttypes.cmi \
Expand All @@ -489,13 +483,10 @@ 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/location.cmi
parsing/jane_asttypes.cmi :
parsing/jane_syntax.cmo : \
parsing/printast.cmi \
parsing/parsetree.cmi \
Expand All @@ -505,7 +496,6 @@ parsing/jane_syntax.cmo : \
utils/language_extension_kernel.cmi \
utils/language_extension.cmi \
parsing/jane_syntax_parsing.cmi \
parsing/jane_asttypes.cmi \
parsing/asttypes.cmi \
parsing/ast_helper.cmi \
parsing/jane_syntax.cmi
Expand All @@ -518,15 +508,13 @@ parsing/jane_syntax.cmx : \
utils/language_extension_kernel.cmx \
utils/language_extension.cmx \
parsing/jane_syntax_parsing.cmx \
parsing/jane_asttypes.cmx \
parsing/asttypes.cmi \
parsing/ast_helper.cmx \
parsing/jane_syntax.cmi
parsing/jane_syntax.cmi : \
parsing/parsetree.cmi \
parsing/longident.cmi \
parsing/location.cmi \
parsing/jane_asttypes.cmi \
parsing/docstrings.cmi \
parsing/asttypes.cmi
parsing/jane_syntax_parsing.cmo : \
Expand Down Expand Up @@ -615,7 +603,6 @@ parsing/parser.cmo : \
utils/language_extension.cmi \
parsing/jane_syntax_parsing.cmi \
parsing/jane_syntax.cmi \
parsing/jane_asttypes.cmi \
parsing/docstrings.cmi \
utils/clflags.cmi \
parsing/camlinternalMenhirLib.cmi \
Expand All @@ -632,7 +619,6 @@ parsing/parser.cmx : \
utils/language_extension.cmx \
parsing/jane_syntax_parsing.cmx \
parsing/jane_syntax.cmx \
parsing/jane_asttypes.cmx \
parsing/docstrings.cmx \
utils/clflags.cmx \
parsing/camlinternalMenhirLib.cmx \
Expand All @@ -657,7 +643,6 @@ parsing/pprintast.cmo : \
parsing/location.cmi \
utils/language_extension.cmi \
parsing/jane_syntax.cmi \
parsing/jane_asttypes.cmi \
parsing/asttypes.cmi \
parsing/ast_helper.cmi \
parsing/pprintast.cmi
Expand All @@ -668,13 +653,13 @@ parsing/pprintast.cmx : \
parsing/location.cmx \
utils/language_extension.cmx \
parsing/jane_syntax.cmx \
parsing/jane_asttypes.cmx \
parsing/asttypes.cmi \
parsing/ast_helper.cmx \
parsing/pprintast.cmi
parsing/pprintast.cmi : \
parsing/parsetree.cmi \
parsing/longident.cmi
parsing/longident.cmi \
parsing/jane_syntax.cmi
parsing/printast.cmo : \
parsing/parsetree.cmi \
parsing/longident.cmi \
Expand Down Expand Up @@ -1118,6 +1103,7 @@ typing/includemod_errorprinter.cmx : \
typing/includemod_errorprinter.cmi : \
typing/includemod.cmi
typing/jkind.cmo : \
parsing/pprintast.cmi \
typing/types.cmi \
typing/primitive.cmi \
typing/path.cmi \
Expand All @@ -1128,11 +1114,11 @@ typing/jkind.cmo : \
utils/language_extension.cmi \
typing/jkind_types.cmi \
parsing/jane_syntax.cmi \
parsing/jane_asttypes.cmi \
typing/ident.cmi \
parsing/builtin_attributes.cmi \
typing/jkind.cmi
typing/jkind.cmx : \
parsing/pprintast.cmx \
typing/types.cmx \
typing/primitive.cmx \
typing/path.cmx \
Expand All @@ -1143,7 +1129,6 @@ typing/jkind.cmx : \
utils/language_extension.cmx \
typing/jkind_types.cmx \
parsing/jane_syntax.cmx \
parsing/jane_asttypes.cmx \
typing/ident.cmx \
parsing/builtin_attributes.cmx \
typing/jkind.cmi
Expand All @@ -1153,6 +1138,7 @@ typing/jkind.cmi : \
parsing/parsetree.cmi \
typing/mode.cmi \
parsing/location.cmi \
parsing/jane_syntax.cmi \
typing/jkind_types.cmi \
parsing/jane_asttypes.cmi \
typing/ident.cmi
Expand Down Expand Up @@ -1374,7 +1360,7 @@ typing/predef.cmo : \
typing/mode.cmi \
parsing/location.cmi \
typing/jkind.cmi \
parsing/jane_asttypes.cmi \
parsing/jane_syntax.cmi \
typing/ident.cmi \
typing/btype.cmi \
parsing/asttypes.cmi \
Expand All @@ -1387,7 +1373,7 @@ typing/predef.cmx : \
typing/mode.cmx \
parsing/location.cmx \
typing/jkind.cmx \
parsing/jane_asttypes.cmx \
parsing/jane_syntax.cmx \
typing/ident.cmx \
typing/btype.cmx \
parsing/asttypes.cmi \
Expand Down Expand Up @@ -1509,7 +1495,6 @@ typing/printtyped.cmo : \
parsing/longident.cmi \
parsing/location.cmi \
typing/jkind.cmi \
parsing/jane_syntax.cmi \
typing/ident.cmi \
utils/clflags.cmi \
parsing/asttypes.cmi \
Expand All @@ -1526,7 +1511,6 @@ typing/printtyped.cmx : \
parsing/longident.cmx \
parsing/location.cmx \
typing/jkind.cmx \
parsing/jane_syntax.cmx \
typing/ident.cmx \
utils/clflags.cmx \
parsing/asttypes.cmi \
Expand Down Expand Up @@ -2049,7 +2033,6 @@ typing/typedtree.cmo : \
parsing/location.cmi \
typing/jkind.cmi \
parsing/jane_syntax.cmi \
parsing/jane_asttypes.cmi \
typing/ident.cmi \
typing/env.cmi \
parsing/builtin_attributes.cmi \
Expand All @@ -2068,7 +2051,6 @@ typing/typedtree.cmx : \
parsing/location.cmx \
typing/jkind.cmx \
parsing/jane_syntax.cmx \
parsing/jane_asttypes.cmx \
typing/ident.cmx \
typing/env.cmx \
parsing/builtin_attributes.cmx \
Expand All @@ -2087,7 +2069,6 @@ typing/typedtree.cmi : \
parsing/location.cmi \
typing/jkind.cmi \
parsing/jane_syntax.cmi \
parsing/jane_asttypes.cmi \
typing/ident.cmi \
typing/env.cmi \
parsing/builtin_attributes.cmi \
Expand Down Expand Up @@ -2317,7 +2298,6 @@ typing/typetexp.cmo : \
utils/language_extension.cmi \
typing/jkind.cmi \
parsing/jane_syntax.cmi \
parsing/jane_asttypes.cmi \
typing/errortrace.cmi \
typing/env.cmi \
typing/ctype.cmi \
Expand All @@ -2343,7 +2323,6 @@ typing/typetexp.cmx : \
utils/language_extension.cmx \
typing/jkind.cmx \
parsing/jane_syntax.cmx \
parsing/jane_asttypes.cmx \
typing/errortrace.cmx \
typing/env.cmx \
typing/ctype.cmx \
Expand All @@ -2362,7 +2341,7 @@ typing/typetexp.cmi : \
parsing/location.cmi \
utils/language_extension.cmi \
typing/jkind.cmi \
parsing/jane_asttypes.cmi \
parsing/jane_syntax.cmi \
typing/errortrace.cmi \
typing/env.cmi \
parsing/asttypes.cmi
Expand Down
Loading
Loading