renamed "rangeQuantifierUpperBound" to "range_quantifier_upper_bound"

erik-krogh · erik-krogh · commit 35b5b660c5e5 · 2020-09-04T11:52:07.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
@@ -247,7 +247,7 @@ public void visit(Range nd) {
 
       if (nd.hasUpperBound()) {
         long hi = nd.getUpperBound();
-        if (inRange(hi)) trapwriter.addTuple("rangeQuantifierUpperBound", lbl, hi);
+        if (inRange(hi)) trapwriter.addTuple("range_quantifier_upper_bound", lbl, hi);
       }
 
       this.visit(nd.getOperand(), lbl, 0);
diff --git a/javascript/extractor/tests/exprs/output/trap/regexp.js.trap b/javascript/extractor/tests/exprs/output/trap/regexp.js.trap
@@ -1088,7 +1088,7 @@ locations_default(#20376,#10000,15,2,15,5)
 hasLocation(#20375,#20376)
 is_greedy(#20375)
 range_quantifier_lower_bound(#20375,1)
-rangeQuantifierUpperBound(#20375,1)
+range_quantifier_upper_bound(#20375,1)
 #20377=*
 regexpterm(#20377,14,#20375,0,"a")
 #20378=@"loc,{#10000},15,2,15,2"
@@ -1135,7 +1135,7 @@ locations_default(#20388,#10000,17,2,17,7)
 hasLocation(#20387,#20388)
 is_greedy(#20387)
 range_quantifier_lower_bound(#20387,1)
-rangeQuantifierUpperBound(#20387,2)
+range_quantifier_upper_bound(#20387,2)
 #20389=*
 regexpterm(#20389,14,#20387,0,"a")
 #20390=@"loc,{#10000},17,2,17,2"
@@ -1158,7 +1158,7 @@ regexpterm(#20393,11,#20392,0,"a{1}?")
 locations_default(#20394,#10000,18,2,18,6)
 hasLocation(#20393,#20394)
 range_quantifier_lower_bound(#20393,1)
-rangeQuantifierUpperBound(#20393,1)
+range_quantifier_upper_bound(#20393,1)
 #20395=*
 regexpterm(#20395,14,#20393,0,"a")
 #20396=@"loc,{#10000},18,2,18,2"
@@ -1203,7 +1203,7 @@ regexpterm(#20405,11,#20404,0,"a{1,2}?")
 locations_default(#20406,#10000,20,2,20,8)
 hasLocation(#20405,#20406)
 range_quantifier_lower_bound(#20405,1)
-rangeQuantifierUpperBound(#20405,2)
+range_quantifier_upper_bound(#20405,2)
 #20407=*
 regexpterm(#20407,14,#20405,0,"a")
 #20408=@"loc,{#10000},20,2,20,2"
@@ -1672,7 +1672,7 @@ locations_default(#20543,#10000,37,2,37,3)
 hasLocation(#20542,#20543)
 is_greedy(#20542)
 range_quantifier_lower_bound(#20542,0)
-rangeQuantifierUpperBound(#20542,0)
+range_quantifier_upper_bound(#20542,0)
 #20544=*
 regexpterm(#20544,14,#20542,0,"a")
 #20545=@"loc,{#10000},37,2,37,2"
@@ -1711,7 +1711,7 @@ locations_default(#20555,#10000,38,2,38,3)
 hasLocation(#20554,#20555)
 is_greedy(#20554)
 range_quantifier_lower_bound(#20554,0)
-rangeQuantifierUpperBound(#20554,0)
+range_quantifier_upper_bound(#20554,0)
 #20556=*
 regexpterm(#20556,14,#20554,0,"a")
 #20557=@"loc,{#10000},38,2,38,2"
@@ -1758,7 +1758,7 @@ locations_default(#20569,#10000,39,2,39,4)
 hasLocation(#20568,#20569)
 is_greedy(#20568)
 range_quantifier_lower_bound(#20568,2)
-rangeQuantifierUpperBound(#20568,2)
+range_quantifier_upper_bound(#20568,2)
 #20570=*
 regexpterm(#20570,14,#20568,0,"a")
 #20571=@"loc,{#10000},39,2,39,2"
diff --git a/javascript/ql/src/semmle/javascript/Aliases.qll b/javascript/ql/src/semmle/javascript/Aliases.qll
@@ -235,3 +235,8 @@ deprecated predicate isGreedy(RegExpQuantifier id) { is_greedy(id) }
  * Use `RegExpRange#getLowerBound()` instead.
  */ 
 deprecated predicate rangeQuantifierLowerBound(RegExpRange id, int lo) { range_quantifier_lower_bound(id, lo) }
+/**
+ * Alias for the predicate `range_quantifier_upper_bound` defined in the .dbscheme.
+ * Use `RegExpRange#getUpperBound() instead.
+ */ 
+deprecated predicate rangeQuantifierUpperBound(RegExpRange id, int hi) { range_quantifier_upper_bound(id, hi) }
diff --git a/javascript/ql/src/semmle/javascript/Regexp.qll b/javascript/ql/src/semmle/javascript/Regexp.qll
@@ -531,7 +531,7 @@ class RegExpRange extends RegExpQuantifier, @regexp_range {
    * For a term of the form `r{lo}`, both the lower and the upper bound
    * are `lo`.
    */
-  int getUpperBound() { rangeQuantifierUpperBound(this, result) }
+  int getUpperBound() { range_quantifier_upper_bound(this, result) }
 
   override predicate isNullable() {
     getAChild().isNullable() or
diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme b/javascript/ql/src/semmlecode.javascript.dbscheme
@@ -879,7 +879,7 @@ regexp_parse_errors (unique int id: @regexp_parse_error,
 
 is_greedy (int id: @regexp_quantifier ref);
 range_quantifier_lower_bound (unique int id: @regexp_range ref, int lo: int ref);
-rangeQuantifierUpperBound (unique int id: @regexp_range ref, int hi: int ref);
+range_quantifier_upper_bound (unique int id: @regexp_range ref, int hi: int ref);
 isCapture (unique int id: @regexp_group ref, int number: int ref);
 isNamedCapture (unique int id: @regexp_group ref, string name: string ref);
 isInverted (int id: @regexp_char_class ref);
diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme.stats b/javascript/ql/src/semmlecode.javascript.dbscheme.stats
@@ -20167,7 +20167,7 @@
 </dependencies>
 </relation>
 <relation>
-<name>rangeQuantifierUpperBound</name>
+<name>range_quantifier_upper_bound</name>
 <cardinality>45</cardinality>
 <columnsizes>
 <e>
diff --git a/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties b/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties
@@ -68,3 +68,5 @@ is_greedy.rel: reorder isGreedy.rel(int id) id
 isGreedy.rel: delete
 range_quantifier_lower_bound.rel: reorder rangeQuantifierLowerBound.rel(int id, int lo) id lo
 rangeQuantifierLowerBound.rel: delete
+range_quantifier_upper_bound.rel: reorder rangeQuantifierUpperBound.rel(int id, int hi) id hi
+rangeQuantifierUpperBound.rel: delete

Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,7 @@ public void visit(Range nd) {`
`247`	`247`
`248`	`248`	`if (nd.hasUpperBound()) {`
`249`	`249`	`long hi = nd.getUpperBound();`
`250`		`- if (inRange(hi)) trapwriter.addTuple("rangeQuantifierUpperBound", lbl, hi);`
	`250`	`+ if (inRange(hi)) trapwriter.addTuple("range_quantifier_upper_bound", lbl, hi);`
`251`	`251`	`}`
`252`	`252`
`253`	`253`	`this.visit(nd.getOperand(), lbl, 0);`