Swift: finish downgrade script for for-in PR

Author: Robert Marsh

swift/downgrades/309d412a592bd14eb8bf3d57e1f3f0915f5ced9c/for_in_downgrade.ql

@@ -113,12 +113,22 @@ query predicate new_concrete_var_decls(Element decl, int introducer_int) {
   not exists(ForEachStmt stmt | stmt.getIteratorVarConcreteDecl() = decl)
 }
 
-query predicate new_var_decls(NewElement decl, string name, Element type) {
+query predicate new_var_decls(Element decl, string name, Element type) {
   var_decls(decl, name, type) and
   not exists(ForEachStmt stmt | stmt.getIteratorVarConcreteDecl() = decl)
 }
 
-query predicate new_expr_types(NewElement expr, NewElement type) {
+query predicate new_var_decl_parent_patterns(Element decl, Element pattern) {
+  var_decl_parent_patterns(decl, pattern) and
+  not exists(ForEachStmt stmt | stmt.getIteratorVarConcreteDecl() = decl)
+}
+
+query predicate new_var_decl_parent_initializers(Element decl, Element init) {
+  var_decl_parent_initializers(decl, init) and
+  not exists(ForEachStmt stmt | stmt.getIteratorVarConcreteDecl() = decl)
+}
+
+query predicate new_expr_types(Element expr, Element type) {
   expr_types(expr, type) and
   not exists(ForEachStmt stmt |
     expr = stmt.getNextCall() or

swift/downgrades/309d412a592bd14eb8bf3d57e1f3f0915f5ced9c/upgrade.properties

@@ -18,4 +18,6 @@ call_exprs.rel: run for_in_downgrade.qlo new_call_exprs
 locatable_locations.rel: run for_in_downgrade.qlo new_locatable_locations
 var_decls.rel: run for_in_downgrade.qlo new_var_decls
 concrete_var_decls.rel: run for_in_downgrade.qlo new_concrete_var_decls
-expr_types.rel: run for_in_downgrade.qlo new_expr_types
+expr_types.rel: run for_in_downgrade.qlo new_expr_types
+var_decl_parent_initializers.rel: run for_in_upgrade.qlo new_var_decl_parent_initializers
+var_decl_parent_patterns.rel: run for_in_upgrade.qlo new_var_decl_parent_patterns