renamed "isDelegating" to "is_delegating"

erik-krogh · erik-krogh · commit 3fb561d72bea · 2020-09-04T11:51:50.000+02:00
diff --git a/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java b/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java
@@ -810,7 +810,7 @@ public Label visit(UpdateExpression nd, Context c) {
     public Label visit(YieldExpression nd, Context c) {
       Label key = super.visit(nd, c);
       visit(nd.getArgument(), key, 0);
-      if (nd.isDelegating()) trapwriter.addTuple("isDelegating", key);
+      if (nd.isDelegating()) trapwriter.addTuple("is_delegating", key);
       return key;
     }
 
diff --git a/javascript/extractor/tests/es2015/output/trap/delegating_yield.js.trap b/javascript/extractor/tests/es2015/output/trap/delegating_yield.js.trap
@@ -155,7 +155,7 @@ literals("g","g",#20049)
 #20050=@"var;{g};{#20000}"
 variables(#20050,"g",#20000)
 bind(#20049,#20050)
-isDelegating(#20045)
+is_delegating(#20045)
 #20051=*
 entry_cfg_node(#20051,#20001)
 #20052=@"loc,{#10000},1,1,1,0"
diff --git a/javascript/extractor/tests/flow/output/trap/explicitTypeParameters.js.trap b/javascript/extractor/tests/flow/output/trap/explicitTypeParameters.js.trap
@@ -564,7 +564,7 @@ literals("x","x",#20198)
 #20199=@"var;{x};{#20000}"
 variables(#20199,"x",#20000)
 bind(#20198,#20199)
-isDelegating(#20192)
+is_delegating(#20192)
 #20200=*
 stmts(#20200,2,#20001,3,"f4<T6>(v1);")
 hasLocation(#20200,#20013)
diff --git a/javascript/ql/src/semmle/javascript/Aliases.qll b/javascript/ql/src/semmle/javascript/Aliases.qll
@@ -130,3 +130,8 @@ deprecated predicate exprContainers(ExprOrType expr, StmtContainer container) {
  * Use `ArrayExpr#getSize()` instead.
  */ 
 deprecated predicate arraySize(Expr ae, int sz) { array_size(ae, sz) }
+/**
+ * Alias for the predicate `is_delegating` defined in the .dbscheme.
+ * Use `YieldExpr#isDelegating()` instead.
+ */ 
+deprecated predicate isDelegating(YieldExpr yield) { is_delegating(yield) }
diff --git a/javascript/ql/src/semmle/javascript/Expr.qll b/javascript/ql/src/semmle/javascript/Expr.qll
@@ -2128,7 +2128,7 @@ class YieldExpr extends @yieldexpr, Expr {
   Expr getOperand() { result = getChildExpr(0) }
 
   /** Holds if this is a `yield*` expression. */
-  predicate isDelegating() { isDelegating(this) }
+  predicate isDelegating() { is_delegating(this) }
 
   override predicate isImpure() { any() }
 
diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme b/javascript/ql/src/semmlecode.javascript.dbscheme
@@ -226,7 +226,7 @@ expr_containers (unique int expr: @exprortype ref,
 array_size (unique int ae: @arraylike ref,
        int sz: int ref);
 
-isDelegating (int yield: @yieldexpr ref);
+is_delegating (int yield: @yieldexpr ref);
 
 @exprorstmt = @expr | @stmt;
 @exprortype = @expr | @typeexpr;
diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme.stats b/javascript/ql/src/semmlecode.javascript.dbscheme.stats
@@ -11471,7 +11471,7 @@
 </dependencies>
 </relation>
 <relation>
-<name>isDelegating</name>
+<name>is_delegating</name>
 <cardinality>4</cardinality>
 <columnsizes>
 <e>
diff --git a/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties b/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties
@@ -26,3 +26,5 @@ expr_containers.rel: reorder exprContainers.rel(int expr, int container) expr co
 exprContainers.rel: delete
 array_size.rel: reorder arraySize.rel(int ae, int sz) ae sz
 arraySize.rel: delete
+is_delegating.rel: reorder isDelegating.rel(int yield) yield
+isDelegating.rel: delete

Original file line number	Diff line number	Diff line change
`@@ -810,7 +810,7 @@ public Label visit(UpdateExpression nd, Context c) {`
`810`	`810`	`public Label visit(YieldExpression nd, Context c) {`
`811`	`811`	`Label key = super.visit(nd, c);`
`812`	`812`	`visit(nd.getArgument(), key, 0);`
`813`		`- if (nd.isDelegating()) trapwriter.addTuple("isDelegating", key);`
	`813`	`+ if (nd.isDelegating()) trapwriter.addTuple("is_delegating", key);`
`814`	`814`	`return key;`
`815`	`815`	`}`
`816`	`816`