Merged
Conversation
* src/ocaml/preprocess/parser_raw.mly (Hunks 3, 4, 10) - Added new grammar rules for quotation metaprogramming (spliceable_expr, Pexp_quote, Pexp_splice) * src/ocaml/parsing/pprintast.ml (Hunk 2) - Renamed jkind constructors with Pjk_ prefix while keeping Misc_stdlib.pp_parens_if * src/ocaml/typing/env.ml (Hunks 2, 5, 17, 23) - Added stage field to environment and integrated stage tracking helpers - Added Quotation_lock | Splice_lock cases for lock walking * src/ocaml/typing/env.mli (Hunk 7) - Added stage-related function signatures alongside existing fold functions * src/ocaml/typing/outcometree.mli (Hunk 1) - Added Oval_code constructor for quoted code values * src/ocaml/typing/printtyp.ml (Hunks 2, 3) - Kept Internal_names module structure and removed conflicting definitions * src/ocaml/typing/typecore.ml (Hunks 7, 16) - Added Texp_quotation, Texp_eval expression cases - Updated allocation mode error handling * src/ocaml/typing/typedtree.ml (Hunks 1, 3) - Added three new expression constructors: Texp_quotation, Texp_antiquotation, Texp_eval - Integrated fold_antiquote functions for traversing quotations * src/ocaml/typing/typedtree.mli (Hunks 1, 3) - Added new expression constructor signatures - Added fold_antiquote_exp function signature * src/ocaml/typing/typemod.ml (Hunk 1) - Combined quotation check with empty list parameter in transl_signature call * src/ocaml/typing/typeopt.ml (Hunks 1, 4) - Removed local is_always_gc_ignorable function (moved to Ctype module) - Updated calls to use Ctype.is_always_gc_ignorable * src/ocaml/typing/typetexp.ml (Hunk 4) - Updated lookup_local signature to return (type_expr * Env.stage) tuple
Compiler Merge ChecklistThis PR seems to merge changes from Flambda. Please be sure to follow the below steps:
If this PR is not merging changes from Flambda, feel free to ignore this comment |
mshinwell
commented
Oct 10, 2025
mshinwell
commented
Oct 10, 2025
mshinwell
commented
Oct 10, 2025
Skepfyr
reviewed
Oct 10, 2025
src/analysis/syntax_doc.ml
Outdated
| | Comonadic Forkable, Forkable -> | ||
| Some "Values with this mode can be forked to other threads" | ||
| | Comonadic Forkable, Unforkable -> | ||
| Some "Values with this mode cannot be forked to other threads" |
Contributor
There was a problem hiding this comment.
I think Claude's made these decriptions up, I'm not sure if they're correct.
Contributor
There was a problem hiding this comment.
I'll chase someone down to write something here because I'm not sure either.
mshinwell
commented
Oct 10, 2025
Skepfyr
force-pushed
the
merge-5.2.0minus-22
branch
from
89e6d60 to
c7ff04e
Compare
Co-authored-by: Max Slater <max@thenumb.at>
Skepfyr
force-pushed
the
merge-5.2.0minus-22
branch
from
c7ff04e to
a9e32a2
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I let Claude do all the conflict and compilation error fixing.
I imported
CamlinternalQuote, otherwise this won't build without OxCaml. The Merlin devs should probably think about where this file should go in the future, but this should suffice for now I hope.I also renamed "flambda-backend" -> "oxcaml" in the source import script.