fix(CtLineElementComparator): one can add two values to an annotation #3640
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
|
I tried to write down the math why this is wrong in #3519. If we return -1, we have a sleeping but and wait till the sort algorithm finds this. |
nharrand
commented
Oct 7, 2020
| * Returns 1 if o2 is after o1 in the file, or o2 has no valid position. | ||
| */ | ||
| @Override | ||
| public int compare(CtElement o1, CtElement o2) { | ||
| if (!o1.getPosition().isValidPosition() && !o2.getPosition().isValidPosition()) { | ||
| return 0; | ||
| return o1.equals(o2) ? 0 : -1; |
There was a problem hiding this comment.
If you want to respect the antisymetric property, this line could be replaced with
return o1.equals(o2) ? 0 : ((o1.hashCode() < o2.hashCode()) ? -1 : 1);
There was a problem hiding this comment.
Nice fix. At first glance I see no problem with transitive and antisymmetric property. LGTM.
monperrus
changed the title
|
Thanks @nharrand |
Merged
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.
fix #3639 .
I seems that the entry set of the values contained an CtAnnotationImpl are ordered based on their source position. The issue is that so far
CtLineElementComparator#compare()returns 0 if both element haveNoSourcePosition. But this is the case when both elements are constructed programmatically. Hence the entry set arbitrarily retains only one of them.My proposed solution is to make
CtLineElementComparator#compare()returns 0 only if both elements have the same exact position or if both elements haveNoSourcePositionand are equals. Otherwise we return -1 (i.e. order them aribtrarily). This way our entry set is pseudo order but does not delete unequals elements.