Swift: rework IfConfigDecl schema

Author: redsun82

swift/codegen/schema.yml

@@ -299,15 +299,7 @@ EnumCaseDecl:
 IfConfigDecl:
   _extends: Decl
   _children:
-    clauses: IfConfigClause*
-
-IfConfigClause:
-  _extends: Locatable
-  _children:
-    condition: Expr?
-    elements: AstNode*
-  is_active: predicate
-  _dir: decl
+    active_elements: AstNode*
 
 ImportDecl:
   _extends: Decl

swift/ql/lib/codeql/swift/elements.qll

@@ -29,7 +29,6 @@ import codeql.swift.elements.decl.FuncDecl
 import codeql.swift.elements.decl.GenericContext
 import codeql.swift.elements.decl.GenericTypeDecl
 import codeql.swift.elements.decl.GenericTypeParamDecl
-import codeql.swift.elements.decl.IfConfigClause
 import codeql.swift.elements.decl.IfConfigDecl
 import codeql.swift.elements.decl.ImportDecl
 import codeql.swift.elements.decl.InfixOperatorDecl

swift/ql/lib/codeql/swift/elements/decl/IfConfigClause.qll

@@ -332,28 +332,6 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfIfConfigClause(
-    IfConfigClause e, int index, string partialPredicateCall
-  ) {
-    exists(int b, int bLocatable, int n, int nCondition, int nElement |
-      b = 0 and
-      bLocatable = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfLocatable(e, i, _)) | i) and
-      n = bLocatable and
-      nCondition = n + 1 and
-      nElement = nCondition + 1 + max(int i | i = -1 or exists(e.getImmediateElement(i)) | i) and
-      (
-        none()
-        or
-        result = getImmediateChildOfLocatable(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getImmediateCondition() and partialPredicateCall = "Condition()"
-        or
-        result = e.getImmediateElement(index - nCondition) and
-        partialPredicateCall = "Element(" + (index - nCondition).toString() + ")"
-      )
-    )
-  }
-
   private Element getImmediateChildOfInOutType(InOutType e, int index, string partialPredicateCall) {
     exists(int b, int bType, int n |
       b = 0 and
@@ -1763,18 +1741,18 @@ private module Impl {
   private Element getImmediateChildOfIfConfigDecl(
     IfConfigDecl e, int index, string partialPredicateCall
   ) {
-    exists(int b, int bDecl, int n, int nClause |
+    exists(int b, int bDecl, int n, int nActiveElement |
       b = 0 and
       bDecl = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfDecl(e, i, _)) | i) and
       n = bDecl and
-      nClause = n + 1 + max(int i | i = -1 or exists(e.getImmediateClause(i)) | i) and
+      nActiveElement = n + 1 + max(int i | i = -1 or exists(e.getImmediateActiveElement(i)) | i) and
       (
         none()
         or
         result = getImmediateChildOfDecl(e, index - b, partialPredicateCall)
         or
-        result = e.getImmediateClause(index - n) and
-        partialPredicateCall = "Clause(" + (index - n).toString() + ")"
+        result = e.getImmediateActiveElement(index - n) and
+        partialPredicateCall = "ActiveElement(" + (index - n).toString() + ")"
       )
     )
   }
@@ -4796,8 +4774,6 @@ private module Impl {
     or
     result = getImmediateChildOfExistentialType(e, index, partialAccessor)
     or
-    result = getImmediateChildOfIfConfigClause(e, index, partialAccessor)
-    or
     result = getImmediateChildOfInOutType(e, index, partialAccessor)
     or
     result = getImmediateChildOfLValueType(e, index, partialAccessor)

swift/ql/lib/codeql/swift/elements/decl/IfConfigClauseConstructor.qll

@@ -129,16 +129,6 @@ module Raw {
     Type getConstraint() { existential_types(this, result) }
   }
 
-  class IfConfigClause extends @if_config_clause, Locatable {
-    override string toString() { result = "IfConfigClause" }
-
-    Expr getCondition() { if_config_clause_conditions(this, result) }
-
-    AstNode getElement(int index) { if_config_clause_elements(this, index, result) }
-
-    predicate isActive() { if_config_clause_is_active(this) }
-  }
-
   class InOutType extends @in_out_type, Type {
     override string toString() { result = "InOutType" }
 
@@ -587,7 +577,7 @@ module Raw {
   class IfConfigDecl extends @if_config_decl, Decl {
     override string toString() { result = "IfConfigDecl" }
 
-    IfConfigClause getClause(int index) { if_config_decl_clauses(this, index, result) }
+    AstNode getActiveElement(int index) { if_config_decl_active_elements(this, index, result) }
   }
 
   class IfExpr extends @if_expr, Expr {

swift/ql/lib/codeql/swift/generated/ParentChild.qll

@@ -22,7 +22,6 @@ module Synth {
     TEnumElementDecl(Raw::EnumElementDecl id) { constructEnumElementDecl(id) } or
     TExtensionDecl(Raw::ExtensionDecl id) { constructExtensionDecl(id) } or
     TGenericTypeParamDecl(Raw::GenericTypeParamDecl id) { constructGenericTypeParamDecl(id) } or
-    TIfConfigClause(Raw::IfConfigClause id) { constructIfConfigClause(id) } or
     TIfConfigDecl(Raw::IfConfigDecl id) { constructIfConfigDecl(id) } or
     TImportDecl(Raw::ImportDecl id) { constructImportDecl(id) } or
     TInfixOperatorDecl(Raw::InfixOperatorDecl id) { constructInfixOperatorDecl(id) } or
@@ -315,7 +314,7 @@ module Synth {
 
   class TFile = TDbFile or TUnknownFile;
 
-  class TLocatable = TArgument or TAstNode or TComment or TConditionElement or TIfConfigClause;
+  class TLocatable = TArgument or TAstNode or TComment or TConditionElement;
 
   class TLocation = TDbLocation or TUnknownLocation;
 
@@ -526,9 +525,6 @@ module Synth {
     result = TGenericTypeParamDecl(e)
   }
 
-  cached
-  TIfConfigClause convertIfConfigClauseFromRaw(Raw::Element e) { result = TIfConfigClause(e) }
-
   cached
   TIfConfigDecl convertIfConfigDeclFromRaw(Raw::Element e) { result = TIfConfigDecl(e) }
 
@@ -1438,8 +1434,6 @@ module Synth {
     result = convertCommentFromRaw(e)
     or
     result = convertConditionElementFromRaw(e)
-    or
-    result = convertIfConfigClauseFromRaw(e)
   }
 
   cached
@@ -2188,9 +2182,6 @@ module Synth {
     e = TGenericTypeParamDecl(result)
   }
 
-  cached
-  Raw::Element convertIfConfigClauseToRaw(TIfConfigClause e) { e = TIfConfigClause(result) }
-
   cached
   Raw::Element convertIfConfigDeclToRaw(TIfConfigDecl e) { e = TIfConfigDecl(result) }
 
@@ -3098,8 +3089,6 @@ module Synth {
     result = convertCommentToRaw(e)
     or
     result = convertConditionElementToRaw(e)
-    or
-    result = convertIfConfigClauseToRaw(e)
   }
 
   cached

swift/ql/lib/codeql/swift/generated/Raw.qll

@@ -14,7 +14,6 @@ import codeql.swift.elements.decl.EnumDeclConstructor
 import codeql.swift.elements.decl.EnumElementDeclConstructor
 import codeql.swift.elements.decl.ExtensionDeclConstructor
 import codeql.swift.elements.decl.GenericTypeParamDeclConstructor
-import codeql.swift.elements.decl.IfConfigClauseConstructor
 import codeql.swift.elements.decl.IfConfigDeclConstructor
 import codeql.swift.elements.decl.ImportDeclConstructor
 import codeql.swift.elements.decl.InfixOperatorDeclConstructor

swift/ql/lib/codeql/swift/generated/Synth.qll

@@ -1,22 +1,22 @@
 // generated by codegen/codegen.py
 private import codeql.swift.generated.Synth
 private import codeql.swift.generated.Raw
+import codeql.swift.elements.AstNode
 import codeql.swift.elements.decl.Decl
-import codeql.swift.elements.decl.IfConfigClause
 
 class IfConfigDeclBase extends Synth::TIfConfigDecl, Decl {
   override string getAPrimaryQlClass() { result = "IfConfigDecl" }
 
-  IfConfigClause getImmediateClause(int index) {
+  AstNode getImmediateActiveElement(int index) {
     result =
-      Synth::convertIfConfigClauseFromRaw(Synth::convertIfConfigDeclToRaw(this)
+      Synth::convertAstNodeFromRaw(Synth::convertIfConfigDeclToRaw(this)
             .(Raw::IfConfigDecl)
-            .getClause(index))
+            .getActiveElement(index))
   }
 
-  final IfConfigClause getClause(int index) { result = getImmediateClause(index).resolve() }
+  final AstNode getActiveElement(int index) { result = getImmediateActiveElement(index).resolve() }
 
-  final IfConfigClause getAClause() { result = getClause(_) }
+  final AstNode getAnActiveElement() { result = getActiveElement(_) }
 
-  final int getNumberOfClauses() { result = count(getAClause()) }
+  final int getNumberOfActiveElements() { result = count(getAnActiveElement()) }
 }