hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-20 18:56:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

renamed "unicodePropertyEscapeValue" to "unicode_property_escapevalue"

Browse Source
This commit is contained in:
Erik Krogh Kristensen
2020-09-04 11:52:13 +02:00
parent 3ed310fb7b
commit a57f93b41e
7 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
javascript/extractor/src/com/semmle/js/extractor/RegExpExtractor.java
View File

@@ -287,7 +287,7 @@ public class RegExpExtractor {
public void visit(UnicodePropertyEscape nd) { public void visit(UnicodePropertyEscape nd) {
Label lbl = extractTerm(nd, parent, idx); Label lbl = extractTerm(nd, parent, idx);
trapwriter.addTuple("unicode_property_escapename", lbl, nd.getName()); trapwriter.addTuple("unicode_property_escapename", lbl, nd.getName());
if (nd.hasValue()) trapwriter.addTuple("unicodePropertyEscapeValue", lbl, nd.getValue()); if (nd.hasValue()) trapwriter.addTuple("unicode_property_escapevalue", lbl, nd.getValue());
} }
@Override @Override

2
javascript/extractor/tests/regexp/output/trap/es2018.js.trap
View File

@@ -249,7 +249,7 @@ regexpterm(#20079,27,#20078,0,"\P{Script=Greek}")
locations_default(#20080,#10000,5,2,5,17) locations_default(#20080,#10000,5,2,5,17)
hasLocation(#20079,#20080) hasLocation(#20079,#20080)
unicode_property_escapename(#20079,"Script") unicode_property_escapename(#20079,"Script")
unicodePropertyEscapeValue(#20079,"Greek") unicode_property_escapevalue(#20079,"Greek")
#20081=* #20081=*
stmts(#20081,2,#20001,5,"/\k</;") stmts(#20081,2,#20001,5,"/\k</;")
hasLocation(#20081,#20013) hasLocation(#20081,#20013)

5
javascript/ql/src/semmle/javascript/Aliases.qll
View File

@@ -275,3 +275,8 @@ deprecated predicate namedBackref(RegExpBackRef id, string name) { named_backref
* Use `RegExpUnicodePropertyEscape#getName()` instead. * Use `RegExpUnicodePropertyEscape#getName()` instead.
*/ */
deprecated predicate unicodePropertyEscapeName(RegExpUnicodePropertyEscape id, string name) { unicode_property_escapename(id, name) } deprecated predicate unicodePropertyEscapeName(RegExpUnicodePropertyEscape id, string name) { unicode_property_escapename(id, name) }
/**
* Alias for the predicate `unicode_property_escapevalue` defined in the .dbscheme.
* Use `RegExpUnicodePropertyEscape#getValue()` instead.
*/
deprecated predicate unicodePropertyEscapeValue(RegExpUnicodePropertyEscape id, string value) { unicode_property_escapevalue(id, value) }

2
javascript/ql/src/semmle/javascript/Regexp.qll
View File

@@ -707,7 +707,7 @@ class RegExpUnicodePropertyEscape extends RegExpEscape, @regexp_unicode_property
* For example, the value of Unicode property `\p{Script=Greek}` is `Greek`, while * For example, the value of Unicode property `\p{Script=Greek}` is `Greek`, while
* `\p{Number}` does not have a value. * `\p{Number}` does not have a value.
*/ */
string getValue() { unicodePropertyEscapeValue(this, result) } string getValue() { unicode_property_escapevalue(this, result) }
override predicate isNullable() { none() } override predicate isNullable() { none() }
} }

2
javascript/ql/src/semmlecode.javascript.dbscheme
View File

@@ -888,7 +888,7 @@ char_class_escape (unique int id: @regexp_char_class_escape ref, varchar(1) valu
backref (unique int id: @regexp_backref ref, int value: int ref); backref (unique int id: @regexp_backref ref, int value: int ref);
named_backref (unique int id: @regexp_backref ref, string name: string ref); named_backref (unique int id: @regexp_backref ref, string name: string ref);
unicode_property_escapename (unique int id: @regexp_unicode_property_escape ref, string name: string ref); unicode_property_escapename (unique int id: @regexp_unicode_property_escape ref, string name: string ref);
unicodePropertyEscapeValue (unique int id: @regexp_unicode_property_escape ref, string value: string ref); unicode_property_escapevalue (unique int id: @regexp_unicode_property_escape ref, string value: string ref);
// tokens // tokens
#keyset[toplevel, idx] #keyset[toplevel, idx]

2
javascript/ql/src/semmlecode.javascript.dbscheme.stats
View File

@@ -20691,7 +20691,7 @@
</dependencies> </dependencies>
</relation> </relation>
<relation> <relation>
<name>unicodePropertyEscapeValue</name> <name>unicode_property_escapevalue</name>
<cardinality>1573</cardinality> <cardinality>1573</cardinality>
<columnsizes> <columnsizes>
<e> <e>

2
javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties
View File

@@ -84,3 +84,5 @@ named_backref.rel: reorder namedBackref.rel(int id, string name) id name
namedBackref.rel: delete namedBackref.rel: delete
unicode_property_escapename.rel: reorder unicodePropertyEscapeName.rel(int id, string name) id name unicode_property_escapename.rel: reorder unicodePropertyEscapeName.rel(int id, string name) id name
unicodePropertyEscapeName.rel: delete unicodePropertyEscapeName.rel: delete
unicode_property_escapevalue.rel: reorder unicodePropertyEscapeValue.rel(int id, string value) id value
unicodePropertyEscapeValue.rel: delete