Swift: change some children

redsun82 · redsun82 · commit 4825e6b8bae2 · 2022-08-30T17:30:39.000+02:00
* made `members` children of an `IterableDeclContext`
* removed `elements` from the children of `EnumCaseDecl`, as they are
  already children of the enclosing `EnumDecl`
* removed `base` from the children of `SelfApplyExpr`, as they currently
  are already descendants via `getArgument(0).getExpr()`. We should
  maybe consider either removing `base` from the schema and add it as
  a shortcut on QL, or finish up replacing all `SelfApplyExpr` instances
  with synthesized types.
diff --git a/swift/codegen/schema.yml b/swift/codegen/schema.yml
@@ -60,7 +60,8 @@ Type:
   canonical_type: Type
 
 IterableDeclContext:
-  members: Decl*
+  _children:
+    members: Decl*
 
 ExtensionDecl:
   extended_type_decl: NominalTypeDecl
@@ -293,8 +294,7 @@ TypeAliasType:
 
 EnumCaseDecl:
   _extends: Decl
-  _children:
-    elements: EnumElementDecl*
+  elements: EnumElementDecl*
 
 IfConfigDecl:
   _extends: Decl
@@ -836,8 +836,7 @@ PrefixUnaryExpr:
 
 SelfApplyExpr:
   _extends: ApplyExpr
-  _children:
-    base: Expr
+  base: Expr
 
 ArrayExpr:
   _extends: CollectionExpr
diff --git a/swift/ql/lib/codeql/swift/generated/ParentChild.qll b/swift/ql/lib/codeql/swift/generated/ParentChild.qll
@@ -60,14 +60,18 @@ private module Impl {
   private Element getImmediateChildOfIterableDeclContext(
     IterableDeclContext e, int index, string partialPredicateCall
   ) {
-    exists(int b, int bElement, int n |
+    exists(int b, int bElement, int n, int nMember |
       b = 0 and
       bElement = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfElement(e, i, _)) | i) and
       n = bElement and
+      nMember = n + 1 + max(int i | i = -1 or exists(e.getImmediateMember(i)) | i) and
       (
         none()
         or
         result = getImmediateChildOfElement(e, index - b, partialPredicateCall)
+        or
+        result = e.getImmediateMember(index - n) and
+        partialPredicateCall = "Member(" + (index - n).toString() + ")"
       )
     )
   }
@@ -1562,18 +1566,14 @@ private module Impl {
   private Element getImmediateChildOfEnumCaseDecl(
     EnumCaseDecl e, int index, string partialPredicateCall
   ) {
-    exists(int b, int bDecl, int n, int nElement |
+    exists(int b, int bDecl, int n |
       b = 0 and
       bDecl = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfDecl(e, i, _)) | i) and
       n = bDecl and
-      nElement = n + 1 + max(int i | i = -1 or exists(e.getImmediateElement(i)) | i) and
       (
         none()
         or
         result = getImmediateChildOfDecl(e, index - b, partialPredicateCall)
-        or
-        result = e.getImmediateElement(index - n) and
-        partialPredicateCall = "Element(" + (index - n).toString() + ")"
       )
     )
   }
@@ -3970,17 +3970,14 @@ private module Impl {
   private Element getImmediateChildOfSelfApplyExpr(
     SelfApplyExpr e, int index, string partialPredicateCall
   ) {
-    exists(int b, int bApplyExpr, int n, int nBase |
+    exists(int b, int bApplyExpr, int n |
       b = 0 and
       bApplyExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfApplyExpr(e, i, _)) | i) and
       n = bApplyExpr and
-      nBase = n + 1 and
       (
         none()
         or
         result = getImmediateChildOfApplyExpr(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getImmediateBase() and partialPredicateCall = "Base()"
       )
     )
   }

Original file line number	Diff line number	Diff line change
`@@ -60,14 +60,18 @@ private module Impl {`
`60`	`60`	`private Element getImmediateChildOfIterableDeclContext(`
`61`	`61`	`IterableDeclContext e, int index, string partialPredicateCall`
`62`	`62`	`) {`
`63`		`- exists(int b, int bElement, int n \|`
	`63`	`+ exists(int b, int bElement, int n, int nMember \|`
`64`	`64`	`b = 0 and`
`65`	`65`	`bElement = b + 1 + max(int i \| i = -1 or exists(getImmediateChildOfElement(e, i, _)) \| i) and`
`66`	`66`	`n = bElement and`
	`67`	`+ nMember = n + 1 + max(int i \| i = -1 or exists(e.getImmediateMember(i)) \| i) and`
`67`	`68`	`(`
`68`	`69`	`none()`
`69`	`70`	`or`
`70`	`71`	`result = getImmediateChildOfElement(e, index - b, partialPredicateCall)`
	`72`	`+ or`
	`73`	`+ result = e.getImmediateMember(index - n) and`
	`74`	`+ partialPredicateCall = "Member(" + (index - n).toString() + ")"`
`71`	`75`	`)`
`72`	`76`	`)`
`73`	`77`	`}`
`@@ -1562,18 +1566,14 @@ private module Impl {`
`1562`	`1566`	`private Element getImmediateChildOfEnumCaseDecl(`
`1563`	`1567`	`EnumCaseDecl e, int index, string partialPredicateCall`
`1564`	`1568`	`) {`
`1565`		`- exists(int b, int bDecl, int n, int nElement \|`
	`1569`	`+ exists(int b, int bDecl, int n \|`
`1566`	`1570`	`b = 0 and`
`1567`	`1571`	`bDecl = b + 1 + max(int i \| i = -1 or exists(getImmediateChildOfDecl(e, i, _)) \| i) and`
`1568`	`1572`	`n = bDecl and`
`1569`		`- nElement = n + 1 + max(int i \| i = -1 or exists(e.getImmediateElement(i)) \| i) and`
`1570`	`1573`	`(`
`1571`	`1574`	`none()`
`1572`	`1575`	`or`
`1573`	`1576`	`result = getImmediateChildOfDecl(e, index - b, partialPredicateCall)`
`1574`		`- or`
`1575`		`- result = e.getImmediateElement(index - n) and`
`1576`		`- partialPredicateCall = "Element(" + (index - n).toString() + ")"`
`1577`	`1577`	`)`
`1578`	`1578`	`)`
`1579`	`1579`	`}`
`@@ -3970,17 +3970,14 @@ private module Impl {`
`3970`	`3970`	`private Element getImmediateChildOfSelfApplyExpr(`
`3971`	`3971`	`SelfApplyExpr e, int index, string partialPredicateCall`
`3972`	`3972`	`) {`
`3973`		`- exists(int b, int bApplyExpr, int n, int nBase \|`
	`3973`	`+ exists(int b, int bApplyExpr, int n \|`
`3974`	`3974`	`b = 0 and`
`3975`	`3975`	`bApplyExpr = b + 1 + max(int i \| i = -1 or exists(getImmediateChildOfApplyExpr(e, i, _)) \| i) and`
`3976`	`3976`	`n = bApplyExpr and`
`3977`		`- nBase = n + 1 and`
`3978`	`3977`	`(`
`3979`	`3978`	`none()`
`3980`	`3979`	`or`
`3981`	`3980`	`result = getImmediateChildOfApplyExpr(e, index - b, partialPredicateCall)`
`3982`		`- or`
`3983`		`- index = n and result = e.getImmediateBase() and partialPredicateCall = "Base()"`
`3984`	`3981`	`)`
`3985`	`3982`	`)`
`3986`	`3983`	`}`