This commit is contained in:
Erik Krogh Kristensen
2022-06-17 17:55:29 +02:00
parent 22871138c6
commit 724721c5c8
4 changed files with 12 additions and 12 deletions

View File

@@ -499,10 +499,10 @@ private module CharacterClasses {
/** Gets a representative for all char classes that match the same chars as `c`. */ /** Gets a representative for all char classes that match the same chars as `c`. */
CharacterClass normalize(CharacterClass c) { CharacterClass normalize(CharacterClass c) {
exists(string normalization | exists(string normalization |
normalization = getMormalizationString(c) and normalization = getNormalizationString(c) and
result = result =
min(CharacterClass cc, string raw | min(CharacterClass cc, string raw |
getMormalizationString(cc) = normalization and cc = CharClass(raw) getNormalizationString(cc) = normalization and cc = CharClass(raw)
| |
cc order by raw cc order by raw
) )
@@ -510,7 +510,7 @@ private module CharacterClasses {
} }
/** Gets a string representing all the chars matched by `c` */ /** Gets a string representing all the chars matched by `c` */
private string getMormalizationString(CharacterClass c) { private string getNormalizationString(CharacterClass c) {
(c instanceof PositiveCharacterClass or c instanceof PositiveCharacterClassEscape) and (c instanceof PositiveCharacterClass or c instanceof PositiveCharacterClassEscape) and
result = concat(string char | c.matches(char) and char = CharacterClasses::getARelevantChar()) result = concat(string char | c.matches(char) and char = CharacterClasses::getARelevantChar())
or or

View File

@@ -499,10 +499,10 @@ private module CharacterClasses {
/** Gets a representative for all char classes that match the same chars as `c`. */ /** Gets a representative for all char classes that match the same chars as `c`. */
CharacterClass normalize(CharacterClass c) { CharacterClass normalize(CharacterClass c) {
exists(string normalization | exists(string normalization |
normalization = getMormalizationString(c) and normalization = getNormalizationString(c) and
result = result =
min(CharacterClass cc, string raw | min(CharacterClass cc, string raw |
getMormalizationString(cc) = normalization and cc = CharClass(raw) getNormalizationString(cc) = normalization and cc = CharClass(raw)
| |
cc order by raw cc order by raw
) )
@@ -510,7 +510,7 @@ private module CharacterClasses {
} }
/** Gets a string representing all the chars matched by `c` */ /** Gets a string representing all the chars matched by `c` */
private string getMormalizationString(CharacterClass c) { private string getNormalizationString(CharacterClass c) {
(c instanceof PositiveCharacterClass or c instanceof PositiveCharacterClassEscape) and (c instanceof PositiveCharacterClass or c instanceof PositiveCharacterClassEscape) and
result = concat(string char | c.matches(char) and char = CharacterClasses::getARelevantChar()) result = concat(string char | c.matches(char) and char = CharacterClasses::getARelevantChar())
or or

View File

@@ -499,10 +499,10 @@ private module CharacterClasses {
/** Gets a representative for all char classes that match the same chars as `c`. */ /** Gets a representative for all char classes that match the same chars as `c`. */
CharacterClass normalize(CharacterClass c) { CharacterClass normalize(CharacterClass c) {
exists(string normalization | exists(string normalization |
normalization = getMormalizationString(c) and normalization = getNormalizationString(c) and
result = result =
min(CharacterClass cc, string raw | min(CharacterClass cc, string raw |
getMormalizationString(cc) = normalization and cc = CharClass(raw) getNormalizationString(cc) = normalization and cc = CharClass(raw)
| |
cc order by raw cc order by raw
) )
@@ -510,7 +510,7 @@ private module CharacterClasses {
} }
/** Gets a string representing all the chars matched by `c` */ /** Gets a string representing all the chars matched by `c` */
private string getMormalizationString(CharacterClass c) { private string getNormalizationString(CharacterClass c) {
(c instanceof PositiveCharacterClass or c instanceof PositiveCharacterClassEscape) and (c instanceof PositiveCharacterClass or c instanceof PositiveCharacterClassEscape) and
result = concat(string char | c.matches(char) and char = CharacterClasses::getARelevantChar()) result = concat(string char | c.matches(char) and char = CharacterClasses::getARelevantChar())
or or

View File

@@ -499,10 +499,10 @@ private module CharacterClasses {
/** Gets a representative for all char classes that match the same chars as `c`. */ /** Gets a representative for all char classes that match the same chars as `c`. */
CharacterClass normalize(CharacterClass c) { CharacterClass normalize(CharacterClass c) {
exists(string normalization | exists(string normalization |
normalization = getMormalizationString(c) and normalization = getNormalizationString(c) and
result = result =
min(CharacterClass cc, string raw | min(CharacterClass cc, string raw |
getMormalizationString(cc) = normalization and cc = CharClass(raw) getNormalizationString(cc) = normalization and cc = CharClass(raw)
| |
cc order by raw cc order by raw
) )
@@ -510,7 +510,7 @@ private module CharacterClasses {
} }
/** Gets a string representing all the chars matched by `c` */ /** Gets a string representing all the chars matched by `c` */
private string getMormalizationString(CharacterClass c) { private string getNormalizationString(CharacterClass c) {
(c instanceof PositiveCharacterClass or c instanceof PositiveCharacterClassEscape) and (c instanceof PositiveCharacterClass or c instanceof PositiveCharacterClassEscape) and
result = concat(string char | c.matches(char) and char = CharacterClasses::getARelevantChar()) result = concat(string char | c.matches(char) and char = CharacterClasses::getARelevantChar())
or or