renamed "isGreedy" to "is_greedy"

javascript/extractor/src/com/semmle/js/extractor/RegExpExtractor.java

@@ -219,7 +219,7 @@ public class RegExpExtractor {
 
     private void visit(Quantifier nd) {
       Label lbl = extractTerm(nd, parent, idx);
-      if (nd.isGreedy()) trapwriter.addTuple("isGreedy", lbl);
+      if (nd.isGreedy()) trapwriter.addTuple("is_greedy", lbl);
       visit(nd.getOperand(), lbl, 0);
     }
 
@@ -240,7 +240,7 @@ public class RegExpExtractor {
     @Override
     public void visit(Range nd) {
       Label lbl = extractTerm(nd, parent, idx);
-      if (nd.isGreedy()) trapwriter.addTuple("isGreedy", lbl);
+      if (nd.isGreedy()) trapwriter.addTuple("is_greedy", lbl);
 
       long lo = nd.getLowerBound();
       if (inRange(lo)) trapwriter.addTuple("rangeQuantifierLowerBound", lbl, lo);

javascript/extractor/tests/exprs/output/trap/primaries.js.trap

@@ -1002,7 +1002,7 @@ regexpterm(#20357,10,#20353,1,"t?")
 #20358=@"loc,{#10000},12,6,12,7"
 locations_default(#20358,#10000,12,6,12,7)
 hasLocation(#20357,#20358)
-isGreedy(#20357)
+is_greedy(#20357)
 #20359=*
 regexpterm(#20359,14,#20357,0,"t")
 #20360=@"loc,{#10000},12,6,12,6"
@@ -1045,7 +1045,7 @@ regexpterm(#20369,10,#20365,1,"y?")
 #20370=@"loc,{#10000},13,5,13,6"
 locations_default(#20370,#10000,13,5,13,6)
 hasLocation(#20369,#20370)
-isGreedy(#20369)
+is_greedy(#20369)
 #20371=*
 regexpterm(#20371,14,#20369,0,"y")
 #20372=@"loc,{#10000},13,5,13,5"
@@ -1085,7 +1085,7 @@ regexpterm(#20381,9,#20377,1,"(need?le)+")
 #20382=@"loc,{#10000},14,3,14,12"
 locations_default(#20382,#10000,14,3,14,12)
 hasLocation(#20381,#20382)
-isGreedy(#20381)
+is_greedy(#20381)
 #20383=*
 regexpterm(#20383,13,#20381,0,"(need?le)")
 #20384=@"loc,{#10000},14,3,14,11"
@@ -1108,7 +1108,7 @@ regexpterm(#20389,10,#20385,1,"d?")
 #20390=@"loc,{#10000},14,7,14,8"
 locations_default(#20390,#10000,14,7,14,8)
 hasLocation(#20389,#20390)
-isGreedy(#20389)
+is_greedy(#20389)
 #20391=*
 regexpterm(#20391,14,#20389,0,"d")
 #20392=@"loc,{#10000},14,7,14,7"

javascript/extractor/tests/exprs/output/trap/regexp.js.trap

@@ -957,7 +957,7 @@ regexpterm(#20339,8,#20338,0,"a*")
 #20340=@"loc,{#10000},9,2,9,3"
 locations_default(#20340,#10000,9,2,9,3)
 hasLocation(#20339,#20340)
-isGreedy(#20339)
+is_greedy(#20339)
 #20341=*
 regexpterm(#20341,14,#20339,0,"a")
 #20342=@"loc,{#10000},9,2,9,2"
@@ -1000,7 +1000,7 @@ regexpterm(#20351,9,#20350,0,"a+")
 #20352=@"loc,{#10000},11,2,11,3"
 locations_default(#20352,#10000,11,2,11,3)
 hasLocation(#20351,#20352)
-isGreedy(#20351)
+is_greedy(#20351)
 #20353=*
 regexpterm(#20353,14,#20351,0,"a")
 #20354=@"loc,{#10000},11,2,11,2"
@@ -1043,7 +1043,7 @@ regexpterm(#20363,10,#20362,0,"a?")
 #20364=@"loc,{#10000},13,2,13,3"
 locations_default(#20364,#10000,13,2,13,3)
 hasLocation(#20363,#20364)
-isGreedy(#20363)
+is_greedy(#20363)
 #20365=*
 regexpterm(#20365,14,#20363,0,"a")
 #20366=@"loc,{#10000},13,2,13,2"
@@ -1086,7 +1086,7 @@ regexpterm(#20375,11,#20374,0,"a{1}")
 #20376=@"loc,{#10000},15,2,15,5"
 locations_default(#20376,#10000,15,2,15,5)
 hasLocation(#20375,#20376)
-isGreedy(#20375)
+is_greedy(#20375)
 rangeQuantifierLowerBound(#20375,1)
 rangeQuantifierUpperBound(#20375,1)
 #20377=*
@@ -1110,7 +1110,7 @@ regexpterm(#20381,11,#20380,0,"a{1,}")
 #20382=@"loc,{#10000},16,2,16,6"
 locations_default(#20382,#10000,16,2,16,6)
 hasLocation(#20381,#20382)
-isGreedy(#20381)
+is_greedy(#20381)
 rangeQuantifierLowerBound(#20381,1)
 #20383=*
 regexpterm(#20383,14,#20381,0,"a")
@@ -1133,7 +1133,7 @@ regexpterm(#20387,11,#20386,0,"a{1,2}")
 #20388=@"loc,{#10000},17,2,17,7"
 locations_default(#20388,#10000,17,2,17,7)
 hasLocation(#20387,#20388)
-isGreedy(#20387)
+is_greedy(#20387)
 rangeQuantifierLowerBound(#20387,1)
 rangeQuantifierUpperBound(#20387,2)
 #20389=*
@@ -1670,7 +1670,7 @@ regexpterm(#20542,11,#20541,0,"a{")
 regexpterm(#20542,11,#20541,0,"a{")
 #20543=@"loc,{#10000},37,2,37,3"
 locations_default(#20543,#10000,37,2,37,3)
-hasLocation(#20542,#20543)
+hasLocation(#20542,#20543)
 is_greedy(#20542)
 rangeQuantifierLowerBound(#20542,0)
 rangeQuantifierUpperBound(#20542,0)
@@ -1709,7 +1709,7 @@ regexpterm(#20554,11,#20552,0,"a{")
 regexpterm(#20554,11,#20552,0,"a{")
 #20555=@"loc,{#10000},38,2,38,3"
 locations_default(#20555,#10000,38,2,38,3)
-hasLocation(#20554,#20555)
+hasLocation(#20554,#20555)
 is_greedy(#20554)
 rangeQuantifierLowerBound(#20554,0)
 rangeQuantifierUpperBound(#20554,0)
@@ -1756,7 +1756,7 @@ regexpterm(#20568,11,#20567,0,"a{2")
 regexpterm(#20568,11,#20567,0,"a{2")
 #20569=@"loc,{#10000},39,2,39,4"
 locations_default(#20569,#10000,39,2,39,4)
-hasLocation(#20568,#20569)
+hasLocation(#20568,#20569)
 is_greedy(#20568)
 rangeQuantifierLowerBound(#20568,2)
 rangeQuantifierUpperBound(#20568,2)
@@ -1875,7 +1875,7 @@ regexpterm(#20602,8,#20596,2,"[^>]*")
 regexpterm(#20602,8,#20596,2,"[^>]*")
 #20603=@"loc,{#10000},44,8,44,12"
 locations_default(#20603,#10000,44,8,44,12)
-hasLocation(#20602,#20603)
+hasLocation(#20602,#20603)
 is_greedy(#20602)
 #20604=*
 regexpterm(#20604,23,#20602,0,"[^>]")
@@ -1936,7 +1936,7 @@ regexpterm(#20624,9,#20622,0,"[^<]+")
 regexpterm(#20624,9,#20622,0,"[^<]+")
 #20625=@"loc,{#10000},44,22,44,26"
 locations_default(#20625,#10000,44,22,44,26)
-hasLocation(#20624,#20625)
+hasLocation(#20624,#20625)
 is_greedy(#20624)
 #20626=*
 regexpterm(#20626,23,#20624,0,"[^<]")
@@ -1992,7 +1992,7 @@ regexpterm(#20644,8,#20638,2,"[^>]*")
 regexpterm(#20644,8,#20638,2,"[^>]*")
 #20645=@"loc,{#10000},44,41,44,45"
 locations_default(#20645,#10000,44,41,44,45)
-hasLocation(#20644,#20645)
+hasLocation(#20644,#20645)
 is_greedy(#20644)
 #20646=*
 regexpterm(#20646,23,#20644,0,"[^>]")

javascript/extractor/tests/regexp/output/trap/es2018.js.trap

@@ -147,7 +147,7 @@ regexpterm(#20049,9,#20047,0,"\s+")
 #20050=@"loc,{#10000},1,9,1,11"
 locations_default(#20050,#10000,1,9,1,11)
 hasLocation(#20049,#20050)
-isGreedy(#20049)
+is_greedy(#20049)
 #20051=*
 regexpterm(#20051,20,#20049,0,"\s")
 #20052=@"loc,{#10000},1,9,1,10"
@@ -159,7 +159,7 @@ regexpterm(#20053,9,#20043,2,"\w+")
 #20054=@"loc,{#10000},1,13,1,15"
 locations_default(#20054,#10000,1,13,1,15)
 hasLocation(#20053,#20054)
-isGreedy(#20053)
+is_greedy(#20053)
 #20055=*
 regexpterm(#20055,20,#20053,0,"\w")
 #20056=@"loc,{#10000},1,13,1,14"

javascript/extractor/tests/regexp/output/trap/odasa-1934.js.trap

@@ -298,7 +298,7 @@ regexpterm(#20096,9,#20095,0,"[\x]+")
 #20097=@"loc,{#10000},5,9,5,13"
 locations_default(#20097,#10000,5,9,5,13)
 hasLocation(#20096,#20097)
-isGreedy(#20096)
+is_greedy(#20096)
 #20098=*
 regexpterm(#20098,23,#20096,0,"[\x]")
 #20099=@"loc,{#10000},5,9,5,12"

javascript/ql/src/semmle/javascript/Aliases.qll

@@ -225,3 +225,8 @@ deprecated predicate jsParseErrors(JSParseError id, TopLevel toplevel, string me
  * Use the `RegExpParseError` class instead.
  */ 
 deprecated predicate regexpParseErrors(RegExpParseError id, RegExpTerm regexp, string message) { regexp_parse_errors(id, regexp, message) }
+/**
+ * Alias for the predicate `is_greedy` defined in the .dbscheme.
+ * Use `RegExpQuantifier#isGreedy` instead.
+ */ 
+deprecated predicate isGreedy(RegExpQuantifier id) { is_greedy(id) }

javascript/ql/src/semmle/javascript/Regexp.qll

@@ -188,7 +188,7 @@ class RegExpTerm extends Locatable, @regexpterm {
  */
 class RegExpQuantifier extends RegExpTerm, @regexp_quantifier {
   /** Holds if the quantifier of this term is a greedy quantifier. */
-  predicate isGreedy() { isGreedy(this) }
+  predicate isGreedy() { is_greedy(this) }
 }
 
 /**

javascript/ql/src/semmlecode.javascript.dbscheme

@@ -877,7 +877,7 @@ regexp_parse_errors (unique int id: @regexp_parse_error,
 @regexp_subpattern = @regexp_lookahead | @regexp_lookbehind;
 @regexp_anchor = @regexp_dollar | @regexp_caret;
 
-isGreedy (int id: @regexp_quantifier ref);
+is_greedy (int id: @regexp_quantifier ref);
 rangeQuantifierLowerBound (unique int id: @regexp_range ref, int lo: int ref);
 rangeQuantifierUpperBound (unique int id: @regexp_range ref, int hi: int ref);
 isCapture (unique int id: @regexp_group ref, int number: int ref);

javascript/ql/src/semmlecode.javascript.dbscheme.stats

@@ -20061,7 +20061,7 @@
 </dependencies>
 </relation>
 <relation>
-<name>isGreedy</name>
+<name>is_greedy</name>
 <cardinality>2629</cardinality>
 <columnsizes>
 <e>

javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties

@@ -64,3 +64,5 @@ js_parse_errors.rel: reorder jsParseErrors.rel(int id, int toplevel, string mess
 jsParseErrors.rel: delete
 regexp_parse_errors.rel: reorder regexpParseErrors.rel(int id, int regexp, string message) id regexp message
 regexpParseErrors.rel: delete
+is_greedy.rel: reorder isGreedy.rel(int id) id
+isGreedy.rel: delete