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 "charClassEscape" to "char_class_escape"

Browse Source
This commit is contained in:
Erik Krogh Kristensen
2020-09-04 11:52:11 +02:00
parent 21733afc32
commit 23127cb4af
8 changed files with 15 additions and 8 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

@@ -280,7 +280,7 @@ public class RegExpExtractor {
@Override
public void visit(CharacterClassEscape nd) {
Label lbl = extractTerm(nd, parent, idx);
trapwriter.addTuple("charClassEscape", lbl, nd.getClassIdentifier());
trapwriter.addTuple("char_class_escape", lbl, nd.getClassIdentifier());
}
@Override

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

@@ -1414,13 +1414,13 @@ regexpterm(#20464,20,#20462,0,"\w")
regexpterm(#20464,20,#20462,0,"\w")
#20465=@"loc,{#10000},29,2,29,3"
locations_default(#20465,#10000,29,2,29,3)
hasLocation(#20464,#20465)
hasLocation(#20464,#20465)
char_class_escape(#20464,"w")
#20466=*
regexpterm(#20466,20,#20462,1,"\S")
#20467=@"loc,{#10000},29,4,29,5"
locations_default(#20467,#10000,29,4,29,5)
hasLocation(#20466,#20467)
hasLocation(#20466,#20467)
char_class_escape(#20466,"S")
#20468=*
stmts(#20468,2,#20001,29,"/\\/;")

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

@@ -153,7 +153,7 @@ regexpterm(#20051,20,#20049,0,"\s")
#20052=@"loc,{#10000},1,9,1,10"
locations_default(#20052,#10000,1,9,1,10)
hasLocation(#20051,#20052)
charClassEscape(#20051,"s")
char_class_escape(#20051,"s")
#20053=*
regexpterm(#20053,9,#20043,2,"\w+")
#20054=@"loc,{#10000},1,13,1,15"
@@ -165,7 +165,7 @@ regexpterm(#20055,20,#20053,0,"\w")
#20056=@"loc,{#10000},1,13,1,14"
locations_default(#20056,#10000,1,13,1,14)
hasLocation(#20055,#20056)
charClassEscape(#20055,"w")
char_class_escape(#20055,"w")
#20057=*
regexpterm(#20057,22,#20043,3,"\k<ws>")
#20058=@"loc,{#10000},1,16,1,21"

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

@@ -260,3 +260,8 @@ deprecated predicate isInverted(RegExpCharacterClass id) { is_inverted(id) }
* Use `RegExpConstant#getValue()` instead.
*/
deprecated predicate regexpConstValue(RegExpConstant id, string value) { regexp_const_value(id, value) }
/**
* Alias for the predicate `char_class_escape` defined in the .dbscheme.
* Use `RegExpCharacterClassEscape#getValue()` instead.
*/
deprecated predicate charClassEscape(RegExpCharacterClassEscape id, string value) { char_class_escape(id, value) }

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

@@ -679,7 +679,7 @@ class RegExpControlEscape extends RegExpCharEscape, @regexp_ctrl_escape { }
*/
class RegExpCharacterClassEscape extends RegExpEscape, @regexp_char_class_escape {
/** Gets the name of the character class; for example, `w` for `\w`. */
string getValue() { charClassEscape(this, result) }
string getValue() { char_class_escape(this, result) }
override predicate isNullable() { none() }
}

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

@@ -884,7 +884,7 @@ is_capture (unique int id: @regexp_group ref, int number: int ref);
is_named_capture (unique int id: @regexp_group ref, string name: string ref);
is_inverted (int id: @regexp_char_class ref);
regexp_const_value (unique int id: @regexp_constant ref, varchar(1) value: string ref);
charClassEscape (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);
namedBackref (unique int id: @regexp_backref ref, string name: string ref);
unicodePropertyEscapeName (unique int id: @regexp_unicode_property_escape ref, string name: string ref);

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

@@ -20545,7 +20545,7 @@
</dependencies>
</relation>
<relation>
<name>charClassEscape</name>
<name>char_class_escape</name>
<cardinality>1573</cardinality>
<columnsizes>
<e>

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

@@ -78,3 +78,5 @@ is_inverted.rel: reorder isInverted.rel(int id) id
isInverted.rel: delete
regexp_const_value.rel: reorder regexpConstValue.rel(int id, string value) id value
regexpConstValue.rel: delete
char_class_escape.rel: reorder charClassEscape.rel(int id, string value) id value
charClassEscape.rel: delete