-
Notifications
You must be signed in to change notification settings - Fork 358
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.
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
New operator '~' for semantic versioning #4532
Draft
Keryan-dev
wants to merge
1
commit into
ocaml:master
Choose a base branch
from
Keryan-dev:semver
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Conversation
This file contains 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
rjbou
added
the
PR: QUEUED
Pending pull request, waiting for other work to be merged or closed
label
Feb 10, 2021
rjbou
removed
the
PR: QUEUED
Pending pull request, waiting for other work to be merged or closed
label
Dec 1, 2021
Notes from dev meeting:
|
AltGr
approved these changes
Apr 27, 2022
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This deserves some tests in tests/reftests, but otherwise LGTM!
Comment on lines
+309
to
+315
| Relop (op,e,f) -> | ||
(match op.pelem with | ||
| `Sem -> (* rewrite `Sem case *) | ||
FAnd (FOp (aux e, `Geq, aux f), | ||
FOp (aux e, `Lt, FNext (aux f))) | ||
| `Eq | `Neq | `Gt | `Geq | `Lt | `Leq as op -> | ||
FOp (aux e, op, aux f)) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Easier to read with a flattened match ?
Suggested change
| Relop (op,e,f) -> | |
(match op.pelem with | |
| `Sem -> (* rewrite `Sem case *) | |
FAnd (FOp (aux e, `Geq, aux f), | |
FOp (aux e, `Lt, FNext (aux f))) | |
| `Eq | `Neq | `Gt | `Geq | `Lt | `Leq as op -> | |
FOp (aux e, op, aux f)) | |
| Relop ({pelem = `Sem; _}, e, f) -> (* rewrite `Sem case *) | |
FAnd (FOp (aux e, `Geq, aux f), | |
FOp (aux e, `Lt, FNext (aux f))) | |
| Relop ({pelem = `Eq | `Neq | `Gt | `Geq | `Lt | `Leq as op; _}, e, f) -> | |
FOp (aux e, op, aux f)) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This follows #2976 as an attempt to implement the '~' operator. It requires another patch of opam-file-format.
Given the difference between this operator and the others, I tried to avoid it to go too deep in the opam internals. Thus, most of the changes are contained in opamFormat.ml where occurrences of the new operator are caught and rewrote from
~ v
to>= v & < next(v)
with the behavior ofnext
defined in the issue.I open the PR as a draft, as I feel the changes might need some more work to be satisfactory. Comments and reviews are most welcome.