Skip to content

Don’t invert twice on comparison queries #1057

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.

Sign up for GitHub

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

Merged
eggrobin merged 7 commits into from
Mar 12, 2025
Merged

Don’t invert twice on comparison queries #1057

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
de44ea7
Don’t invert twice on comparison queries, add support for null querie…
eggrobin Mar 11, 2025
73485b3
more tests
eggrobin Mar 11, 2025
99d5625
LM3 is
eggrobin Mar 11, 2025
2bb2c23
comments
eggrobin Mar 11, 2025
ae2750c
out of bounds
eggrobin Mar 11, 2025
244f2e2
Check lb=@none@ (though that should probably be an error).
eggrobin Mar 11, 2025
30bca05
Millionfold falsification
eggrobin Mar 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions UnicodeJsps/src/test/java/org/unicode/jsptest/TestUnicodeSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ public void TestInteriorlyNegatedComparison() {
"\\P{Uppercase=@Changes_When_Lowercased@}");

checkSetsEqual(
"\\p{Uppercase≠@Changes_When_Lowercased@}",
"\\p{Is_Uppercase≠@Changes_When_Lowercased@}",
"[[\\p{Uppercase}\\p{Changes_When_Lowercased}]-[\\p{Uppercase}&\\p{Changes_When_Lowercased}]]");
}

Expand All @@ -161,7 +161,7 @@ public void TestIdentityQuery() {

@Test
public void TestNullQuery() {
checkSetsEqual("\\p{Bidi_Paired_Bracket=@none@}", "\\p{Bidi_Paired_Bracket_Type=None}");
checkSetsEqual("\\p{Bidi_Paired_Bracket=@none@}", "\\p{Bidi_Paired_Bracket_Type=Is_None}");
checkSetsEqual("\\p{Bidi_Paired_Bracket≠@None@}", "\\p{Bidi_Paired_Bracket_Type≠None}");
}

Expand Down
7 changes: 5 additions & 2 deletions unicodetools/src/main/java/org/unicode/props/UnicodeProperty.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -691,8 +691,7 @@ public static int compareNames(String a, String b) {
return toSkeleton(a).compareTo(toSkeleton(b));
}

/** Utility for managing property & non-string value aliases */
// TODO account for special names, tibetan, hangul
/** Returns a representative of the equivalence class of source under UAX44-LM3. */
public static String toSkeleton(String source) {
if (source == null) return null;
StringBuffer skeletonBuffer = new StringBuffer();
Expand All @@ -713,6 +712,10 @@ public static String toSkeleton(String source) {
}
}
}
while (skeletonBuffer.subSequence(0, 2).equals("is")) {
gotOne = true;
skeletonBuffer.delete(0, 2);
}
if (!gotOne) return source; // avoid string creation
return skeletonBuffer.toString();
}
Expand Down