renamed "charClassEscape" to "char_class_escape"

erik-krogh · erik-krogh · commit 23127cb4af11 · 2020-09-04T11:52:11.000+02:00
diff --git a/javascript/extractor/src/com/semmle/js/extractor/RegExpExtractor.java b/javascript/extractor/src/com/semmle/js/extractor/RegExpExtractor.java
@@ -280,7 +280,7 @@ public void visit(WordBoundary nd) {
     @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
diff --git a/javascript/extractor/tests/exprs/output/trap/regexp.js.trap b/javascript/extractor/tests/exprs/output/trap/regexp.js.trap
@@ -1414,13 +1414,13 @@ regexpterm(#20464,20,#20462,0,"\w")
 #20465=@"loc,{#10000},29,2,29,3"
 locations_default(#20465,#10000,29,2,29,3)
 hasLocation(#20464,#20465)
-charClassEscape(#20464,"w")
+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)
-charClassEscape(#20466,"S")
+char_class_escape(#20466,"S")
 #20468=*
 stmts(#20468,2,#20001,29,"/\\/;")
 hasLocation(#20468,#20061)
diff --git a/javascript/extractor/tests/regexp/output/trap/es2018.js.trap b/javascript/extractor/tests/regexp/output/trap/es2018.js.trap
@@ -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"
diff --git a/javascript/ql/src/semmle/javascript/Aliases.qll b/javascript/ql/src/semmle/javascript/Aliases.qll
@@ -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) }
diff --git a/javascript/ql/src/semmle/javascript/Regexp.qll b/javascript/ql/src/semmle/javascript/Regexp.qll
@@ -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() }
 }
diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme b/javascript/ql/src/semmlecode.javascript.dbscheme
@@ -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);
diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme.stats b/javascript/ql/src/semmlecode.javascript.dbscheme.stats
@@ -20545,7 +20545,7 @@
 </dependencies>
 </relation>
 <relation>
-<name>charClassEscape</name>
+<name>char_class_escape</name>
 <cardinality>1573</cardinality>
 <columnsizes>
 <e>
diff --git a/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties b/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -280,7 +280,7 @@ public void visit(WordBoundary nd) {`
`280`	`280`	`@Override`
`281`	`281`	`public void visit(CharacterClassEscape nd) {`
`282`	`282`	`Label lbl = extractTerm(nd, parent, idx);`
`283`		`- trapwriter.addTuple("charClassEscape", lbl, nd.getClassIdentifier());`
	`283`	`+ trapwriter.addTuple("char_class_escape", lbl, nd.getClassIdentifier());`
`284`	`284`	`}`
`285`	`285`
`286`	`286`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -679,7 +679,7 @@ class RegExpControlEscape extends RegExpCharEscape, @regexp_ctrl_escape { }`
`679`	`679`	`*/`
`680`	`680`	`class RegExpCharacterClassEscape extends RegExpEscape, @regexp_char_class_escape {`
`681`	`681`	/** Gets the name of the character class; for example, `w` for `\w`. */
`682`		`- string getValue() { charClassEscape(this, result) }`
	`682`	`+ string getValue() { char_class_escape(this, result) }`
`683`	`683`
`684`	`684`	`override predicate isNullable() { none() }`
`685`	`685`	`}`