Translation: resolve conflicts in remaining files (translmod
, transclass
, translobj
, translprim
, translattribute
, switch
)
#182
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.
Finish off what #179 and #171 started.
Notable resolutions:
matching.ml
andtranslcore.ml
#179, there's a new field onPfield
. An unresolved thread on that PR is also relevant here: Should accessing a module field beReads_vary
like it is upstream? I've asked Mark to weigh in.Lambda.lfunction
was made a private type with a smart constructor both internally and upstream, and we have some extra arguments (region, mode). These are trivial to resolve.Compilation_unit.t
instead ofIdent.t
for globals flambda-backend#871translmod.ml
where we don't needis_compilation_unit
translprim.ml
foradd_used_primtive
(where a change made upstream is irrelevant for us)Testing