From ba098c3b1b7b26409fdec2223408ce7220e7dd04 Mon Sep 17 00:00:00 2001 From: Paolo Tranquilli Date: Fri, 24 Nov 2023 07:04:03 +0100 Subject: [PATCH] Swift: make `kind` and `macro_syntax` in `MacroRole` internal --- swift/ql/.generated.list | 2 +- swift/ql/lib/codeql/swift/generated/MacroRole.qll | 4 ++++ swift/schema.py | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/swift/ql/.generated.list b/swift/ql/.generated.list index 528618a3b77..0460b21d8a1 100644 --- a/swift/ql/.generated.list +++ b/swift/ql/.generated.list @@ -401,7 +401,7 @@ lib/codeql/swift/generated/File.qll 27b43d817c9335a3d11686b7a09369f5cbf4b1f6a5b7 lib/codeql/swift/generated/KeyPathComponent.qll cdfd7123f6b03186f36204eac00a0e5a1ee323fd42c3e8997da3390cb4989caf 96fa51fbf43b690c10b13201446af73ec9c4d57187eef80b4f70689323bcf35f lib/codeql/swift/generated/Locatable.qll 6cb437dd7ff7331429ec6586b0af50b1af15e4f72be47b5c89278923d4a9cea0 a93ac33767e077fa5a4c65b2110111de1939c9bb73fecdaf5aee80dce54469b7 lib/codeql/swift/generated/Location.qll 3f3bad413be87d05a596fe7b8004f415c2caa98cb759021a6aad20b589b7d700 ed30ed646962b3ffb6b47c97c6434fe47a6b1ea8e3f2e0589577bea5cf96c88e -lib/codeql/swift/generated/MacroRole.qll 8d15ac897080165635e0728f2b45d9b3066759b26c487f0456b821a1b08c1482 678ef0077de578e13472ec58c124397cd66b913db503f4db558aef919266b892 +lib/codeql/swift/generated/MacroRole.qll aaf5631c49de81e046854955341202d6d3516713cd09bc2e7b870e40c261cc9f 6cd17d40cbf1d8fa4ef01dfb8b3462b7cee902e6058fb76417c2035be12481d1 lib/codeql/swift/generated/OtherAvailabilitySpec.qll 06393a08e8da36106c5ec6efb9f1bd56a5c7b3d3f3d0bcefc6fa07fa96860c31 06393a08e8da36106c5ec6efb9f1bd56a5c7b3d3f3d0bcefc6fa07fa96860c31 lib/codeql/swift/generated/ParentChild.qll fffa8748471139e0143521443cb7bf566db136f932e80e1917e7ab7140389835 c7768c3ad33fb1934b7b8955d09fe1d2978187e8d1f59a9ba0595f5bcb884d2d lib/codeql/swift/generated/PlatformVersionAvailabilitySpec.qll 5355be9da8b778d1d8ae60d25d9c3394477da24f94e8a6ab4484c6a16d07cd7c 075438c1762ec0a7775004b39032dcf85aada038a4269e6f428c34b8282786e9 diff --git a/swift/ql/lib/codeql/swift/generated/MacroRole.qll b/swift/ql/lib/codeql/swift/generated/MacroRole.qll index 4c42045876c..7033fa385ec 100644 --- a/swift/ql/lib/codeql/swift/generated/MacroRole.qll +++ b/swift/ql/lib/codeql/swift/generated/MacroRole.qll @@ -24,11 +24,15 @@ module Generated { /** * Gets the kind of this macro role (declaration, expression, member, etc.). + * + * INTERNAL: Do not use. */ int getKind() { result = Synth::convertMacroRoleToRaw(this).(Raw::MacroRole).getKind() } /** * Gets the #freestanding or @attached. + * + * INTERNAL: Do not use. */ int getMacroSyntax() { result = Synth::convertMacroRoleToRaw(this).(Raw::MacroRole).getMacroSyntax() diff --git a/swift/schema.py b/swift/schema.py index 2f8593d94c6..625e5825c32 100644 --- a/swift/schema.py +++ b/swift/schema.py @@ -1367,8 +1367,8 @@ class MacroRole(AstNode): """ The role of a macro, for example #freestanding(declaration) or @attached(member). """ - kind: int | doc("kind of this macro role (declaration, expression, member, etc.)") - macro_syntax: int | doc("#freestanding or @attached") + kind: int | doc("kind of this macro role (declaration, expression, member, etc.)") | ql.internal + macro_syntax: int | doc("#freestanding or @attached") | ql.internal conformances: list[TypeExpr] | doc("conformances of this macro role") names: list[string] | doc("names of this macro role")