Skip to content

Commit bb0dabd

Browse files
alanechanggoldfirereliam923
authored
flambda-backend: Modal kind jane syntax encoding (#2350)
* add Structure_item_encodable move wip rename Of to Kind_of add kind_abbrev support parser changes fix add underscore fix mapper and iterator fix printing test new test * mode list instead of mode_expr * formatting * remove failing test * define Jkind.Const * fix formatting and upstream compatibility * fix upstream * bootstrap * code formatting and test coverage * Some improvements during review * Update test for new test script language --------- Co-authored-by: Richard Eisenberg <[email protected]> Co-authored-by: Liam Stevenson <[email protected]>
1 parent 7033ca4 commit bb0dabd

40 files changed

+101343
-33836
lines changed

.depend

Lines changed: 13 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -347,27 +347,24 @@ parsing/ast_iterator.cmo : \
347347
parsing/parsetree.cmi \
348348
parsing/location.cmi \
349349
parsing/jane_syntax.cmi \
350-
parsing/jane_asttypes.cmi \
351350
parsing/ast_iterator.cmi
352351
parsing/ast_iterator.cmx : \
353352
parsing/parsetree.cmi \
354353
parsing/location.cmx \
355354
parsing/jane_syntax.cmx \
356-
parsing/jane_asttypes.cmx \
357355
parsing/ast_iterator.cmi
358356
parsing/ast_iterator.cmi : \
359357
parsing/parsetree.cmi \
360358
parsing/location.cmi \
361-
parsing/jane_syntax.cmi \
362-
parsing/jane_asttypes.cmi
359+
parsing/jane_syntax.cmi
363360
parsing/ast_mapper.cmo : \
364361
parsing/parsetree.cmi \
365362
utils/misc.cmi \
366363
parsing/longident.cmi \
367364
parsing/location.cmi \
368365
utils/load_path.cmi \
366+
typing/jkind.cmi \
369367
parsing/jane_syntax.cmi \
370-
parsing/jane_asttypes.cmi \
371368
parsing/docstrings.cmi \
372369
utils/config.cmi \
373370
utils/clflags.cmi \
@@ -380,8 +377,8 @@ parsing/ast_mapper.cmx : \
380377
parsing/longident.cmx \
381378
parsing/location.cmx \
382379
utils/load_path.cmx \
380+
typing/jkind.cmx \
383381
parsing/jane_syntax.cmx \
384-
parsing/jane_asttypes.cmx \
385382
parsing/docstrings.cmx \
386383
utils/config.cmx \
387384
utils/clflags.cmx \
@@ -391,8 +388,7 @@ parsing/ast_mapper.cmx : \
391388
parsing/ast_mapper.cmi : \
392389
parsing/parsetree.cmi \
393390
parsing/location.cmi \
394-
parsing/jane_syntax.cmi \
395-
parsing/jane_asttypes.cmi
391+
parsing/jane_syntax.cmi
396392
parsing/asttypes.cmi : \
397393
parsing/location.cmi
398394
parsing/attr_helper.cmo : \
@@ -455,7 +451,6 @@ parsing/depend.cmo : \
455451
parsing/longident.cmi \
456452
parsing/location.cmi \
457453
parsing/jane_syntax.cmi \
458-
parsing/jane_asttypes.cmi \
459454
utils/clflags.cmi \
460455
parsing/builtin_attributes.cmi \
461456
parsing/asttypes.cmi \
@@ -466,7 +461,6 @@ parsing/depend.cmx : \
466461
parsing/longident.cmx \
467462
parsing/location.cmx \
468463
parsing/jane_syntax.cmx \
469-
parsing/jane_asttypes.cmx \
470464
utils/clflags.cmx \
471465
parsing/builtin_attributes.cmx \
472466
parsing/asttypes.cmi \
@@ -489,13 +483,10 @@ parsing/docstrings.cmi : \
489483
parsing/parsetree.cmi \
490484
parsing/location.cmi
491485
parsing/jane_asttypes.cmo : \
492-
parsing/location.cmi \
493486
parsing/jane_asttypes.cmi
494487
parsing/jane_asttypes.cmx : \
495-
parsing/location.cmx \
496488
parsing/jane_asttypes.cmi
497-
parsing/jane_asttypes.cmi : \
498-
parsing/location.cmi
489+
parsing/jane_asttypes.cmi :
499490
parsing/jane_syntax.cmo : \
500491
parsing/printast.cmi \
501492
parsing/parsetree.cmi \
@@ -505,7 +496,6 @@ parsing/jane_syntax.cmo : \
505496
utils/language_extension_kernel.cmi \
506497
utils/language_extension.cmi \
507498
parsing/jane_syntax_parsing.cmi \
508-
parsing/jane_asttypes.cmi \
509499
parsing/asttypes.cmi \
510500
parsing/ast_helper.cmi \
511501
parsing/jane_syntax.cmi
@@ -518,15 +508,13 @@ parsing/jane_syntax.cmx : \
518508
utils/language_extension_kernel.cmx \
519509
utils/language_extension.cmx \
520510
parsing/jane_syntax_parsing.cmx \
521-
parsing/jane_asttypes.cmx \
522511
parsing/asttypes.cmi \
523512
parsing/ast_helper.cmx \
524513
parsing/jane_syntax.cmi
525514
parsing/jane_syntax.cmi : \
526515
parsing/parsetree.cmi \
527516
parsing/longident.cmi \
528517
parsing/location.cmi \
529-
parsing/jane_asttypes.cmi \
530518
parsing/docstrings.cmi \
531519
parsing/asttypes.cmi
532520
parsing/jane_syntax_parsing.cmo : \
@@ -615,7 +603,6 @@ parsing/parser.cmo : \
615603
utils/language_extension.cmi \
616604
parsing/jane_syntax_parsing.cmi \
617605
parsing/jane_syntax.cmi \
618-
parsing/jane_asttypes.cmi \
619606
parsing/docstrings.cmi \
620607
utils/clflags.cmi \
621608
parsing/camlinternalMenhirLib.cmi \
@@ -632,7 +619,6 @@ parsing/parser.cmx : \
632619
utils/language_extension.cmx \
633620
parsing/jane_syntax_parsing.cmx \
634621
parsing/jane_syntax.cmx \
635-
parsing/jane_asttypes.cmx \
636622
parsing/docstrings.cmx \
637623
utils/clflags.cmx \
638624
parsing/camlinternalMenhirLib.cmx \
@@ -657,7 +643,6 @@ parsing/pprintast.cmo : \
657643
parsing/location.cmi \
658644
utils/language_extension.cmi \
659645
parsing/jane_syntax.cmi \
660-
parsing/jane_asttypes.cmi \
661646
parsing/asttypes.cmi \
662647
parsing/ast_helper.cmi \
663648
parsing/pprintast.cmi
@@ -668,13 +653,13 @@ parsing/pprintast.cmx : \
668653
parsing/location.cmx \
669654
utils/language_extension.cmx \
670655
parsing/jane_syntax.cmx \
671-
parsing/jane_asttypes.cmx \
672656
parsing/asttypes.cmi \
673657
parsing/ast_helper.cmx \
674658
parsing/pprintast.cmi
675659
parsing/pprintast.cmi : \
676660
parsing/parsetree.cmi \
677-
parsing/longident.cmi
661+
parsing/longident.cmi \
662+
parsing/jane_syntax.cmi
678663
parsing/printast.cmo : \
679664
parsing/parsetree.cmi \
680665
parsing/longident.cmi \
@@ -1118,6 +1103,7 @@ typing/includemod_errorprinter.cmx : \
11181103
typing/includemod_errorprinter.cmi : \
11191104
typing/includemod.cmi
11201105
typing/jkind.cmo : \
1106+
parsing/pprintast.cmi \
11211107
typing/types.cmi \
11221108
typing/primitive.cmi \
11231109
typing/path.cmi \
@@ -1128,11 +1114,11 @@ typing/jkind.cmo : \
11281114
utils/language_extension.cmi \
11291115
typing/jkind_types.cmi \
11301116
parsing/jane_syntax.cmi \
1131-
parsing/jane_asttypes.cmi \
11321117
typing/ident.cmi \
11331118
parsing/builtin_attributes.cmi \
11341119
typing/jkind.cmi
11351120
typing/jkind.cmx : \
1121+
parsing/pprintast.cmx \
11361122
typing/types.cmx \
11371123
typing/primitive.cmx \
11381124
typing/path.cmx \
@@ -1143,7 +1129,6 @@ typing/jkind.cmx : \
11431129
utils/language_extension.cmx \
11441130
typing/jkind_types.cmx \
11451131
parsing/jane_syntax.cmx \
1146-
parsing/jane_asttypes.cmx \
11471132
typing/ident.cmx \
11481133
parsing/builtin_attributes.cmx \
11491134
typing/jkind.cmi
@@ -1153,6 +1138,7 @@ typing/jkind.cmi : \
11531138
parsing/parsetree.cmi \
11541139
typing/mode.cmi \
11551140
parsing/location.cmi \
1141+
parsing/jane_syntax.cmi \
11561142
typing/jkind_types.cmi \
11571143
parsing/jane_asttypes.cmi \
11581144
typing/ident.cmi
@@ -1374,7 +1360,7 @@ typing/predef.cmo : \
13741360
typing/mode.cmi \
13751361
parsing/location.cmi \
13761362
typing/jkind.cmi \
1377-
parsing/jane_asttypes.cmi \
1363+
parsing/jane_syntax.cmi \
13781364
typing/ident.cmi \
13791365
typing/btype.cmi \
13801366
parsing/asttypes.cmi \
@@ -1387,7 +1373,7 @@ typing/predef.cmx : \
13871373
typing/mode.cmx \
13881374
parsing/location.cmx \
13891375
typing/jkind.cmx \
1390-
parsing/jane_asttypes.cmx \
1376+
parsing/jane_syntax.cmx \
13911377
typing/ident.cmx \
13921378
typing/btype.cmx \
13931379
parsing/asttypes.cmi \
@@ -1509,7 +1495,6 @@ typing/printtyped.cmo : \
15091495
parsing/longident.cmi \
15101496
parsing/location.cmi \
15111497
typing/jkind.cmi \
1512-
parsing/jane_syntax.cmi \
15131498
typing/ident.cmi \
15141499
utils/clflags.cmi \
15151500
parsing/asttypes.cmi \
@@ -1526,7 +1511,6 @@ typing/printtyped.cmx : \
15261511
parsing/longident.cmx \
15271512
parsing/location.cmx \
15281513
typing/jkind.cmx \
1529-
parsing/jane_syntax.cmx \
15301514
typing/ident.cmx \
15311515
utils/clflags.cmx \
15321516
parsing/asttypes.cmi \
@@ -2049,7 +2033,6 @@ typing/typedtree.cmo : \
20492033
parsing/location.cmi \
20502034
typing/jkind.cmi \
20512035
parsing/jane_syntax.cmi \
2052-
parsing/jane_asttypes.cmi \
20532036
typing/ident.cmi \
20542037
typing/env.cmi \
20552038
parsing/builtin_attributes.cmi \
@@ -2068,7 +2051,6 @@ typing/typedtree.cmx : \
20682051
parsing/location.cmx \
20692052
typing/jkind.cmx \
20702053
parsing/jane_syntax.cmx \
2071-
parsing/jane_asttypes.cmx \
20722054
typing/ident.cmx \
20732055
typing/env.cmx \
20742056
parsing/builtin_attributes.cmx \
@@ -2087,7 +2069,6 @@ typing/typedtree.cmi : \
20872069
parsing/location.cmi \
20882070
typing/jkind.cmi \
20892071
parsing/jane_syntax.cmi \
2090-
parsing/jane_asttypes.cmi \
20912072
typing/ident.cmi \
20922073
typing/env.cmi \
20932074
parsing/builtin_attributes.cmi \
@@ -2317,7 +2298,6 @@ typing/typetexp.cmo : \
23172298
utils/language_extension.cmi \
23182299
typing/jkind.cmi \
23192300
parsing/jane_syntax.cmi \
2320-
parsing/jane_asttypes.cmi \
23212301
typing/errortrace.cmi \
23222302
typing/env.cmi \
23232303
typing/ctype.cmi \
@@ -2343,7 +2323,6 @@ typing/typetexp.cmx : \
23432323
utils/language_extension.cmx \
23442324
typing/jkind.cmx \
23452325
parsing/jane_syntax.cmx \
2346-
parsing/jane_asttypes.cmx \
23472326
typing/errortrace.cmx \
23482327
typing/env.cmx \
23492328
typing/ctype.cmx \
@@ -2362,7 +2341,7 @@ typing/typetexp.cmi : \
23622341
parsing/location.cmi \
23632342
utils/language_extension.cmi \
23642343
typing/jkind.cmi \
2365-
parsing/jane_asttypes.cmi \
2344+
parsing/jane_syntax.cmi \
23662345
typing/errortrace.cmi \
23672346
typing/env.cmi \
23682347
parsing/asttypes.cmi

0 commit comments

Comments
 (0)