renamed "isNamedCapture" to "is_named_capture"

erik-krogh · erik-krogh · commit fbcd3dd89343 · 2020-09-04T11:52:08.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
@@ -184,7 +184,7 @@ public void visit(Dollar nd) {
     public void visit(Group nd) {
       Label lbl = extractTerm(nd, parent, idx);
       if (nd.isCapture()) trapwriter.addTuple("is_capture", lbl, nd.getNumber());
-      if (nd.isNamed()) trapwriter.addTuple("isNamedCapture", lbl, nd.getName());
+      if (nd.isNamed()) trapwriter.addTuple("is_named_capture", lbl, nd.getName());
       visit(nd.getOperand(), lbl, 0);
     }
 
diff --git a/javascript/extractor/tests/regexp/output/trap/es2018.js.trap b/javascript/extractor/tests/regexp/output/trap/es2018.js.trap
@@ -141,7 +141,7 @@ regexpterm(#20047,13,#20043,1,"(?<ws>\s+)")
 locations_default(#20048,#10000,1,3,1,12)
 hasLocation(#20047,#20048)
 is_capture(#20047,1)
-isNamedCapture(#20047,"ws")
+is_named_capture(#20047,"ws")
 #20049=*
 regexpterm(#20049,9,#20047,0,"\s+")
 #20050=@"loc,{#10000},1,9,1,11"
diff --git a/javascript/ql/src/semmle/javascript/Aliases.qll b/javascript/ql/src/semmle/javascript/Aliases.qll
@@ -245,3 +245,8 @@ deprecated predicate rangeQuantifierUpperBound(RegExpRange id, int hi) { range_q
  * Use `RegExpGroup#isCapture()` instead.
  */ 
 deprecated predicate isCapture(RegExpGroup id, int number) { is_capture(id, number) }
+/**
+ * Alias for the predicate `is_named_capture` defined in the .dbscheme.
+ * Use `RegExpGroup#isNamed()` instead.
+ */ 
+deprecated predicate isNamedCapture(RegExpGroup id, string name) { is_named_capture(id, name) }
diff --git a/javascript/ql/src/semmle/javascript/Regexp.qll b/javascript/ql/src/semmle/javascript/Regexp.qll
@@ -579,10 +579,10 @@ class RegExpGroup extends RegExpTerm, @regexp_group {
   int getNumber() { is_capture(this, result) }
 
   /** Holds if this is a named capture group. */
-  predicate isNamed() { isNamedCapture(this, _) }
+  predicate isNamed() { is_named_capture(this, _) }
 
   /** Gets the name of this capture group, if any. */
-  string getName() { isNamedCapture(this, result) }
+  string getName() { is_named_capture(this, result) }
 
   override predicate isNullable() { getAChild().isNullable() }
 
diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme b/javascript/ql/src/semmlecode.javascript.dbscheme
@@ -881,7 +881,7 @@ is_greedy (int id: @regexp_quantifier ref);
 range_quantifier_lower_bound (unique int id: @regexp_range ref, int lo: int ref);
 range_quantifier_upper_bound (unique int id: @regexp_range ref, int hi: int ref);
 is_capture (unique int id: @regexp_group ref, int number: int ref);
-isNamedCapture (unique int id: @regexp_group ref, string name: string ref);
+is_named_capture (unique int id: @regexp_group ref, string name: string ref);
 isInverted (int id: @regexp_char_class ref);
 regexpConstValue (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);
diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme.stats b/javascript/ql/src/semmlecode.javascript.dbscheme.stats
@@ -20338,7 +20338,7 @@
 </dependencies>
 </relation>
 <relation>
-<name>isNamedCapture</name>
+<name>is_named_capture</name>
 <cardinality>1280</cardinality>
 <columnsizes>
 <e>
diff --git a/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties b/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties
@@ -72,3 +72,5 @@ range_quantifier_upper_bound.rel: reorder rangeQuantifierUpperBound.rel(int id,
 rangeQuantifierUpperBound.rel: delete
 is_capture.rel: reorder isCapture.rel(int id, int number) id number
 isCapture.rel: delete
+is_named_capture.rel: reorder isNamedCapture.rel(int id, string name) id name
+isNamedCapture.rel: delete

Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ public void visit(Dollar nd) {`
`184`	`184`	`public void visit(Group nd) {`
`185`	`185`	`Label lbl = extractTerm(nd, parent, idx);`
`186`	`186`	`if (nd.isCapture()) trapwriter.addTuple("is_capture", lbl, nd.getNumber());`
`187`		`- if (nd.isNamed()) trapwriter.addTuple("isNamedCapture", lbl, nd.getName());`
	`187`	`+ if (nd.isNamed()) trapwriter.addTuple("is_named_capture", lbl, nd.getName());`
`188`	`188`	`visit(nd.getOperand(), lbl, 0);`
`189`	`189`	`}`
`190`	`190`