renamed "isForAwaitOf" to "is_for_await_of"

erik-krogh · erik-krogh · commit 99f888784483 · 2020-09-04T11:51:47.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
@@ -1084,7 +1084,7 @@ public Label visit(EnhancedForStatement nd, Context c) {
       contextManager.leaveLoopStmt();
       if (!lexicals.isEmpty()) scopeManager.leaveScope();
       if (nd instanceof ForOfStatement && ((ForOfStatement) nd).isAwait())
-        trapwriter.addTuple("isForAwaitOf", key);
+        trapwriter.addTuple("is_for_await_of", key);
       return key;
     }
 
diff --git a/javascript/extractor/tests/esnext/output/trap/async-generators.js.trap b/javascript/extractor/tests/esnext/output/trap/async-generators.js.trap
@@ -283,7 +283,7 @@ decl(#20092,#20080)
 stmts(#20093,0,#20084,2,";")
 hasLocation(#20093,#20062)
 stmt_containers(#20093,#20076)
-isForAwaitOf(#20084)
+is_for_await_of(#20084)
 #20094=*
 entry_cfg_node(#20094,#20001)
 #20095=@"loc,{#10000},1,1,1,0"
diff --git a/javascript/ql/src/semmle/javascript/Aliases.qll b/javascript/ql/src/semmle/javascript/Aliases.qll
@@ -110,3 +110,8 @@ deprecated predicate isInstantiated(NamespaceDeclaration decl) { is_instantiated
  * Alias for the predicate `has_declare_keyword` defined in the .dbscheme.
  */ 
 deprecated predicate hasDeclareKeyword(ASTNode stmt) { has_declare_keyword(stmt) }
+/**
+ * Alias for the predicate `is_for_await_of` defined in the .dbscheme.
+ * Use `ForOfStmt#isAwait()` instead.
+ */ 
+deprecated predicate isForAwaitOf(ForOfStmt forof) { is_for_await_of(forof) }
diff --git a/javascript/ql/src/semmle/javascript/Stmt.qll b/javascript/ql/src/semmle/javascript/Stmt.qll
@@ -895,7 +895,7 @@ class ForOfStmt extends @forofstmt, EnhancedForLoop {
   /**
    * Holds if this is a `for-await-of` statement.
    */
-  predicate isAwait() { isForAwaitOf(this) }
+  predicate isAwait() { is_for_await_of(this) }
 }
 
 /**
diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme b/javascript/ql/src/semmlecode.javascript.dbscheme
@@ -203,7 +203,7 @@ is_instantiated(unique int decl: @namespacedeclaration ref);
 @declarablenode = @declstmt | @namespacedeclaration | @classdeclstmt | @functiondeclstmt | @enumdeclaration | @externalmoduledeclaration | @globalaugmentationdeclaration | @field;
 has_declare_keyword(unique int stmt: @declarablenode ref);
 
-isForAwaitOf(unique int forof: @forofstmt ref);
+is_for_await_of(unique int forof: @forofstmt ref);
 
 // expressions
 #keyset[parent, idx]
diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme.stats b/javascript/ql/src/semmlecode.javascript.dbscheme.stats
@@ -9216,7 +9216,7 @@
 </dependencies>
 </relation>
 <relation>
-<name>isForAwaitOf</name>
+<name>is_for_await_of</name>
 <cardinality>1</cardinality>
 <columnsizes>
 <e>
diff --git a/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties b/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties
@@ -18,3 +18,5 @@ is_instantiated.rel: reorder isInstantiated.rel(int decl) decl
 isInstantiated.rel: delete
 has_declare_keyword.rel: reorder hasDeclareKeyword.rel(int stmt) stmt
 hasDeclareKeyword.rel: delete
+is_for_await_of.rel: reorder isForAwaitOf.rel(int forof) forof
+isForAwaitOf.rel: delete

Original file line number	Diff line number	Diff line change
`@@ -1084,7 +1084,7 @@ public Label visit(EnhancedForStatement nd, Context c) {`
`1084`	`1084`	`contextManager.leaveLoopStmt();`
`1085`	`1085`	`if (!lexicals.isEmpty()) scopeManager.leaveScope();`
`1086`	`1086`	`if (nd instanceof ForOfStatement && ((ForOfStatement) nd).isAwait())`
`1087`		`- trapwriter.addTuple("isForAwaitOf", key);`
	`1087`	`+ trapwriter.addTuple("is_for_await_of", key);`
`1088`	`1088`	`return key;`
`1089`	`1089`	`}`
`1090`	`1090`
Original file line number	Diff line number	Diff line change
`@@ -895,7 +895,7 @@ class ForOfStmt extends @forofstmt, EnhancedForLoop {`
`895`	`895`	`/**`
`896`	`896`	* Holds if this is a `for-await-of` statement.
`897`	`897`	`*/`
`898`		`- predicate isAwait() { isForAwaitOf(this) }`
	`898`	`+ predicate isAwait() { is_for_await_of(this) }`
`899`	`899`	`}`
`900`	`900`
`901`	`901`	`/**`