renamed "namedBackref" to "named_backref"

erik-krogh · erik-krogh · commit acc13ddd04e7 · 2020-09-04T11:52:12.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
@@ -157,7 +157,7 @@ public void visit(BackReference nd) {
     @Override
     public void visit(NamedBackReference nd) {
       Label lbl = extractTerm(nd, parent, idx);
-      trapwriter.addTuple("namedBackref", lbl, nd.getName());
+      trapwriter.addTuple("named_backref", lbl, nd.getName());
     }
 
     @Override
diff --git a/javascript/extractor/tests/regexp/output/trap/es2018.js.trap b/javascript/extractor/tests/regexp/output/trap/es2018.js.trap
@@ -171,7 +171,7 @@ regexpterm(#20057,22,#20043,3,"\k<ws>")
 #20058=@"loc,{#10000},1,16,1,21"
 locations_default(#20058,#10000,1,16,1,21)
 hasLocation(#20057,#20058)
-namedBackref(#20057,"ws")
+named_backref(#20057,"ws")
 #20059=*
 regexpterm(#20059,3,#20043,4,"$")
 #20060=@"loc,{#10000},1,22,1,22"
@@ -265,7 +265,7 @@ regexpterm(#20083,22,#20082,0,"\k<")
 #20084=@"loc,{#10000},6,2,6,4"
 locations_default(#20084,#10000,6,2,6,4)
 hasLocation(#20083,#20084)
-namedBackref(#20083,"")
+named_backref(#20083,"")
 #20085=*
 regexp_parse_errors(#20085,#20083,"expected identifier")
 #20086=@"loc,{#10000},6,5,6,5"
diff --git a/javascript/ql/src/semmle/javascript/Aliases.qll b/javascript/ql/src/semmle/javascript/Aliases.qll
@@ -265,3 +265,8 @@ deprecated predicate regexpConstValue(RegExpConstant id, string value) { regexp_
  * Use `RegExpCharacterClassEscape#getValue()` instead.
  */ 
 deprecated predicate charClassEscape(RegExpCharacterClassEscape id, string value) { char_class_escape(id, value) }
+/**
+ * Alias for the predicate `named_backref` defined in the .dbscheme.
+ * Use `RegExpBackRef#getName()` instead.
+ */ 
+deprecated predicate namedBackref(RegExpBackRef id, string name) { named_backref(id, name) }
diff --git a/javascript/ql/src/semmle/javascript/Regexp.qll b/javascript/ql/src/semmle/javascript/Regexp.qll
@@ -745,7 +745,7 @@ class RegExpBackRef extends RegExpTerm, @regexp_backref {
   /**
    * Gets the name of the capture group this back reference refers to, if any.
    */
-  string getName() { namedBackref(this, result) }
+  string getName() { named_backref(this, result) }
 
   /** Gets the capture group this back reference refers to. */
   RegExpGroup getGroup() {
diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme b/javascript/ql/src/semmlecode.javascript.dbscheme
@@ -886,7 +886,7 @@ is_inverted (int id: @regexp_char_class ref);
 regexp_const_value (unique int id: @regexp_constant 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);
+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);
 unicodePropertyEscapeValue (unique int id: @regexp_unicode_property_escape ref, string value: string ref);
 
diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme.stats b/javascript/ql/src/semmlecode.javascript.dbscheme.stats
@@ -20822,7 +20822,7 @@
 </dependencies>
 </relation>
 <relation>
-<name>namedBackref</name>
+<name>named_backref</name>
 <cardinality>11</cardinality>
 <columnsizes>
 <e>
diff --git a/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties b/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties
@@ -80,3 +80,5 @@ regexp_const_value.rel: reorder regexpConstValue.rel(int id, string value) id va
 regexpConstValue.rel: delete
 char_class_escape.rel: reorder charClassEscape.rel(int id, string value) id value
 charClassEscape.rel: delete
+named_backref.rel: reorder namedBackref.rel(int id, string name) id name
+namedBackref.rel: delete

Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ public void visit(BackReference nd) {`
`157`	`157`	`@Override`
`158`	`158`	`public void visit(NamedBackReference nd) {`
`159`	`159`	`Label lbl = extractTerm(nd, parent, idx);`
`160`		`- trapwriter.addTuple("namedBackref", lbl, nd.getName());`
	`160`	`+ trapwriter.addTuple("named_backref", lbl, nd.getName());`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`@Override`