Skip to content

Commit 7f9e830

Browse files
flambda-backend: Move jkind name detection out of parser (#1906)
* Change parsetree layouts to strings * make depend * Striate jkind annotations from attributes * Restore check and add test that `type t : unboxed` isn't allowed * Fix build * Minor changes suggested in review * More minor changes suggested in review * More minor changes suggested in review * Update ocaml/typing/jkind.ml Co-authored-by: Richard Eisenberg <[email protected]> * Revert change that I can't explain * Store both typed/untyped jkind annotation in typedtree, and delete `const_to_user_written_annotation` * Resolve merge conflicts and update whitespace in tests --------- Co-authored-by: Richard Eisenberg <[email protected]>
1 parent 1010bd1 commit 7f9e830

38 files changed

+9450
-8928
lines changed

.depend

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ parsing/ast_iterator.cmx : \
329329
parsing/parsetree.cmi \
330330
parsing/location.cmx \
331331
parsing/jane_syntax.cmx \
332-
parsing/jane_asttypes.cmi \
332+
parsing/jane_asttypes.cmx \
333333
parsing/ast_iterator.cmi
334334
parsing/ast_iterator.cmi : \
335335
parsing/parsetree.cmi \
@@ -357,7 +357,7 @@ parsing/ast_mapper.cmx : \
357357
parsing/location.cmx \
358358
utils/load_path.cmx \
359359
parsing/jane_syntax.cmx \
360-
parsing/jane_asttypes.cmi \
360+
parsing/jane_asttypes.cmx \
361361
parsing/docstrings.cmx \
362362
utils/config.cmx \
363363
utils/clflags.cmx \
@@ -394,7 +394,6 @@ parsing/builtin_attributes.cmo : \
394394
parsing/longident.cmi \
395395
parsing/location.cmi \
396396
utils/language_extension.cmi \
397-
parsing/jane_asttypes.cmi \
398397
utils/config.cmi \
399398
utils/clflags.cmi \
400399
parsing/asttypes.cmi \
@@ -408,7 +407,6 @@ parsing/builtin_attributes.cmx : \
408407
parsing/longident.cmx \
409408
parsing/location.cmx \
410409
utils/language_extension.cmx \
411-
parsing/jane_asttypes.cmi \
412410
utils/config.cmx \
413411
utils/clflags.cmx \
414412
parsing/asttypes.cmi \
@@ -418,8 +416,7 @@ parsing/builtin_attributes.cmx : \
418416
parsing/builtin_attributes.cmi : \
419417
parsing/parsetree.cmi \
420418
utils/misc.cmi \
421-
parsing/location.cmi \
422-
parsing/jane_asttypes.cmi
419+
parsing/location.cmi
423420
parsing/camlinternalMenhirLib.cmo : \
424421
parsing/camlinternalMenhirLib.cmi
425422
parsing/camlinternalMenhirLib.cmx : \
@@ -442,7 +439,7 @@ parsing/depend.cmx : \
442439
parsing/longident.cmx \
443440
parsing/location.cmx \
444441
parsing/jane_syntax.cmx \
445-
parsing/jane_asttypes.cmi \
442+
parsing/jane_asttypes.cmx \
446443
utils/clflags.cmx \
447444
parsing/builtin_attributes.cmx \
448445
parsing/asttypes.cmi \
@@ -464,8 +461,14 @@ parsing/docstrings.cmx : \
464461
parsing/docstrings.cmi : \
465462
parsing/parsetree.cmi \
466463
parsing/location.cmi
464+
parsing/jane_asttypes.cmo : \
465+
parsing/location.cmi \
466+
parsing/jane_asttypes.cmi
467+
parsing/jane_asttypes.cmx : \
468+
parsing/location.cmx \
469+
parsing/jane_asttypes.cmi
467470
parsing/jane_asttypes.cmi : \
468-
parsing/asttypes.cmi
471+
parsing/location.cmi
469472
parsing/jane_syntax.cmo : \
470473
parsing/printast.cmi \
471474
parsing/parsetree.cmi \
@@ -488,7 +491,7 @@ parsing/jane_syntax.cmx : \
488491
utils/language_extension_kernel.cmx \
489492
utils/language_extension.cmx \
490493
parsing/jane_syntax_parsing.cmx \
491-
parsing/jane_asttypes.cmi \
494+
parsing/jane_asttypes.cmx \
492495
parsing/asttypes.cmi \
493496
parsing/ast_helper.cmx \
494497
parsing/jane_syntax.cmi
@@ -598,7 +601,7 @@ parsing/parser.cmx : \
598601
utils/language_extension.cmx \
599602
parsing/jane_syntax_parsing.cmx \
600603
parsing/jane_syntax.cmx \
601-
parsing/jane_asttypes.cmi \
604+
parsing/jane_asttypes.cmx \
602605
parsing/docstrings.cmx \
603606
utils/clflags.cmx \
604607
parsing/camlinternalMenhirLib.cmx \
@@ -1080,6 +1083,7 @@ typing/jkind.cmo : \
10801083
utils/misc.cmi \
10811084
parsing/location.cmi \
10821085
utils/language_extension.cmi \
1086+
parsing/jane_syntax.cmi \
10831087
parsing/jane_asttypes.cmi \
10841088
typing/ident.cmi \
10851089
parsing/builtin_attributes.cmi \
@@ -1089,7 +1093,8 @@ typing/jkind.cmx : \
10891093
utils/misc.cmx \
10901094
parsing/location.cmx \
10911095
utils/language_extension.cmx \
1092-
parsing/jane_asttypes.cmi \
1096+
parsing/jane_syntax.cmx \
1097+
parsing/jane_asttypes.cmx \
10931098
typing/ident.cmx \
10941099
parsing/builtin_attributes.cmx \
10951100
typing/jkind.cmi
@@ -1098,7 +1103,8 @@ typing/jkind.cmi : \
10981103
parsing/parsetree.cmi \
10991104
parsing/location.cmi \
11001105
parsing/jane_asttypes.cmi \
1101-
typing/ident.cmi
1106+
typing/ident.cmi \
1107+
parsing/builtin_attributes.cmi
11021108
typing/mode.cmo : \
11031109
utils/misc.cmi \
11041110
typing/mode.cmi
@@ -1142,20 +1148,17 @@ typing/oprint.cmo : \
11421148
parsing/printast.cmi \
11431149
typing/outcometree.cmi \
11441150
utils/language_extension.cmi \
1145-
typing/jkind.cmi \
11461151
parsing/asttypes.cmi \
11471152
typing/oprint.cmi
11481153
typing/oprint.cmx : \
11491154
parsing/printast.cmx \
11501155
typing/outcometree.cmi \
11511156
utils/language_extension.cmx \
1152-
typing/jkind.cmx \
11531157
parsing/asttypes.cmi \
11541158
typing/oprint.cmi
11551159
typing/oprint.cmi : \
11561160
typing/outcometree.cmi
11571161
typing/outcometree.cmi : \
1158-
parsing/jane_asttypes.cmi \
11591162
parsing/asttypes.cmi
11601163
typing/parmatch.cmo : \
11611164
utils/warnings.cmi \
@@ -1543,7 +1546,7 @@ typing/tast_iterator.cmo : \
15431546
typing/typedtree.cmi \
15441547
parsing/parsetree.cmi \
15451548
parsing/location.cmi \
1546-
parsing/jane_asttypes.cmi \
1549+
typing/jkind.cmi \
15471550
typing/env.cmi \
15481551
parsing/asttypes.cmi \
15491552
parsing/ast_iterator.cmi \
@@ -1552,22 +1555,22 @@ typing/tast_iterator.cmx : \
15521555
typing/typedtree.cmx \
15531556
parsing/parsetree.cmi \
15541557
parsing/location.cmx \
1555-
parsing/jane_asttypes.cmi \
1558+
typing/jkind.cmx \
15561559
typing/env.cmx \
15571560
parsing/asttypes.cmi \
15581561
parsing/ast_iterator.cmx \
15591562
typing/tast_iterator.cmi
15601563
typing/tast_iterator.cmi : \
15611564
typing/typedtree.cmi \
15621565
parsing/location.cmi \
1563-
parsing/jane_asttypes.cmi \
1566+
typing/jkind.cmi \
15641567
typing/env.cmi \
15651568
parsing/asttypes.cmi
15661569
typing/tast_mapper.cmo : \
15671570
typing/typedtree.cmi \
15681571
parsing/parsetree.cmi \
15691572
parsing/location.cmi \
1570-
parsing/jane_asttypes.cmi \
1573+
typing/jkind.cmi \
15711574
typing/env.cmi \
15721575
parsing/asttypes.cmi \
15731576
parsing/ast_mapper.cmi \
@@ -1576,15 +1579,15 @@ typing/tast_mapper.cmx : \
15761579
typing/typedtree.cmx \
15771580
parsing/parsetree.cmi \
15781581
parsing/location.cmx \
1579-
parsing/jane_asttypes.cmi \
1582+
typing/jkind.cmx \
15801583
typing/env.cmx \
15811584
parsing/asttypes.cmi \
15821585
parsing/ast_mapper.cmx \
15831586
typing/tast_mapper.cmi
15841587
typing/tast_mapper.cmi : \
15851588
typing/typedtree.cmi \
15861589
parsing/location.cmi \
1587-
parsing/jane_asttypes.cmi \
1590+
typing/jkind.cmi \
15881591
typing/env.cmi \
15891592
parsing/asttypes.cmi
15901593
typing/typeclass.cmo : \
@@ -1842,6 +1845,7 @@ typing/typedecl.cmi : \
18421845
typing/ident.cmi \
18431846
typing/errortrace.cmi \
18441847
typing/env.cmi \
1848+
parsing/builtin_attributes.cmi \
18451849
parsing/asttypes.cmi
18461850
typing/typedecl_properties.cmo : \
18471851
typing/types.cmi \
@@ -1929,7 +1933,6 @@ typing/typedtree.cmo : \
19291933
parsing/longident.cmi \
19301934
parsing/location.cmi \
19311935
typing/jkind.cmi \
1932-
parsing/jane_asttypes.cmi \
19331936
typing/ident.cmi \
19341937
typing/env.cmi \
19351938
parsing/asttypes.cmi \
@@ -1945,7 +1948,6 @@ typing/typedtree.cmx : \
19451948
parsing/longident.cmx \
19461949
parsing/location.cmx \
19471950
typing/jkind.cmx \
1948-
parsing/jane_asttypes.cmi \
19491951
typing/ident.cmx \
19501952
typing/env.cmx \
19511953
parsing/asttypes.cmi \
@@ -1961,7 +1963,6 @@ typing/typedtree.cmi : \
19611963
parsing/longident.cmi \
19621964
parsing/location.cmi \
19631965
typing/jkind.cmi \
1964-
parsing/jane_asttypes.cmi \
19651966
typing/ident.cmi \
19661967
typing/env.cmi \
19671968
parsing/asttypes.cmi
@@ -2192,7 +2193,7 @@ typing/typetexp.cmx : \
21922193
utils/language_extension.cmx \
21932194
typing/jkind.cmx \
21942195
parsing/jane_syntax.cmx \
2195-
parsing/jane_asttypes.cmi \
2196+
parsing/jane_asttypes.cmx \
21962197
typing/errortrace.cmx \
21972198
typing/env.cmx \
21982199
typing/ctype.cmx \

0 commit comments

Comments
 (0)