hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-24 04:36:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

renamed "unicodePropertyEscapeName" to "unicode_property_escapename"

Browse Source
This commit is contained in:
Erik Krogh Kristensen
2020-09-04 11:52:12 +02:00
parent acc13ddd04
commit 3ed310fb7b
7 changed files with 13 additions and 6 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

@@ -286,7 +286,7 @@ public class RegExpExtractor {
@Override @Override
public void visit(UnicodePropertyEscape nd) { public void visit(UnicodePropertyEscape nd) {
Label lbl = extractTerm(nd, parent, idx); Label lbl = extractTerm(nd, parent, idx);
trapwriter.addTuple("unicodePropertyEscapeName", 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("unicodePropertyEscapeValue", lbl, nd.getValue());
} }

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

@@ -232,7 +232,7 @@ regexpterm(#20075,27,#20074,0,"\p{Number}")
#20076=@"loc,{#10000},4,2,4,11" #20076=@"loc,{#10000},4,2,4,11"
locations_default(#20076,#10000,4,2,4,11) locations_default(#20076,#10000,4,2,4,11)
hasLocation(#20075,#20076) hasLocation(#20075,#20076)
unicodePropertyEscapeName(#20075,"Number") unicode_property_escapename(#20075,"Number")
#20077=* #20077=*
stmts(#20077,2,#20001,4,"/\P{Script=Greek}/u;") stmts(#20077,2,#20001,4,"/\P{Script=Greek}/u;")
hasLocation(#20077,#20011) hasLocation(#20077,#20011)
@@ -248,7 +248,7 @@ regexpterm(#20079,27,#20078,0,"\P{Script=Greek}")
#20080=@"loc,{#10000},5,2,5,17" #20080=@"loc,{#10000},5,2,5,17"
locations_default(#20080,#10000,5,2,5,17) locations_default(#20080,#10000,5,2,5,17)
hasLocation(#20079,#20080) hasLocation(#20079,#20080)
unicodePropertyEscapeName(#20079,"Script") unicode_property_escapename(#20079,"Script")
unicodePropertyEscapeValue(#20079,"Greek") unicodePropertyEscapeValue(#20079,"Greek")
#20081=* #20081=*
stmts(#20081,2,#20001,5,"/\k</;") stmts(#20081,2,#20001,5,"/\k</;")

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

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

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

@@ -699,7 +699,7 @@ class RegExpUnicodePropertyEscape extends RegExpEscape, @regexp_unicode_property
* Gets the name of this Unicode property; for example, `Number` for `\p{Number}` and * Gets the name of this Unicode property; for example, `Number` for `\p{Number}` and
* `Script` for `\p{Script=Greek}`. * `Script` for `\p{Script=Greek}`.
*/ */
string getName() { unicodePropertyEscapeName(this, result) } string getName() { unicode_property_escapename(this, result) }
/** /**
* Gets the value of this Unicode property, if any. * Gets the value of this Unicode property, if any.

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

@@ -887,7 +887,7 @@ regexp_const_value (unique int id: @regexp_constant ref, varchar(1) value: strin
char_class_escape (unique int id: @regexp_char_class_escape ref, varchar(1) value: string ref); char_class_escape (unique int id: @regexp_char_class_escape ref, varchar(1) value: string ref);
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);
unicodePropertyEscapeName (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); unicodePropertyEscapeValue (unique int id: @regexp_unicode_property_escape ref, string value: string ref);
// tokens // tokens

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

@@ -20618,7 +20618,7 @@
</dependencies> </dependencies>
</relation> </relation>
<relation> <relation>
<name>unicodePropertyEscapeName</name> <name>unicode_property_escapename</name>
<cardinality>1573</cardinality> <cardinality>1573</cardinality>
<columnsizes> <columnsizes>
<e> <e>

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

@@ -82,3 +82,5 @@ char_class_escape.rel: reorder charClassEscape.rel(int id, string value) id valu
charClassEscape.rel: delete charClassEscape.rel: delete
named_backref.rel: reorder namedBackref.rel(int id, string name) id name 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
unicodePropertyEscapeName.rel: delete