From 355fd85c2306115b573016b557947863d9149f94 Mon Sep 17 00:00:00 2001 From: Paolo Tranquilli Date: Wed, 25 Jun 2025 12:02:13 +0200 Subject: [PATCH] Codegen: remove unneeded `has|getNumberOf` in instance tests --- misc/codegen/generators/qlgen.py | 4 - misc/codegen/test/test_qlgen.py | 4 - rust/ql/.generated.list | 298 +++++++++--------- .../generated/Abi/Abi.expected | 2 +- .../test/extractor-tests/generated/Abi/Abi.ql | 7 +- .../generated/ArgList/ArgList.expected | 2 +- .../generated/ArgList/ArgList.ql | 7 +- .../ArrayListExpr/ArrayListExpr.expected | 2 +- .../generated/ArrayListExpr/ArrayListExpr.ql | 12 +- .../ArrayRepeatExpr/ArrayRepeatExpr.expected | 2 +- .../ArrayRepeatExpr/ArrayRepeatExpr.ql | 9 +- .../ArrayTypeRepr/ArrayTypeRepr.expected | 2 +- .../generated/ArrayTypeRepr/ArrayTypeRepr.ql | 12 +- .../generated/AsmConst/AsmConst.expected | 2 +- .../generated/AsmConst/AsmConst.ql | 6 +- .../generated/AsmExpr/AsmExpr.expected | 2 +- .../generated/AsmExpr/AsmExpr.ql | 15 +- .../generated/AsmLabel/AsmLabel.expected | 2 +- .../generated/AsmLabel/AsmLabel.ql | 7 +- .../AsmOperandExpr/AsmOperandExpr.expected | 4 +- .../AsmOperandExpr/AsmOperandExpr.ql | 12 +- .../AsmOperandNamed/AsmOperandNamed.expected | 4 +- .../AsmOperandNamed/AsmOperandNamed.ql | 12 +- .../AsmOptionsList/AsmOptionsList.expected | 2 +- .../AsmOptionsList/AsmOptionsList.ql | 9 +- .../AsmRegOperand/AsmRegOperand.expected | 4 +- .../generated/AsmRegOperand/AsmRegOperand.ql | 15 +- .../generated/AsmRegSpec/AsmRegSpec.expected | 4 +- .../generated/AsmRegSpec/AsmRegSpec.ql | 7 +- .../generated/AsmSym/AsmSym.expected | 2 +- .../generated/AsmSym/AsmSym.ql | 7 +- .../AssocTypeArg/AssocTypeArg.expected | 2 +- .../generated/AssocTypeArg/AssocTypeArg.ql | 27 +- .../generated/Attr/Attr.expected | 2 +- .../extractor-tests/generated/Attr/Attr.ql | 7 +- .../generated/AwaitExpr/AwaitExpr.expected | 2 +- .../generated/AwaitExpr/AwaitExpr.ql | 12 +- .../generated/BecomeExpr/BecomeExpr.expected | 2 +- .../generated/BecomeExpr/BecomeExpr.ql | 12 +- .../generated/BinaryExpr/BinaryExpr.expected | 10 +- .../generated/BinaryExpr/BinaryExpr.ql | 17 +- .../generated/BlockExpr/BlockExpr.expected | 6 +- .../generated/BlockExpr/BlockExpr.ql | 16 +- .../generated/BoxPat/BoxPat.expected | 4 +- .../generated/BoxPat/BoxPat.ql | 7 +- .../generated/BreakExpr/BreakExpr.expected | 6 +- .../generated/BreakExpr/BreakExpr.ql | 14 +- .../generated/CallExpr/CallExpr.expected | 8 +- .../generated/CallExpr/CallExpr.ql | 17 +- .../generated/CastExpr/CastExpr.expected | 2 +- .../generated/CastExpr/CastExpr.ql | 14 +- .../ClosureBinder/ClosureBinder.expected | 2 +- .../generated/ClosureBinder/ClosureBinder.ql | 9 +- .../ClosureExpr/ClosureExpr.expected | 10 +- .../generated/ClosureExpr/ClosureExpr.ql | 23 +- .../generated/Const/Const.expected | 2 +- .../extractor-tests/generated/Const/Const.ql | 39 +-- .../generated/ConstArg/ConstArg.expected | 2 +- .../generated/ConstArg/ConstArg.ql | 7 +- .../ConstBlockPat/ConstBlockPat.expected | 2 +- .../generated/ConstBlockPat/ConstBlockPat.ql | 7 +- .../generated/ConstParam/ConstParam.expected | 2 +- .../generated/ConstParam/ConstParam.ql | 16 +- .../ContinueExpr/ContinueExpr.expected | 4 +- .../generated/ContinueExpr/ContinueExpr.ql | 12 +- .../DynTraitTypeRepr.expected | 2 +- .../DynTraitTypeRepr/DynTraitTypeRepr.ql | 9 +- .../generated/Enum/Enum.expected | 2 +- .../extractor-tests/generated/Enum/Enum.ql | 41 +-- .../generated/ExprStmt/ExprStmt.expected | 4 +- .../generated/ExprStmt/ExprStmt.ql | 7 +- .../ExternBlock/ExternBlock.expected | 2 +- .../generated/ExternBlock/ExternBlock.ql | 28 +- .../ExternCrate/ExternCrate.expected | 2 +- .../generated/ExternCrate/ExternCrate.ql | 33 +- .../ExternItemList/ExternItemList.expected | 2 +- .../ExternItemList/ExternItemList.ql | 12 +- .../generated/FieldExpr/FieldExpr.expected | 2 +- .../generated/FieldExpr/FieldExpr.ql | 14 +- .../FnPtrTypeRepr/FnPtrTypeRepr.expected | 2 +- .../generated/FnPtrTypeRepr/FnPtrTypeRepr.ql | 13 +- .../generated/ForExpr/ForExpr.expected | 2 +- .../generated/ForExpr/ForExpr.ql | 19 +- .../ForTypeRepr/ForTypeRepr.expected | 2 +- .../generated/ForTypeRepr/ForTypeRepr.ql | 12 +- .../generated/FormatArgsExpr/Format.expected | 34 +- .../generated/FormatArgsExpr/Format.ql | 12 +- .../FormatArgsExpr/FormatArgsArg.expected | 32 +- .../generated/FormatArgsExpr/FormatArgsArg.ql | 11 +- .../FormatArgsExpr/FormatArgsExpr.expected | 30 +- .../FormatArgsExpr/FormatArgsExpr.ql | 17 +- .../FormatArgsExpr/FormatArgument.expected | 38 +-- .../FormatArgsExpr/FormatArgument.ql | 9 +- .../generated/Function/Function.expected | 4 +- .../generated/Function/Function.ql | 47 +-- .../GenericArgList/GenericArgList.expected | 2 +- .../GenericArgList/GenericArgList.ql | 9 +- .../GenericParamList.expected | 4 +- .../GenericParamList/GenericParamList.ql | 9 +- .../generated/IdentPat/IdentPat.expected | 4 +- .../generated/IdentPat/IdentPat.ql | 12 +- .../generated/IfExpr/IfExpr.expected | 4 +- .../generated/IfExpr/IfExpr.ql | 16 +- .../generated/Impl/Impl.expected | 2 +- .../extractor-tests/generated/Impl/Impl.ql | 40 +-- .../ImplTraitTypeRepr.expected | 2 +- .../ImplTraitTypeRepr/ImplTraitTypeRepr.ql | 9 +- .../generated/IndexExpr/IndexExpr.expected | 4 +- .../generated/IndexExpr/IndexExpr.ql | 14 +- .../generated/ItemList/ItemList.expected | 2 +- .../generated/ItemList/ItemList.ql | 12 +- .../generated/Label/Label.expected | 2 +- .../extractor-tests/generated/Label/Label.ql | 7 +- .../generated/LetElse/LetElse.expected | 2 +- .../generated/LetElse/LetElse.ql | 7 +- .../generated/LetExpr/LetExpr.expected | 2 +- .../generated/LetExpr/LetExpr.ql | 14 +- .../generated/LetStmt/LetStmt.expected | 12 +- .../generated/LetStmt/LetStmt.ql | 19 +- .../generated/Lifetime/Lifetime.expected | 4 +- .../generated/Lifetime/Lifetime.ql | 7 +- .../LifetimeArg/LifetimeArg.expected | 2 +- .../generated/LifetimeArg/LifetimeArg.ql | 7 +- .../LifetimeParam/LifetimeParam.expected | 2 +- .../generated/LifetimeParam/LifetimeParam.ql | 14 +- .../LiteralExpr/LiteralExpr.expected | 16 +- .../generated/LiteralExpr/LiteralExpr.ql | 12 +- .../generated/LiteralPat/LiteralPat.expected | 2 +- .../generated/LiteralPat/LiteralPat.ql | 7 +- .../generated/LoopExpr/LoopExpr.expected | 6 +- .../generated/LoopExpr/LoopExpr.ql | 14 +- .../MacroBlockExpr/MacroBlockExpr.expected | 2 +- .../MacroBlockExpr/MacroBlockExpr.ql | 12 +- .../generated/MacroCall/MacroCall.expected | 4 +- .../generated/MacroCall/MacroCall.ql | 33 +- .../generated/MacroDef/MacroDef.expected | 2 +- .../generated/MacroDef/MacroDef.ql | 35 +- .../generated/MacroExpr/MacroExpr.expected | 2 +- .../generated/MacroExpr/MacroExpr.ql | 7 +- .../generated/MacroItems/MacroItems.expected | 4 +- .../generated/MacroItems/MacroItems.ql | 7 +- .../generated/MacroPat/MacroPat.expected | 2 +- .../generated/MacroPat/MacroPat.ql | 7 +- .../generated/MacroRules/MacroRules.expected | 2 +- .../generated/MacroRules/MacroRules.ql | 33 +- .../MacroTypeRepr/MacroTypeRepr.expected | 2 +- .../generated/MacroTypeRepr/MacroTypeRepr.ql | 7 +- .../generated/MatchArm/MatchArm.expected | 8 +- .../generated/MatchArm/MatchArm.ql | 16 +- .../MatchArmList/MatchArmList.expected | 2 +- .../generated/MatchArmList/MatchArmList.ql | 12 +- .../generated/MatchExpr/MatchExpr.expected | 4 +- .../generated/MatchExpr/MatchExpr.ql | 14 +- .../generated/MatchGuard/MatchGuard.expected | 2 +- .../generated/MatchGuard/MatchGuard.ql | 7 +- .../generated/Meta/Meta.expected | 4 +- .../extractor-tests/generated/Meta/Meta.ql | 13 +- .../MethodCallExpr/MethodCallExpr.expected | 4 +- .../MethodCallExpr/MethodCallExpr.ql | 31 +- .../generated/Module/Module.expected | 6 +- .../generated/Module/Module.ql | 33 +- .../generated/Name/Name.expected | 6 +- .../extractor-tests/generated/Name/Name.ql | 7 +- .../generated/NameRef/NameRef.expected | 2 +- .../generated/NameRef/NameRef.ql | 7 +- .../OffsetOfExpr/OffsetOfExpr.expected | 2 +- .../generated/OffsetOfExpr/OffsetOfExpr.ql | 15 +- .../generated/OrPat/OrPat.expected | 2 +- .../extractor-tests/generated/OrPat/OrPat.ql | 7 +- .../generated/Param/Param.expected | 2 +- .../extractor-tests/generated/Param/Param.ql | 14 +- .../generated/ParamList/ParamList.expected | 4 +- .../generated/ParamList/ParamList.ql | 12 +- .../generated/ParenExpr/ParenExpr.expected | 2 +- .../generated/ParenExpr/ParenExpr.ql | 12 +- .../generated/ParenPat/ParenPat.expected | 2 +- .../generated/ParenPat/ParenPat.ql | 7 +- .../ParenTypeRepr/ParenTypeRepr.expected | 2 +- .../generated/ParenTypeRepr/ParenTypeRepr.ql | 7 +- .../ParenthesizedArgList.expected | 2 +- .../ParenthesizedArgList.ql | 9 +- .../generated/Path/Path.expected | 50 +-- .../extractor-tests/generated/Path/Path.ql | 12 +- .../generated/Path/PathExpr.expected | 12 +- .../generated/Path/PathExpr.ql | 21 +- .../generated/Path/PathPat.expected | 2 +- .../extractor-tests/generated/Path/PathPat.ql | 19 +- .../generated/Path/PathSegment.expected | 50 +-- .../generated/Path/PathSegment.ql | 29 +- .../generated/Path/PathTypeRepr.expected | 14 +- .../generated/Path/PathTypeRepr.ql | 7 +- .../generated/PrefixExpr/PrefixExpr.expected | 6 +- .../generated/PrefixExpr/PrefixExpr.ql | 14 +- .../PtrTypeRepr/PtrTypeRepr.expected | 4 +- .../generated/PtrTypeRepr/PtrTypeRepr.ql | 7 +- .../generated/RangeExpr/RangeExpr.expected | 12 +- .../generated/RangeExpr/RangeExpr.ql | 17 +- .../generated/RangePat/RangePat.expected | 6 +- .../generated/RangePat/RangePat.ql | 14 +- .../generated/RefExpr/RefExpr.expected | 8 +- .../generated/RefExpr/RefExpr.ql | 7 +- .../generated/RefPat/RefPat.expected | 4 +- .../generated/RefPat/RefPat.ql | 8 +- .../RefTypeRepr/RefTypeRepr.expected | 4 +- .../generated/RefTypeRepr/RefTypeRepr.ql | 11 +- .../generated/Rename/Rename.expected | 2 +- .../generated/Rename/Rename.ql | 7 +- .../generated/RestPat/RestPat.expected | 2 +- .../generated/RestPat/RestPat.ql | 7 +- .../RetTypeRepr/RetTypeRepr.expected | 4 +- .../generated/RetTypeRepr/RetTypeRepr.ql | 7 +- .../generated/ReturnExpr/ReturnExpr.expected | 4 +- .../generated/ReturnExpr/ReturnExpr.ql | 12 +- .../generated/SelfParam/SelfParam.expected | 10 +- .../generated/SelfParam/SelfParam.ql | 14 +- .../generated/SlicePat/SlicePat.expected | 6 +- .../generated/SlicePat/SlicePat.ql | 7 +- .../SliceTypeRepr/SliceTypeRepr.expected | 2 +- .../generated/SliceTypeRepr/SliceTypeRepr.ql | 7 +- .../generated/SourceFile/SourceFile.expected | 4 +- .../generated/SourceFile/SourceFile.ql | 12 +- .../generated/Static/Static.expected | 2 +- .../generated/Static/Static.ql | 34 +- .../generated/StmtList/StmtList.expected | 4 +- .../generated/StmtList/StmtList.ql | 15 +- .../generated/Struct/Struct.expected | 2 +- .../generated/Struct/Struct.ql | 41 +-- .../generated/StructExpr/StructExpr.expected | 8 +- .../generated/StructExpr/StructExpr.ql | 23 +- .../StructExprField/StructExprField.expected | 4 +- .../StructExprField/StructExprField.ql | 14 +- .../StructExprFieldList.expected | 2 +- .../StructExprFieldList.ql | 14 +- .../StructField/StructField.expected | 2 +- .../generated/StructField/StructField.ql | 18 +- .../StructFieldList/StructFieldList.expected | 2 +- .../StructFieldList/StructFieldList.ql | 7 +- .../generated/StructPat/StructPat.expected | 4 +- .../generated/StructPat/StructPat.ql | 21 +- .../StructPatField/StructPatField.expected | 4 +- .../StructPatField/StructPatField.ql | 14 +- .../StructPatFieldList.expected | 2 +- .../StructPatFieldList/StructPatFieldList.ql | 12 +- .../generated/Trait/AssocItemList.expected | 4 +- .../generated/Trait/AssocItemList.ql | 12 +- .../generated/Trait/Trait.expected | 4 +- .../extractor-tests/generated/Trait/Trait.ql | 39 +-- .../generated/TraitAlias/TraitAlias.expected | 2 +- .../generated/TraitAlias/TraitAlias.ql | 39 +-- .../generated/TryExpr/TryExpr.expected | 2 +- .../generated/TryExpr/TryExpr.ql | 12 +- .../generated/TupleExpr/TupleExpr.expected | 4 +- .../generated/TupleExpr/TupleExpr.ql | 12 +- .../generated/TupleField/TupleField.expected | 4 +- .../generated/TupleField/TupleField.ql | 14 +- .../TupleFieldList/TupleFieldList.expected | 2 +- .../TupleFieldList/TupleFieldList.ql | 7 +- .../generated/TuplePat/TuplePat.expected | 4 +- .../generated/TuplePat/TuplePat.ql | 7 +- .../TupleStructPat/TupleStructPat.expected | 6 +- .../TupleStructPat/TupleStructPat.ql | 21 +- .../TupleTypeRepr/TupleTypeRepr.expected | 4 +- .../generated/TupleTypeRepr/TupleTypeRepr.ql | 7 +- .../generated/TypeAlias/TypeAlias.expected | 4 +- .../generated/TypeAlias/TypeAlias.ql | 41 +-- .../generated/TypeArg/TypeArg.expected | 2 +- .../generated/TypeArg/TypeArg.ql | 7 +- .../generated/TypeBound/TypeBound.expected | 2 +- .../generated/TypeBound/TypeBound.ql | 14 +- .../TypeBoundList/TypeBoundList.expected | 2 +- .../generated/TypeBoundList/TypeBoundList.ql | 7 +- .../generated/TypeParam/TypeParam.expected | 2 +- .../generated/TypeParam/TypeParam.ql | 17 +- .../UnderscoreExpr/UnderscoreExpr.expected | 2 +- .../UnderscoreExpr/UnderscoreExpr.ql | 7 +- .../generated/Union/Union.expected | 2 +- .../extractor-tests/generated/Union/Union.ql | 42 +-- .../generated/Use/Use.expected | 2 +- .../test/extractor-tests/generated/Use/Use.ql | 30 +- .../UseBoundGenericArgs.expected | 2 +- .../UseBoundGenericArgs.ql | 10 +- .../generated/UseTree/UseTree.expected | 14 +- .../generated/UseTree/UseTree.ql | 13 +- .../UseTreeList/UseTreeList.expected | 2 +- .../generated/UseTreeList/UseTreeList.ql | 7 +- .../generated/Variant/Variant.expected | 6 +- .../generated/Variant/Variant.ql | 29 +- .../VariantList/VariantList.expected | 2 +- .../generated/VariantList/VariantList.ql | 7 +- .../generated/Visibility/Visibility.expected | 2 +- .../generated/Visibility/Visibility.ql | 7 +- .../WhereClause/WhereClause.expected | 2 +- .../generated/WhereClause/WhereClause.ql | 9 +- .../generated/WherePred/WherePred.expected | 4 +- .../generated/WherePred/WherePred.ql | 17 +- .../generated/WhileExpr/WhileExpr.expected | 2 +- .../generated/WhileExpr/WhileExpr.ql | 17 +- .../generated/YeetExpr/YeetExpr.expected | 2 +- .../generated/YeetExpr/YeetExpr.ql | 12 +- .../generated/YieldExpr/YieldExpr.expected | 2 +- .../generated/YieldExpr/YieldExpr.ql | 12 +- swift/ql/.generated.list | 110 +++---- .../AvailabilityInfo.expected | 4 +- .../AvailabilityInfo/AvailabilityInfo.ql | 9 +- .../KeyPathComponent.expected | 28 +- .../KeyPathComponent/KeyPathComponent.ql | 12 +- .../generated/decl/Accessor/Accessor.expected | 72 ++--- .../generated/decl/Accessor/Accessor.ql | 27 +- .../AssociatedTypeDecl.expected | 4 +- .../AssociatedTypeDecl/AssociatedTypeDecl.ql | 10 +- .../decl/CapturedDecl/CapturedDecl.expected | 82 ++--- .../decl/CapturedDecl/CapturedDecl.ql | 8 +- .../decl/ClassDecl/ClassDecl.expected | 6 +- .../generated/decl/ClassDecl/ClassDecl.ql | 13 +- .../ConcreteVarDecl/ConcreteVarDecl.expected | 56 ++-- .../decl/ConcreteVarDecl/ConcreteVarDecl.ql | 52 +-- .../decl/EnumDecl/EnumCaseDecl.expected | 24 +- .../generated/decl/EnumDecl/EnumCaseDecl.ql | 11 +- .../generated/decl/EnumDecl/EnumDecl.expected | 10 +- .../generated/decl/EnumDecl/EnumDecl.ql | 13 +- .../decl/EnumDecl/EnumElementDecl.expected | 36 +-- .../decl/EnumDecl/EnumElementDecl.ql | 12 +- .../decl/ExtensionDecl/ExtensionDecl.expected | 8 +- .../decl/ExtensionDecl/ExtensionDecl.ql | 14 +- .../decl/IfConfigDecl/IfConfigDecl.ql | 11 +- .../decl/ImportDecl/ImportDecl.expected | 10 +- .../generated/decl/ImportDecl/ImportDecl.ql | 14 +- .../decl/MacroDecl/MacroDecl.expected | 6 +- .../generated/decl/MacroDecl/MacroDecl.ql | 17 +- .../decl/MacroDecl/MacroRole.expected | 40 +-- .../generated/decl/MacroDecl/MacroRole.ql | 10 +- .../decl/ModuleDecl/ModuleDecl.expected | 6 +- .../generated/decl/ModuleDecl/ModuleDecl.ql | 20 +- .../decl/NamedFunction/NamedFunction.expected | 10 +- .../decl/NamedFunction/NamedFunction.ql | 22 +- .../OpaqueTypeDecl/OpaqueTypeDecl.expected | 8 +- .../decl/OpaqueTypeDecl/OpaqueTypeDecl.ql | 19 +- .../decl/ParamDecl/ParamDecl.expected | 118 +++---- .../generated/decl/ParamDecl/ParamDecl.ql | 67 +--- .../PoundDiagnosticDecl.expected | 4 +- .../PoundDiagnosticDecl.ql | 7 +- .../AppliedPropertyWrapperExpr.ql | 6 +- .../expr/CopyExpr/ConsumeExpr.expected | 2 +- .../generated/expr/CopyExpr/ConsumeExpr.ql | 6 +- .../generated/expr/CopyExpr/CopyExpr.expected | 2 +- .../generated/expr/CopyExpr/CopyExpr.ql | 6 +- .../DotSyntaxCallExpr/DotSyntaxCallExpr.ql | 9 +- .../DynamicLookupExpr.expected | 4 +- .../DynamicLookupExpr/DynamicLookupExpr.ql | 9 +- .../EnumIsCaseExpr/EnumIsCaseExpr.expected | 20 +- .../expr/EnumIsCaseExpr/EnumIsCaseExpr.ql | 6 +- .../ExtractFunctionIsolationExpr.expected | 2 +- .../ExtractFunctionIsolationExpr.ql | 5 +- .../expr/IdentityExpr/IdentityExpr.expected | 18 +- .../expr/IdentityExpr/IdentityExpr.ql | 5 +- .../ImplicitConversionExpr.expected | 14 +- .../ImplicitConversionExpr.ql | 5 +- .../InitializerRefCallExpr.ql | 9 +- .../expr/KeyPathExpr/KeyPathExpr.expected | 16 +- .../generated/expr/KeyPathExpr/KeyPathExpr.ql | 14 +- .../MethodLookupExpr.expected | 58 ++-- .../expr/MethodLookupExpr/MethodLookupExpr.ql | 8 +- .../ObjectLiteralExpr.expected | 6 +- .../ObjectLiteralExpr/ObjectLiteralExpr.ql | 11 +- .../OpenExistentialExpr.expected | 2 +- .../OpenExistentialExpr.ql | 7 +- .../PackExpansionExpr/MaterializePackExpr.ql | 7 +- .../PackElementExpr.expected | 2 +- .../expr/PackExpansionExpr/PackElementExpr.ql | 7 +- .../PackExpansionExpr.expected | 2 +- .../PackExpansionExpr/PackExpansionExpr.ql | 7 +- .../PostfixUnaryExpr.expected | 4 +- .../expr/PostfixUnaryExpr/PostfixUnaryExpr.ql | 11 +- ...opertyWrapperValuePlaceholderExpr.expected | 2 +- .../PropertyWrapperValuePlaceholderExpr.ql | 7 +- .../SingleValueStmtExpr.expected | 4 +- .../SingleValueStmtExpr.ql | 6 +- .../expr/TypeValueExpr/TypeValueExpr.expected | 4 +- .../expr/TypeValueExpr/TypeValueExpr.ql | 7 +- .../stmt/ForEachStmt/ForEachStmt.expected | 6 +- .../generated/stmt/ForEachStmt/ForEachStmt.ql | 16 +- .../stmt/SwitchStmt/CaseLabelItem.expected | 26 +- .../stmt/SwitchStmt/CaseLabelItem.ql | 9 +- .../stmt/SwitchStmt/CaseStmt.expected | 24 +- .../generated/stmt/SwitchStmt/CaseStmt.ql | 9 +- .../stmt/SwitchStmt/SwitchStmt.expected | 8 +- .../generated/stmt/SwitchStmt/SwitchStmt.ql | 11 +- .../BuiltinIntegerType.expected | 10 +- .../BuiltinIntegerType/BuiltinIntegerType.ql | 6 +- .../OpaqueTypeArchetypeType.expected | 8 +- .../OpaqueTypeArchetypeType.ql | 7 +- .../OpenedArchetypeType.expected | 2 +- .../OpenedArchetypeType.ql | 10 +- .../PackType/ElementArchetypeType.expected | 2 +- .../type/PackType/ElementArchetypeType.ql | 10 +- .../type/PackType/PackArchetypeType.expected | 4 +- .../type/PackType/PackArchetypeType.ql | 10 +- .../generated/type/PackType/PackType.expected | 2 +- .../generated/type/PackType/PackType.ql | 6 +- .../ParameterizedProtocolType.expected | 34 +- .../ParameterizedProtocolType.ql | 7 +- .../PrimaryArchetypeType.expected | 16 +- .../PrimaryArchetypeType.ql | 10 +- .../ProtocolCompositionType.expected | 6 +- .../ProtocolCompositionType.ql | 6 +- .../type/TupleType/TupleType.expected | 12 +- .../generated/type/TupleType/TupleType.ql | 6 +- 407 files changed, 1294 insertions(+), 3572 deletions(-) diff --git a/misc/codegen/generators/qlgen.py b/misc/codegen/generators/qlgen.py index f8eb0b75ab7..271046404b1 100755 --- a/misc/codegen/generators/qlgen.py +++ b/misc/codegen/generators/qlgen.py @@ -361,10 +361,6 @@ def _get_all_properties_to_be_tested( type=p.type if not p.is_predicate else None, is_indexed=p.is_indexed, ) - if p.is_repeated and not p.is_optional: - yield ql.PropertyForTest(f"getNumberOf{p.plural}", type="int") - elif p.is_optional and not p.is_repeated: - yield ql.PropertyForTest(f"has{p.singular}") def _partition_iter(x, pred): diff --git a/misc/codegen/test/test_qlgen.py b/misc/codegen/test/test_qlgen.py index 4c3d759009d..71fba74bee6 100644 --- a/misc/codegen/test/test_qlgen.py +++ b/misc/codegen/test/test_qlgen.py @@ -1038,16 +1038,13 @@ def test_test_partial_properties(opts, generate_tests): class_name="B", properties=[ ql.PropertyForTest(getter="getX", is_total=False, type="string"), - ql.PropertyForTest(getter="hasX"), ql.PropertyForTest( getter="getY", is_total=False, is_indexed=True, type="bool" ), - ql.PropertyForTest(getter="getNumberOfYs", type="int"), ql.PropertyForTest( getter="getZ", is_total=False, is_indexed=True, type="int" ), ql.PropertyForTest(getter="getAW", is_total=False, type="string"), - ql.PropertyForTest(getter="getNumberOfWs", type="int"), ], ), } @@ -1077,7 +1074,6 @@ def test_test_properties_deduplicated(opts, generate_tests): ql.PropertyForTest( getter="getY", is_total=False, is_indexed=True, type="bool" ), - ql.PropertyForTest(getter="getNumberOfYs", type="int"), ], ), } diff --git a/rust/ql/.generated.list b/rust/ql/.generated.list index 41d62fdd3eb..29ed698c64e 100644 --- a/rust/ql/.generated.list +++ b/rust/ql/.generated.list @@ -657,163 +657,163 @@ lib/codeql/rust/elements/internal/generated/WildcardPat.qll d74b70b57a0a66bfae01 lib/codeql/rust/elements/internal/generated/YeetExpr.qll cac328200872a35337b4bcb15c851afb4743f82c080f9738d295571eb01d7392 94af734eea08129b587fed849b643e7572800e8330c0b57d727d41abda47930b lib/codeql/rust/elements/internal/generated/YieldExpr.qll 37e5f0c1e373a22bbc53d8b7f2c0e1f476e5be5080b8437c5e964f4e83fad79a 4a9a68643401637bf48e5c2b2f74a6bf0ddcb4ff76f6bffb61d436b685621e85 lib/codeql/rust/elements.qll 6ebcf16ef214075bc43562c246c11f8b90c089ff1b5041ab1b39ab9f4a40e9b3 6ebcf16ef214075bc43562c246c11f8b90c089ff1b5041ab1b39ab9f4a40e9b3 -test/extractor-tests/generated/Abi/Abi.ql 87ab06a93ccafe134a1411824b074e503a04f6fe22bb8c96d8253ae64334772d 7bca5e6b911703d6a098458aaa6db1ad16a52d1f5e3f3a76000156f1071052b5 -test/extractor-tests/generated/ArgList/ArgList.ql a497188303fe07cf772bbc56632d6cc3b8b8e7ee6bbb6eb155307c75b9b9be3c bc2ae847d8f39b7afc787476b5b1d7a51da542a7646889ddf2fab39fa63d7b67 -test/extractor-tests/generated/ArrayListExpr/ArrayListExpr.ql d061a7434b0060655b7997a580cddade9acf48af1ffe52b750cc4616d42a2cac 4bb5bd3c159b8e86fd0fbc9deef34cdb2d7a8cef6d78104aaf76374cce44bf37 -test/extractor-tests/generated/ArrayRepeatExpr/ArrayRepeatExpr.ql 5545ae3bf6d7805946a5daaa9460a6ddf882bcb128cf82c5ca34f52577e15f52 028dc4c48cc8e4763c52d5883aef714576f9b9bdffe5083b61b5c95cdf947f27 -test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr.ql 543e8066a765cd819552c866f59fd402e073f7d6b164e68f6d7a9d30edced27a df17b62ef6521a63160b671869540ebd1052f30498be5a1b57511485d20e7828 +test/extractor-tests/generated/Abi/Abi.ql 086ed104ab1a7e7fe5c1ed29e03f1719a797c7096c738868bf6ebe872ab8fdaa fe23fe67ab0d9201e1177ea3f844b18ed428e13e3ce77381bf2b6910adfa3a0e +test/extractor-tests/generated/ArgList/ArgList.ql da97b5b25418b2aa8cb8df793f48870c89fa00759cdade8ddba60d7f1f4bbc01 acfd5d2caf67282ad2d57b961068472100482d0f770a52a3c00214c647d18c75 +test/extractor-tests/generated/ArrayListExpr/ArrayListExpr.ql 42b365276aa43e2cad588338463542d3ce1dd0db3a428621554584b07a1431d5 08a66a8b69af35ee3bc64c35c453a19a6c9881cc6cc7e65275d1fff056121270 +test/extractor-tests/generated/ArrayRepeatExpr/ArrayRepeatExpr.ql 339629d69e2d7db153e2c738d70d2df33f395ae2377f07eb247132ede87b9899 07e0611667c09456241aabf80dc420fe1f5c13b1bce324da92e6b18d250c3896 +test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr.ql b262300235ab5bf4fe7712c0208390c7e876413a37a433340fbc078318233e83 68cfb18e8fb73b53cf8a8e73e8bf5e7ba11f32ca6b4695a64ebab51ac7d58d1b test/extractor-tests/generated/AsmClobberAbi/AsmClobberAbi.ql adfcfcdc6ac2a9a4849ea592e37da4221b6279cf2ea1112d32b6c89fda33e85e 7438490536e27b7173dec731f6925531a0e3fa839639c97a53905ba72d7efbe5 -test/extractor-tests/generated/AsmConst/AsmConst.ql 5a4c0a21d640d7ab4735f78b548a391dec4402e31f6d7684039e822c33683833 b20c6739d5615ea74965598d63b374f76e8e7fdde27efa273854f31f2bb21afc +test/extractor-tests/generated/AsmConst/AsmConst.ql 82f322fc8a01f4ccc86b3ecca86a9515313120764c6a3ac00b968e4441625422 62831f204c5c2d0f155152c661f9b5d4a4b685df6e40693106fbef0379378981 test/extractor-tests/generated/AsmDirSpec/AsmDirSpec.ql 518a739c91481f67b27bfd1989d9dcbada12de54901eb6d598c896cd72f1f5fe 4567661eecf475fb05e13749b9250bcec51056b6db5a6ae7df24b7ba5cfb88c2 -test/extractor-tests/generated/AsmExpr/AsmExpr.ql 475a2553186e3ad1cfad94068e244f3fdc9f540fca99b55d3937e36aa3eec376 b83a9d11206f4a125b2801ee12a005e6ef0f8366df60e6577ba49dedcf89c87c -test/extractor-tests/generated/AsmLabel/AsmLabel.ql 5e34c4c7df6a7b2322369ff1880e6083fa4a3701af7c72f5687a98a1d47b7d95 fd4b3cd2ad69feede0a214f6f214185da2ef30e6203791067ae2f8facce01294 -test/extractor-tests/generated/AsmOperandExpr/AsmOperandExpr.ql 63dc56ef014c49b513532c79b9fe1948a74b8f1c9a48091787588993c1b37809 d6e62c7c0992667df1948d09b11e39b634e12313a09655fe84517293312e7b00 -test/extractor-tests/generated/AsmOperandNamed/AsmOperandNamed.ql 65b4ff566b3252ad481b1e42ac7b62545df326e00ffcc95e2d9117b3117b101b b797be42864330fa36db8a13b38f2d769871def41425cdd28ee47675d903375b +test/extractor-tests/generated/AsmExpr/AsmExpr.ql c6c0128b252a13d5acea9a07b3854625aa51ebcce9dd93c11b423c9929d441fb 7618977e43f202af5b7d21b67531c4795bb791abe3cb03ba4077913c430b31d5 +test/extractor-tests/generated/AsmLabel/AsmLabel.ql 130bf49dc1f5ae79e3588415b9a4c25dfdcbcac1884db9b2fb802a68e33180e5 c087e47d8953d312488fcc0b1bcbfca02521e3683e2063eaf380d76399bca037 +test/extractor-tests/generated/AsmOperandExpr/AsmOperandExpr.ql e866fd4715e78511352bb286c1120cbd52c4d960664d57dd99f0380eb1db7109 081d6a6267a3e251a123099b4c1e7d3c5a3b56e0efe9db7c7db24db1c08b7e0d +test/extractor-tests/generated/AsmOperandNamed/AsmOperandNamed.ql fb1eb1f275ad251ba2e0876cf1d097bb33f20d06b0e50f8c01f7c11c71057688 e308567ffd18671cf172853a5c594f0f211d492c7e2fb58be412703d1b342b41 test/extractor-tests/generated/AsmOption/AsmOption.ql d613c40391f4985414cc3541f900b6e3f5f9ef157d2bfb96a773710af4b059ed 8450ef57a5a891db514e8340151d161e515b59ae7b963fd5eebf3bf862eaff08 -test/extractor-tests/generated/AsmOptionsList/AsmOptionsList.ql cac59185594ffe635d48b3493a7b597a3848ed77d5f1db4dca78fe5b81e1bca0 9ba5c822f17c479fe62cd9fa747a7dd08bf50714a672bfe67b8c17e413dabcb9 -test/extractor-tests/generated/AsmRegOperand/AsmRegOperand.ql cd7e3a22fe65052641f63096c08abb152bf7e211178c639ba4014eac1d09b6cb b921c7f1a322a24b221f1480d8cab2d8a2c91b02335d8cc60c340b18cc732941 -test/extractor-tests/generated/AsmRegSpec/AsmRegSpec.ql 23b4e90991d3f7d22f91dc4eb036280bc18a27a2890711268ed21a5f708e5d72 35c585c95f9fd611ec171ac97a32b0b7ddf3852b7fe1d8eba3f0028b254cadce -test/extractor-tests/generated/AsmSym/AsmSym.ql f58f7020d924b2a03174ba0cb0b9bd2f909bdf609e7c1ab14458c70b03f95e00 8b320237d857be3a0b14ffbac652806a58fce782de3bdd6af2ad7df4adf848cd -test/extractor-tests/generated/AssocTypeArg/AssocTypeArg.ql a2119629513df2b9242564b61cff74612a909c071904913a2a52a8a5b17aff63 9a377a477bb2313d4ef815e359e92dbfee7acd980d8e54599ff7e1a88c8dd2a3 -test/extractor-tests/generated/Attr/Attr.ql 5b066cc3363368e20f7f434219aed0ef137e3ce56469aef0566be0531858c74f 92fefe89a0a9a70abd0eac0ac719b2e7a3c958c0c54a5ce7f3f58e3e78552ba3 -test/extractor-tests/generated/AwaitExpr/AwaitExpr.ql c78e4a1d09b51d30ea8afbc512863c78f22b283f6886942cffa782dbc6aceaec ce5abb705e02cb69960ae5d68c973e3d096dc7aff57f38626d09b05eb2ef511f -test/extractor-tests/generated/BecomeExpr/BecomeExpr.ql 0802a7416d6b01ed60637528b1aafc5f719219cd95b006c402b7456bdc15a56a 5d3071fd1938ccd47c3dfefc7e88ce20dc93021bb9c0166905c6ec89f6d8b2cf -test/extractor-tests/generated/BinaryExpr/BinaryExpr.ql 5291e45119668d5f0084bae39ac18666e466e5e780170e7595da1dc607cec7cd 40829d46132cf38719f2d76768ead166626402722cd8189d626095a1f1fb7494 -test/extractor-tests/generated/BlockExpr/BlockExpr.ql 6219fba04071aeaa9e6ccd4b8b87ca99761b57b475f7742dfd8f39562636f934 db35d18bcc678a9d38698a82a1964e4febf7c8ed7b71b910a0c5ec54f9ecd31a -test/extractor-tests/generated/BoxPat/BoxPat.ql 0d4d81ad2414ebb593df7fa545c0da845ee1b65228af6e513c9516435688993d 66e56ad5e81488b85112ff8ff595db332a12967646f1f6b0aabcb7bf469efd33 -test/extractor-tests/generated/BreakExpr/BreakExpr.ql c879c5140cd2d537b225bbbb8650344ff8f08873e451e1c9229d914de8a0dc4c 0c71d378988ad805c1cda4a63aca1720cb82310b5204349b1de35ca5fc39b053 -test/extractor-tests/generated/CallExpr/CallExpr.ql ad956f12c89a8be873c8a3d3069f29ecf61f24ea6283e0903ed1c45ca8bd71ea 2726391717cd98e52c4c33e3a39dbae5e9e90d8cfa644ca8926ac4bdf61e71f9 -test/extractor-tests/generated/CastExpr/CastExpr.ql 67b7b17f946553936b5e3f8a524814c54fc052d5267e6e48be789228fca58849 95b1407a097b5a70cd206037a82e51f0fbdcfabbe642eb28db06b262171b5120 -test/extractor-tests/generated/ClosureBinder/ClosureBinder.ql 576e6d91c75744644db4f3a94d904a707c5b3e99b424f4802417546b15b168df 9904cc2162ace5515fee867d5916896799f487f8a8c409b1c3cd79b3365add02 -test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql 836d86eb07ece80b7141f310b946320730ee9e8e6088356a2eb46f3cb0246df5 64dabada0b9c5b5645e53a48c7cb9ebc21362a197ea537ec68faebc4ba9abd97 +test/extractor-tests/generated/AsmOptionsList/AsmOptionsList.ql e0e76f1d6e454c60db632baabd29642f315c4bf9284bab9ff8368604df15e77a 8450851f062232e7ea92845f406287f945c16e1e1a69a3189773e6e86df8a64f +test/extractor-tests/generated/AsmRegOperand/AsmRegOperand.ql 4ad6aa224e980602aaa77a601bda1065b1814249d889b54eda4da99dfcb53a8c b2503095957c7e3cdd345e8ccc594aa0f7590954e64a831660aed9a515f74d80 +test/extractor-tests/generated/AsmRegSpec/AsmRegSpec.ql 3ae5068254b83bc4663230d2d21f16e189d213acbb4f25924819288b433d4a7c eea94d02b9bccb20d9ac9627667b84eeb486b5976b1b37fa0b94767c83c44a3e +test/extractor-tests/generated/AsmSym/AsmSym.ql b3dadbd288d92dad7517f7997aa3e5974f807a30793486d174bfa9cc67128fc3 4f82ca31ef7e5a7d9a86567516a257a212ecca911c02d9a67de792ae66960def +test/extractor-tests/generated/AssocTypeArg/AssocTypeArg.ql 553cf7850a60985438e85079d3b55ec821fff6912d2076c2847e19626e9443c0 6c1c52cc2d4823b450bf3f3c9b166514863155f842faeaeae4bac8587a63efc8 +test/extractor-tests/generated/Attr/Attr.ql 88f9a524b557e81006a5079ac6d703c42df03ee510b7bc10cd22b481275d1939 49580ff1d1c34fd2ff636b983a19a96af0e36da939b5ac556817a741bb3b0435 +test/extractor-tests/generated/AwaitExpr/AwaitExpr.ql 93ccb34e00b37deecd6d3019bb47948daffe55a2d5d031c60b4f6fa7a61412a4 5502459743efd8346ab943ff3334545407b21aaf0771bf422be58a5df5d27381 +test/extractor-tests/generated/BecomeExpr/BecomeExpr.ql 7076b3f965c680e8f03bccd9ecb4495d03d35a4f460ec43628c19314eae8b49e 961e6e656e467ba389bbc6db39f345d9a8afaae4584d357dfe47484c6afadb99 +test/extractor-tests/generated/BinaryExpr/BinaryExpr.ql 4e849e6eaae581f487aa74d09d1106e441c876b06474389687a04df446690a4d 6cd36dfdb0af25396d2219fe2789f898e2393cc3f10a25410b2ede5d216707cd +test/extractor-tests/generated/BlockExpr/BlockExpr.ql cd6ef66de9e56ebb74964e59617d47999fb8c9081e885acece17a3b747a35ae1 6766844c1b87e518688565f2469575af5ca4e0ff4eb0c0b620df73a451d86a0b +test/extractor-tests/generated/BoxPat/BoxPat.ql 854c9ba4e045dbe7ea1666866c1c443a92597df0ce02f4ca5993142925941c39 a22c17cce0bff7d1df51b817d2cb1a61045357f91be14465166971efa5f5daad +test/extractor-tests/generated/BreakExpr/BreakExpr.ql c2181211da3dfe983cfca93ead32d5d211e91181899b9477152c58124eaa846d 57e57b926e14db2efb2e88e04699608b2ba9797ee4f6c4f710135b6858982256 +test/extractor-tests/generated/CallExpr/CallExpr.ql 2a1cd4485ccd8d4eb24a75889e832612adef9bb7feae414c90572796380bc6d7 95060b92aa04d7ad1fc6603c5ec14a275a5788ecb5a19932732e28105607a3b7 +test/extractor-tests/generated/CastExpr/CastExpr.ql 3480ec51072399409b7553ab6139c832db6ed4ca991f3a7a2282a39afe07c6f2 614c8ea7a2fe30d57583dbf84ed7a12743c2aba49d8c6252d31af3ed10853a39 +test/extractor-tests/generated/ClosureBinder/ClosureBinder.ql b68285fec6224b156754f51ee75a9b7ed32edaa16527e6f657a73bf6dd97eba3 d02b1b6d66dea1da892447d7b309f9b6e4eda0dd02055d71706d52aa73b5b9c4 +test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql 849c874de45781b8491cee428cc00fefc8cdc76f87de8a373a181b16ce930ab1 5e570193befae7bfe6c21ce91e20afd52bb94f234e2be89d0974bd6337221508 test/extractor-tests/generated/Comment/Comment.ql 0e0454911d2cf2e7ef5c6d860b84c57b9d490090914ebcf4fa0e8a70f777f066 cbd1c195276ef163f8d3c122344738c884dc9fb70eb2f9b7067829d735d48c4c -test/extractor-tests/generated/Const/Const.ql 784485603447ea3fa1e90913a7b00749927b62519035027b764c3a4dd705ef40 5969f2bca03114027b580c2a31621a948f3b41dc0d35437796a84b35ed793caa -test/extractor-tests/generated/ConstArg/ConstArg.ql 1f9c1317bad8a56482761355ac9245ec7e9f6a4c6b46f03215cac5c66a8b0897 6b3590000e5acbef9f00988d8b0e1f010f3e39f700d60370dbbfac70a6a5ee23 -test/extractor-tests/generated/ConstBlockPat/ConstBlockPat.ql 78ca1c2ebd7acbc1714691d16ed6fd5f29cf290f93bdb6f3c345ec840c1b3705 2635b135d259c78b1449dda0b66bf46c970a87b9431210eed82323a194ad0468 -test/extractor-tests/generated/ConstParam/ConstParam.ql 3a6aeb3af80f0cf842614ec49a2207c622fa91f45913095084b401f9ccc0dafd 625318a52f2ac2a0fc4245eb2bb26dd9b38c99e97f17729b4cf7101ebe23d00a -test/extractor-tests/generated/ContinueExpr/ContinueExpr.ql 1d7a8da67f931c4ef23bab2d0a747fff8eca9b71f9fa4fe38b8327a172dfa743 fb38f3b04f4ae11825ba22a87ee24d13581d4d728fe92ababa448e43a446155d +test/extractor-tests/generated/Const/Const.ql 28a0f2debbf73ae867fc2d08d8e54d9e96fea69522b7180a48495c9b7fce9367 54d4a68a2b67db95ceb856535a8b27860ce2b502da17a7eeea3bb554d7fb5e43 +test/extractor-tests/generated/ConstArg/ConstArg.ql 21c7caf1939ff9fcc1bf0fe6dec5c6a6929f714cf1e17faf7a2f4a31c910194b 61eac00f4727f7269f926c53f53a62b5fae82ce7a02b42d23b9de6337b6f9d6e +test/extractor-tests/generated/ConstBlockPat/ConstBlockPat.ql e2198f9ef913f7ecb9e96a4e5e4849737b664dbdf1ef67428d372ea1c29bbb35 c49aaaafd65c4dfadd1fae42a2078dba90bbd3fa1bcb09b88501c5085ab22c49 +test/extractor-tests/generated/ConstParam/ConstParam.ql 6facb2402e1cbf23d836f619ef68e2d8496b3c0c438e71266de24d8690852468 211ed6f7384f86d849f559410b2ac09da3df278bdeea9e77c4d9c26a727a6990 +test/extractor-tests/generated/ContinueExpr/ContinueExpr.ql 58b5046a4da06a4cd2d942720603313126888b2249b218bef6f7c44ca469ccfa eeb84a04deb4c4496b7f9b38798cc7fdc179a486c8beaa0b33bf87e7f9482b1a test/extractor-tests/generated/Crate/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 -test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr.ql 3b3d434c12f3642ff4f5d37efa2dced9c992d2364e3a0222e4f27914b7a10ebc 5f131d71ee6bb43492bc7af8b5fcce6c8e7db4be6f157af586c24aae7f87bb1b -test/extractor-tests/generated/Enum/Enum.ql d23aa08076db097960186afbaf72f0be3fa0b211dd36ced0e9a0fafa001f44ba eda75e1efc81076f8c7636acaecb2173eed24a86b57fc01731b6f134f69a01a7 -test/extractor-tests/generated/ExprStmt/ExprStmt.ql 0f99b73f380380a7159f1d046b959810a133af33c98aa35fde18247a99a09555 ecc5f7f63550659af92d50617ce67ac8dc4630ad2d5c5cd666a697c20aa9ff7b -test/extractor-tests/generated/ExternBlock/ExternBlock.ql 3d489a71460616d428b57d5c89564081fc24ca7b423be16598dbdd13e108f6a8 7d45f7e5c21af9e8c8c0ccf99e11333df8f30ac6f9e291434a258f21f2974fc9 -test/extractor-tests/generated/ExternCrate/ExternCrate.ql 55d6575506d0a6a11b5e86caf99b2d462c5260af11d82d1ad5b028c0003bac8f b0bfed75b10603532c657bde4f807d2e6685ab81ec360c4ae8e256006732cb43 -test/extractor-tests/generated/ExternItemList/ExternItemList.ql 7442c42f2a9e6d7d2660e3012f70b6db501ab327ac171ef0ad5241c38dce333e b5db54f716cc7c07a1282640bb6d2de891737548b3935f446693145f9306a2ec -test/extractor-tests/generated/FieldExpr/FieldExpr.ql b1463e8330de001220c1925aaa625c712b1fda760f780e83afbf83c15c31c79f 207382059e8c5660c5657524e987bd716b5bc29fda7311266c6ad87476f0d3d8 -test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr.ql cb23d43d8a7b5162ee888922bf0e92cc5d15df45359eafc56241fc405e71f002 9cb69b8cf4e1ef19fccaf17d57bd34aa75cfed97e4b6d64f1b3d7b787e6547c5 -test/extractor-tests/generated/ForExpr/ForExpr.ql 98746a8beb7ba3fd59ca06f11f077205305f8beb0a9ec0af77f5b625f9ab1915 abe4492a468a1769cbca45a3282ea77d9e21477c99585cf8851b3c3a4e7521ee -test/extractor-tests/generated/ForTypeRepr/ForTypeRepr.ql 4f90e94fc617637eab0f28895c46ca48de3c4667a32d43a973def28f3f926948 d4e740ba92dd781ff37ab63b32236392a1e9da876db84b4941122f572704027c -test/extractor-tests/generated/FormatArgsExpr/Format.ql 4824294ec21124b0e44a5b5a2666b6bb38123810758a55edb402b761ccaec262 7c6d5aef2112760b4b1b6519af149c2fd0a531fb817718291129223649a29246 -test/extractor-tests/generated/FormatArgsExpr/FormatArgsArg.ql 0a853aa4c5fd67ff5c42247f56b838c1b025e8d9364b758ee3855e33ee49e551 20016b1ed5207b0ffed889b0054780865308e41286c4e223ed723656c7e9f82d -test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr.ql 6c1400071f13633649b33342d636e2c0901a9199d5476e65c9e86ed43bc4d6bd ab22f0454f46ccc4923188128fe08c31a97db3340a9b4e02d5ac634c4c24c1c8 -test/extractor-tests/generated/FormatArgsExpr/FormatArgument.ql 379469864a349847ede6505fee76d4334cff08f830051ec627124ffbd134d5b7 927443d5db95d1bceb17c23396b0a311f127eb93f28f6032bfcdc14f55f7deb2 +test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr.ql ff54195d2e09424faaac4e145a40208bf0e57acc57dfa8247b3751862a317c4b 583d5b98aa31a9af6ad73df000ca529f57f67aa6daaa50ca5673a56eb57bf507 +test/extractor-tests/generated/Enum/Enum.ql 11b8b502f0e79e0447a3d014616798448130ec5d686b5b12e0db687786065f4f 5ea58a9b57ece63253a82599c096ebbbd0a3c4ad136ca20662f47a4bafd2df41 +test/extractor-tests/generated/ExprStmt/ExprStmt.ql 7c62a97f7f910ae6e0e9aff7fdd78b369d21257ccab52afe6307ddea2e15dad1 2d32a366c4acbea3136ff1f9f9dadf76b148f82ad1d7170f02efd977d8a07ae9 +test/extractor-tests/generated/ExternBlock/ExternBlock.ql ceb04a9596c73dc2e750ce1950cefcf0b5fffd1ab7dc3e723e4a6500b3ef3ab2 4f6ab037d307ff351a9e48c37b47b8f8f25de5f3d5ecb78cb8c39d7275751d29 +test/extractor-tests/generated/ExternCrate/ExternCrate.ql 7cd54aa65300453fc031e69fde24466d01cdfb8ba73e24e4d134fbd3847b15a8 6a6fdeaee88c74caf7345dc8b85f326032eb27e63aa63a6ed883256e4da86d3b +test/extractor-tests/generated/ExternItemList/ExternItemList.ql 7f4d538d8878a0166b1868f391abf34df1d5e986a7a2e9ceaddb36d95bc7f46c 37072596f5a1e28ad98cc87dbfed00afadd83fa007f03d5b17d4dee8922b100f +test/extractor-tests/generated/FieldExpr/FieldExpr.ql 2a04baaf57a22b65bd5b9e142e59cc2b7d3dd3174910ddc0c2510094f2dd32b1 d8e4fb4384aade1770c907d16795a4af9884051390a5a05935ad4b4df2e757a0 +test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr.ql 1501730f1e02e9d22b07b18bb42a5372e1d327bda62bdc81d75f9966946cb97d 28625f0b7ee4d7ab37fc13206585961e89a5e509a93215c16136d2382418b7af +test/extractor-tests/generated/ForExpr/ForExpr.ql 3bac38bf33e140ae9f88371ec90409f7de867e39cdea46f02b15519b236b57cb aade1baf6e6081b3b9bce5b7e95fe4b7ffe00ea9450fd6e1d6692ad97cf93fe9 +test/extractor-tests/generated/ForTypeRepr/ForTypeRepr.ql b74c0034bf5d1bb4a1a73ab822daca4572e80983a0c88620abe92bb794dd9cd8 a18f9a6d95b46b808c3a25e11fc54d2564ace67fb98d0c76632c5d5894b31030 +test/extractor-tests/generated/FormatArgsExpr/Format.ql 237ed2e01d9a75ee8521d6578333a7b1d566f09ef2102c4efcbb34ea58f2f9e8 09007ce4de701c0d1c0967f4f728ea9e627d9db19431bd9caebbf28ee51a1f36 +test/extractor-tests/generated/FormatArgsExpr/FormatArgsArg.ql 5abcb565dcd2822e2ea142d19b8c92194ee17c71c3db7595248690034559d174 1ffa743fc678701ffeefff6c14c1414bb9158e6756f32380dd590ff44b19ca5a +test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr.ql 243c2f9d830f1eae915749e81ac78d3c140280385b0002d10fcc4d2feaf14711 72b90a99a8b1c16baf1e254e1e3463c3ce5409624a2a90829122717d4e5a2b74 +test/extractor-tests/generated/FormatArgsExpr/FormatArgument.ql 0a345eb48dba8e535d12a00e88008e71b3ce692fbf8f9686c8885e158635dffe eab1f230fd572474a3f304f97d05bbf4a004c52773aaf2d34f999192244c0b80 test/extractor-tests/generated/FormatArgsExpr/FormatTemplateVariableAccess.ql 24108cdc54feb77c24bb7894744e36e374f0c03d46d6e6c3fcb2012b1ad117f6 05a6b6f51029ee1a15039aa9d738bb1fd7145148f1aad790198fba832572c719 -test/extractor-tests/generated/Function/Function.ql b273ee86be20a1f6a01195e9494382e2f19d30360a602fce19edfde2050486a9 003b56d91eb8d258523103c9abd08c8926d34c8aaa54475724edbf83c5d2dab7 -test/extractor-tests/generated/GenericArgList/GenericArgList.ql f061e626a68a5d238ecb3fd8302e6fdc2b38928e13d94157fe2ea91d05d9224b 6295a253438ce8bf437154de31699aad2ad447224845e8ad9ae2ef66a0ebe448 -test/extractor-tests/generated/GenericParamList/GenericParamList.ql 7d25f71e2b68e65af2104c2c0c8d4d37ba9f6281b2ee0f4af14895e0d9897e56 8820bd3591b29535766645f11d460de36274ee8cf0f0d1d5fb4be744fe5853ed -test/extractor-tests/generated/IdentPat/IdentPat.ql 015f2df2a1910f3834695dd204b2b60451c8a6e25ceac5dcd4c0fa03fadb45be 845aa839ba0acdb8486b14421a317ca8a048bd6dd717b0828ff6d66e6173f669 -test/extractor-tests/generated/IfExpr/IfExpr.ql 5ae88009f6136564dbf1d5cd5a6a53e7a5940926fc641eaec1ea5cf07bcb875f 7f55fa91360b9ca8aae137a71a18b139e5ff3f25a9fabe5eef807b710ecd3e9f -test/extractor-tests/generated/Impl/Impl.ql 82c7c230f1a304bb5aedb5521b79ffafae57befaa14a02d32c4fd8dec339b982 c51e5b4a5ebfc505bd4deaeed6c558abeb03b946ac2e60b04205bea6ee64461f -test/extractor-tests/generated/ImplTraitTypeRepr/ImplTraitTypeRepr.ql d93e9852c32d8a5c63b88c535194733ce0df644e5508c356b917213d19c61b51 4386f864a9fe7255d6ba2d055a55ce285aa1aed1ba7bd2d2fb0c8e9e4d41b49e -test/extractor-tests/generated/IndexExpr/IndexExpr.ql 9e98dcafdd8448072eafd200f356ecabc7ae6d198e783b3e656e8d3edf9328cc 358f941e2964e0cc988a900a111e382b1ad7daf68edf96573724054c23214bad +test/extractor-tests/generated/Function/Function.ql 3fccfb248ffe18fb1df1c12feba1c07f1a41edac58c9d77087971a8f94a013d7 1500438db913c101747911fd570a2f2197e4282f0156d1acd9a0026aec3cceb8 +test/extractor-tests/generated/GenericArgList/GenericArgList.ql 9bd6873e56a381a693fed0f595d60d973d0073ba7afa303750d5c6a0b887a811 0b373079f65aa91cacabfc9729c91215082a915197eb657b66bcdb3b6d5e7e53 +test/extractor-tests/generated/GenericParamList/GenericParamList.ql 206f270690f5c142777d43cf87b65d6dda5ec9f3953c17ee943fe3d0e7b7761c 38a6e0bbca916778f85b106609df6d5929baed006d55811ec0d71c75fe137e92 +test/extractor-tests/generated/IdentPat/IdentPat.ql 23006eddf0ca1188e11ba5ee25ad62a83157b83e0b99119bf924c7f74fd8e70d 6e572f48f607f0ced309113304019ccc0a828f6ddd71e818369504dcf832a0b5 +test/extractor-tests/generated/IfExpr/IfExpr.ql 540b21838ad3e1ed879b66c1903eb8517d280f99babcbf3c5307c278db42f003 a6f84a7588ce7587936f24375518a365c571210844b99cb614596e14dd5e4dfd +test/extractor-tests/generated/Impl/Impl.ql 6db0831b8b6bbb0168a63b49aae27022546256c19cc9b36d7fdebbea6a51f2f3 4d2e6b46a9a9397e6da6a58fcea6e75c5b5df37360cdfb2d6d477140c3958fb7 +test/extractor-tests/generated/ImplTraitTypeRepr/ImplTraitTypeRepr.ql 311c6c1e18bd74fbcd367f940d2cf91777eaba6b3d6307149beb529216d086fb 16c7c81618d7f49da30b4f026dcacfb23ed130dbfcfa19b5cb44dc6e15101401 +test/extractor-tests/generated/IndexExpr/IndexExpr.ql ecfca80175a78b633bf41684a0f8f5eebe0b8a23f8de9ff27142936687711263 27d4832911f7272376a199550d57d8488e75e0eeeeb7abbfb3b135350a30d277 test/extractor-tests/generated/InferTypeRepr/InferTypeRepr.ql 6ba01a9e229e7dfdb2878a0bdbeb6c0888c4a068984b820e7a48d4b84995daa2 7120cafd267e956dbb4af5e19d57237275d334ffe5ff0fb635d65d309381aa46 -test/extractor-tests/generated/ItemList/ItemList.ql a7cd12269cbfcd323a91183747e45b16fd03987508a70b522fa4c5f06c6b4a24 c3a0ba31bd36b831f24081e1ed2dece4fc26448e8d7d68708dcbdc37fc3b06ce -test/extractor-tests/generated/Label/Label.ql bf876f5435c5c1ceaeae3e280b59e2afe4081d4f16e31f870344c4a0dc559f83 d1683de377912cdc3bdc09993c0e5620b580df218137a765499934b515688286 -test/extractor-tests/generated/LetElse/LetElse.ql b1e858a70daaabec1fc1956f27bde6d9b6cae4d73e9848645de3fbf4d076080a 26fbe7215a35f118cbdede1f4f7606bb826801512fc28ecff9cdf3bc2643221d -test/extractor-tests/generated/LetExpr/LetExpr.ql 93420800fab65ce0614c29b0086dfa8f9702eb739cd9cfaf182ec42ea49ecaea 29c8c612340d4da4fdbea8253f3ad639c1bcbab02c770f05be91fec90f4a30d6 -test/extractor-tests/generated/LetStmt/LetStmt.ql f34f80df9702a2b5b5b9aaf51fdee9639fe31c04a395d10178b4d06aeba6eca7 8deafa420a0946a71b96d3443691e626b1726679774ab31a3b4659eab88c920b -test/extractor-tests/generated/Lifetime/Lifetime.ql 6928ea6d1734506b1749540bad2e4a09b077c9e2e3ad36cee968b6637ac3713a 83d3a1a226c8fc0c19ac0dbf8fb1c292e312162ffd37ae93ab306b4c0c1f45fd -test/extractor-tests/generated/LifetimeArg/LifetimeArg.ql 1ef4cf0a6d58d54560d28aa3ca3773acf932b67bb5ff6ac3198e88f9f764597b 81fb0d408265e07b6a789940471d2e113d6bfd14c0e4633b29458523a5b4f93c -test/extractor-tests/generated/LifetimeParam/LifetimeParam.ql db8cbff79d914ac806b93c158af7b53a973bd65327eeffabc2705dde75e55b2c 2a4e28b31d63879e2f0bb9b63a08eeea67cc3e5348c44e265f56a1728fa9a10d -test/extractor-tests/generated/LiteralExpr/LiteralExpr.ql ff85f118a182a295f1f39c4eab99b28aec196c972f6234ce288ca61bdcd6ed7a ef30de8bee944569438f5710498ab6e96bd62c608202256e088e678ea1fa813b -test/extractor-tests/generated/LiteralPat/LiteralPat.ql e0992ef23bad7ef7cd586140c2f3ae060647e40029aabfeecc7e228413d86ef6 bea1a2b29323bc6bfcba19c180649f08d9be7cee077481dc038c1ed667bf6379 -test/extractor-tests/generated/LoopExpr/LoopExpr.ql 6ecf1073cb59a8ef6b1f73189a019a756b4fb77713aab49dc9d6f9650d8c7d67 2fc3a44c2f630f9c75b9090cca52b6b2c64d14efd6ab3751799993f0820df76a -test/extractor-tests/generated/MacroBlockExpr/MacroBlockExpr.ql c568f1a3ea0c675e6eac74c92b8fd634917e58e25522538db772010c41bd959a 00c66f0596ba2c084f8d9266d3a79fdd0b2ff5fa5bc5b217322099d2bbc2fd01 -test/extractor-tests/generated/MacroCall/MacroCall.ql 419ba05a1b98aa63025a3589f30811af4281333e3b2765737dfca5dda39716e0 c75ab05b651956d1117095776a552af530e287b647f827b02b1ed4b118b31599 -test/extractor-tests/generated/MacroDef/MacroDef.ql 3285243993f01ba7908656862eae742ae78ef24c4df6dd36dd816710e1fa753f 7dbd43bff8ab823d3caaa254e142d89595beb76ab30edb90f11d8235b2c4b851 -test/extractor-tests/generated/MacroExpr/MacroExpr.ql bbf9f82fd797b5a0947d8d3ba31c754df5f6468cc5b5c74fc0c9ae51fbc0fc97 72cebdde9f4eb42241b2bd68d6a725eb05ea333dc2c6792de0ee0bbb8087e7ec -test/extractor-tests/generated/MacroItems/MacroItems.ql 5754c284ed6aae44c692cdc5994ff95bf3eae1a9cf594f7c9e9587c5352452ec 1f2658a8f8056be0bcfcec43fc547ca9894b18fc9d2213dc6e7078ae3e6e6367 -test/extractor-tests/generated/MacroPat/MacroPat.ql e317b4ebee68c315f4268e2d8805a8d17623a0091e12f5efb54be1cdf40a8655 c24ba7ed5a384add19bf040a106b288a815b660df69de3f9c7799f03756ee600 -test/extractor-tests/generated/MacroRules/MacroRules.ql 9695d6b4974a209ed4cfceb3a89b4ca3d1f6eebea8ccceb5516ec46f71be2e3b 1850e44310fb311900ffc33d8480fd2d4afc4be0f1c8554936b59fc6906ade2a -test/extractor-tests/generated/MacroTypeRepr/MacroTypeRepr.ql 6f3c500f7b1fbb3eae00b741cb10de0cb2c2ec3b952bf0f14cbd8d294b48e041 8c87acf65bdf32fdd735f655cecb677fe7246db43923c1b02a3696c7201974b6 -test/extractor-tests/generated/MatchArm/MatchArm.ql a1c9b74d6b887aa3bd928bd06e7959e2ace699edfa94b4e082130222551cb081 395f96810204bfc30e65662a2efbcaaf03e70c69130fe6ba154576efa4cf7ddb -test/extractor-tests/generated/MatchArmList/MatchArmList.ql 2961e39e7a6eebfc4533932bf84503de77ca1bab8c11f1d31854d572757ee1c1 c2327313fffbb63b0b958cf408bdf34f6fef5c7bf902e3a44499dc2b8b7506e8 -test/extractor-tests/generated/MatchExpr/MatchExpr.ql f2389e43d5d02845c3c30a5ecb8742cadc0c0b18d12503c2872448124927a5d3 c5be399f884ee03e9765f186b8d167710c4ae6e4ac50ef405e5e810bf42839af -test/extractor-tests/generated/MatchGuard/MatchGuard.ql f2f6e4401de989324c1bf26278b82f10f3b224a0618a76c0b45f6ca5967f7930 d3cee06f93b20d075f35da86b48b17d8220b5e0c3660577065e451f2088da99e -test/extractor-tests/generated/Meta/Meta.ql 476e200756fe7baf9a0e8f92af7364fc0b357de4055cea8663010635c9e978cb f43bfed9324dc0e1c64e184d5e200da5952c5c908838206034fd800330b94813 -test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql 35709db709f4a561baba8b1b1c56bc2fab8dcab05b38e678692a3ffeb2ca1f33 dfaea39dd709ae496a8c60bcc53cae98cf5349235b88ff47bea9e5a3b12f7214 -test/extractor-tests/generated/Module/Module.ql 7cce1064b28139f5741df98ccc88f0d62af9926a20b59f4f756f3979e28bf318 5f3734c328aeaaccde2e4f83bdd5144bb968c08880730da0e94a636adfb3094e -test/extractor-tests/generated/Name/Name.ql 5359807d0eb6fc90841b3d5ec1ee0f09540d13adfae0a4f73eee7df2b0294e80 0c49cf53d89c28e9ca6f348b6d242a64fa6bb3fb9b8205a591e46095110fb2d1 -test/extractor-tests/generated/NameRef/NameRef.ql f8795c2f9f096b40d681a79e37d489e810b5941ea8036b46d0f09de2b105f82b 7bb59e7019a6b80ecd2e87cb97d6935d7827e3869c5c06d8a916c05f1bb26a5a +test/extractor-tests/generated/ItemList/ItemList.ql e29302a9212b07fdaf93618852be30adfac64b292e9a0ddbf63addb803daaa98 7e69a78b0f58ef9344892113799092149024c1352b0965a6326d8a45cd44771a +test/extractor-tests/generated/Label/Label.ql da1f302da6cb31e6ccb73c722d9d5cfaad6a26d9869b3fa09fe50b03e26f3d9b 5fbfabfef6567ec6609be1af7859eba8ecb1f7f1878b8fac426e0d7098c17ba1 +test/extractor-tests/generated/LetElse/LetElse.ql ec8e7362ce9f903731ed6bfc190fc18a6f60abf150f5cee878a0fb9adaa20b94 2e019b6e246caabe4800ab940bc150bd8e466d59dde87bd614bf064adb703c8f +test/extractor-tests/generated/LetExpr/LetExpr.ql 59f70af49ba496559a7ccfe30e737597fb473794d677627d344a9285f85dad33 b59d1f665c600055666a422c4008878cecf17d9ff847cd02b6e0e82ca73073bc +test/extractor-tests/generated/LetStmt/LetStmt.ql d89291bb071484b1e79b009b2a310a5104a2ac0e85a8581ed73135e1351c27c8 45e20da515173e372c1d1d87392eae64d6d482eab0393f9753d1ebe792241d39 +test/extractor-tests/generated/Lifetime/Lifetime.ql 9ca2da890633be36338a60e41c19a32ed03a7397ffd5c2271de964ded59b380f 475925d5aaa3c7763f3fdc703b8510408b6f729a4855d9e7ed2cf642cb7e0f98 +test/extractor-tests/generated/LifetimeArg/LifetimeArg.ql ba052a01e76251c45960451fa183cd33e7435dd2906a8a085d99ce7bfba8ee05 bfa2de807b23f139342ef820d05f50e3b3573027427d0c77b710aea5a94fc839 +test/extractor-tests/generated/LifetimeParam/LifetimeParam.ql a96f586af332969878a4e9df8f9dfca99e5c98b6f60315dd1b3fea47c4cbace9 01d87c8d686466e15e19f85aa9b2536f7b8035181444d532ff11286c77b14dcb +test/extractor-tests/generated/LiteralExpr/LiteralExpr.ql 00570642966d233a10ec3106ae65e6ea865c29d0776fdbc452815f528301117c adb286ad3bd763f1b1b350cac91bc2615869dcb9b0faf29276ace9a99d31f0cc +test/extractor-tests/generated/LiteralPat/LiteralPat.ql 863d4902e7e22de3176398cbb908e6f5f487b3d22c0f9f7a5498a1ebc112c0fd 47e3f70c5c32f17050d3ca8c8b42d94ecd38e378627880d8100b7ca182cfa793 +test/extractor-tests/generated/LoopExpr/LoopExpr.ql a178e25f63b4d517482ec63e5dfb6903dd41dadd8db39be2dd2a831e8456811f f34165f78179960cc7e5876dac26a1d0f6f67933eff9a015b92ca0e2872b63e8 +test/extractor-tests/generated/MacroBlockExpr/MacroBlockExpr.ql 62859a25b88c93db1d47055f682f1b8ed97ef227c870bc14041af106cb9593fd 14c5831920249ef2e0799ddacca62805e2e2d8b8a6cbd244acb3a20c4542bf7b +test/extractor-tests/generated/MacroCall/MacroCall.ql f98017f6070e2a5e4b191d5380cc0491d7358c456e8459b313235e44eb368794 437129210d9b7f6850adf4d2c8ef7d0644193418645d631b8edf229656fc57ac +test/extractor-tests/generated/MacroDef/MacroDef.ql 9e3647a92713d32f87e876f37d703081855ea88a7a3104757f90bd94eb382fa9 b50e9797c1b8ea5491267ddb6778862f0541617ee60bd8e167cc23a499e36733 +test/extractor-tests/generated/MacroExpr/MacroExpr.ql 83fadb88fd8f913bb1b1cda26d21b173bdc94bb6682a74eaddce650ebf72aa41 1c502cde6a95ec637e43d348c613be3dec4092b69d2c8692abdc5a9377e37f5f +test/extractor-tests/generated/MacroItems/MacroItems.ql 0f8c1d134a28b80c70d5fff7c120f17350f6116689fdd7f67bdbfbaa0302c224 9f0594aa6d96c4f368d6c6521d0b58ab456611842afbfd040cb84f8858241677 +test/extractor-tests/generated/MacroPat/MacroPat.ql 71f65d80e670ec43db768693b8d44d627278a69e938517dc9068c76785ffd102 b1577dd669cafa9cf97aa998a7f30ac4a94aff129787a2d5a1cdac553fd56397 +test/extractor-tests/generated/MacroRules/MacroRules.ql d97daa29929a5bc4e25e65755c1929f9854beb1d2a183579a1ebec1d4b346dca 8b81026fa36152d870f91981a020ed0fa06cae0380d4e8d9496fea12a95b0326 +test/extractor-tests/generated/MacroTypeRepr/MacroTypeRepr.ql ebe8451a9256c9d7e77749beca88d0fd5ab73c76404bed4ff6e0c75f126159cc 72dd6d5ca4133e318fd51bb9007519b938e618cd4ef27bfe52b9c8c8cbd484ea +test/extractor-tests/generated/MatchArm/MatchArm.ql 704976bd48e56a0a2fce7c2d9454b6cd24b1bf924633702ebcd71d8521b9b171 7c2bb501002c997a680c69b6d0856da13868125913e726f1a12b97907f32064a +test/extractor-tests/generated/MatchArmList/MatchArmList.ql bbc679fe6d8dedf9131d0fa5faa7b44c138c5f56b9cf3cb209fd3ccd614b689c 916c53a2b68646b52f2d28eca2a19218ba9d12eb8edf7c6cc4140dace1bf4e0d +test/extractor-tests/generated/MatchExpr/MatchExpr.ql b75a5936401bb5ca38686f1413f5c8267ad685722560a2e9041dacf2f8d54abc 7da57118fe5b1f7f5cbe8d6b5f3ae70816fd4837b1c2e6401b98175b36ca233f +test/extractor-tests/generated/MatchGuard/MatchGuard.ql 91de18a0a18d120db568b2c329e5cb26f83e327cf22c5825c555ea17249d7d23 0bcdb25895362128517227c860b9dad76851215c2cdf9b2d0e5cc3534278f4ec +test/extractor-tests/generated/Meta/Meta.ql 43dd1cd669099b38396b316616992af6d84b0c1cee953b19235a00ab3d3bb43c 80b1885809aa074357e21707d1f8c6dca19f0b968ccff43229bb0d5c6fffb2b2 +test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql 617bc809816dc3cc1de1c0b49c494568164fe2a048472f4cce1b83f0a1f54a42 1b323e0b1812dbfdd78ee58798353e20326a3ca7529f52d5c984d1d92889a65f +test/extractor-tests/generated/Module/Module.ql 4e154af13f19ee06e88ce8ff85e143bf6ddde798b2ec6fecebf43b8015211087 78f91c2827883ea7ed1f546de80d0909f4ac57b06027439f07dcdc0a09d7888d +test/extractor-tests/generated/Name/Name.ql b2fe417f7c816f71d12622b4f84ece74eba3c128c806266a55b53f8120fa4fb3 8bc65bbf3f2909637485f5db7830d6fc110a94c9b12eefe12d7627f41eae2256 +test/extractor-tests/generated/NameRef/NameRef.ql 210a70e0957f3444195eed3a3dfbb5806e349238c0b390dc00597e6b8b05fcec d74fbce3c71aa7b08ae4cb646ccb114335767cb4fe000322f9dd371c1bb3784f test/extractor-tests/generated/NeverTypeRepr/NeverTypeRepr.ql 4e73ec96fccb00fe241546ff12c47329a9c67b7ae40a58a5afa39ecb611b84d4 bb716f72db039e0a82de959e390259a82cf99ba4482070602b7b6b42511976e5 -test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.ql cfab8e4bc2531c25a49ebe3128dd76d52fb870d4540d8890df6ef8fadc594a03 c8aa854fa3bd77b5adcabba67cc491f125a96760dab451446ebd33cd91d2c620 -test/extractor-tests/generated/OrPat/OrPat.ql 7f78903ac374921770648aaa359a5be157da60fe92ee522776fc326db4cec11d 38a85313488b9c5dc1187c3f85b7f5f87cf4ba0b4745e2df24cf2e4185e05760 -test/extractor-tests/generated/Param/Param.ql 1dd558b6b02351929eaffe958315cde68574c83a2f5d4ac48b1053d2c780332e d751dbccd80b2ca7dc5718dd0c8edbdffd3aa78ce7aa5a434b8c0d8960dcdafb -test/extractor-tests/generated/ParamList/ParamList.ql 113e7c56a50a6c6ccabcffffc35214215be8d3c86e1d2d34ed4a57869c71f0bc ae7ba6fc184369ebc1ad3acf09845122d26604e9e9925c62be4a4f2ede32a075 -test/extractor-tests/generated/ParenExpr/ParenExpr.ql 01cce66baeb671e6557ed1f9ff19db8f0852840fb15aea510a9625b1fef5953e 12aec5a7489c52798b370faed18eb1d2d9346e31c7cc8f08a595278f835332a8 -test/extractor-tests/generated/ParenPat/ParenPat.ql 57ffaca029076fbf4c6f179ffdf9f45c40bac1116c5af5458d5a82ae4361565b a287cf79c646a6639a1ecfe2c9a227003e59255ddf2a1c9b46a1403f6931fa88 -test/extractor-tests/generated/ParenTypeRepr/ParenTypeRepr.ql d09151c7071e03375e3b81b9adb050ed6c7bea8c1d688f4a66834400dcc739e2 2f297fcff16d8bbe383233d3eea969bb5c5af3a4e60880c5b113c7628fe0bf02 -test/extractor-tests/generated/ParenthesizedArgList/ParenthesizedArgList.ql c6965c802eea155b03cf7879353beaadce3ac3eaed71a44a9045b9dbf91efb56 674dcbcee9d3851b21da0dfebdeeadfd304305629aa511b562ac7fe0b0eca419 -test/extractor-tests/generated/Path/Path.ql be4fca0eb7b974eea321d86e076896af4cabedf7aa88ba8cb7e628665abf8fa6 8f94c5685ed975c8a455c3096d3e03b2bb1494687d42b7eca966489d994d3ddf -test/extractor-tests/generated/Path/PathExpr.ql 7955350830d15101f583cf18ac7612c64cdf1032e0ca65d73c23d26c27e75229 47ea59e1c1384fd5d06ddc4ea52cc79cbc5f43d3c927ed41faf9bbe8371a165b -test/extractor-tests/generated/Path/PathPat.ql c61f8e24ef2025f59137853705188a7854564768045a1936dac6a724d34b3a5b 08f5268a2179146a757edc2a6908d97716c2fd30722cbdf2e065f127fb94b431 -test/extractor-tests/generated/Path/PathSegment.ql 33d39c172dc6635b39295e5a57db9b7a8fae1b344f8ed1714cce52259c10024f 0ffadac8dff4521cbf72fbcbe99cc2cd74b7e2e5ab84e3a498edffe4df8b70d7 -test/extractor-tests/generated/Path/PathTypeRepr.ql 865aa4993abeeff57f8b4bac8543d10074c4e9090ab1d20671f2cd320cf82939 b5e6cf368abeefdfc1c455000fb2315de1bc6f0c2e263900ee532447978688ba -test/extractor-tests/generated/PrefixExpr/PrefixExpr.ql 98a73d8db6ec8f658eca2f9fd6878487c7401ffb9ea5ab7af8183edf1ae89907 caf3f89fc01830d50e01b9884dd113d325e689ce5bed88cbb7ded50d6ef7fc3c -test/extractor-tests/generated/PtrTypeRepr/PtrTypeRepr.ql e95c20198e875405d057eb66091ae7554d88fa182f4e65c117348b7156294f14 4d12531b4521e82d85b57f480dd9302cb3d0b6cda7ecca4a69b4b17939eec1bc -test/extractor-tests/generated/RangeExpr/RangeExpr.ql 7677a75919ff26462e19253dba20bd18d6bd6e57fccd617c8b1365da22ecf782 59d2ad612b96b06551876f5562a233bd4c57de25a574d04f4d9ea3eddbb5e080 -test/extractor-tests/generated/RangePat/RangePat.ql 8b1919d87bb0b3a0cac4c3dd16026b29b1f2cc5f6ca70f51eeedfc578bd13618 948efa05eb63a6e3a3717c09314c090120f9607d637bdedd5936b14cdbcd028a -test/extractor-tests/generated/RefExpr/RefExpr.ql 971d00561693ee6c4bfed4931dd3ff9f8eda95ad7000868f6935bb95ffc897db fabfa54dce3da4a4b6cf0d86c8d01d55ca164053a4e57d75232614987f9d6542 -test/extractor-tests/generated/RefPat/RefPat.ql c39727f608a3d5376d78f6972b2e2040665fe6a87d962ea9dd2fefb049232ca4 5efe77286c990abc730b136e1bb26b3e61663406b5cc386e5db0ff6852bf6326 -test/extractor-tests/generated/RefTypeRepr/RefTypeRepr.ql 28122f3106eb76b6b663c1b50469ef557b40bc19261b3e54f17de69de31c60a1 d79479e038a916d0047b34cb69405c413d2e998f92dcf82568b1a781f29e643d -test/extractor-tests/generated/Rename/Rename.ql a7a23af1ce58a9b259846a03e29f53bc36bf0665e39ecf2c979cef45ba91083e 8e135b8c863a0a7f78f91db04cd6627dda16472065fe32732208c1f2681d800b -test/extractor-tests/generated/RestPat/RestPat.ql 461e45119253061f1bb81b52fe710d363c9506a9a86ed1aa25e0f03dbd2f50f1 a91b8b97cfc24ffd0d2750fa3f06f9597ceb181cf64628aea34750d4345a36d5 -test/extractor-tests/generated/RetTypeRepr/RetTypeRepr.ql 4e99e977ccb0ce043b7cd6dae57f2a03e79f3a4353dce2ef5cb25d7b65ec676d ee4777400d40d0376353bc41182f31aa5e514cf586494f37fda9a287312fddb2 -test/extractor-tests/generated/ReturnExpr/ReturnExpr.ql 163c5b049d38254cfb7678073abf672e980ea6340423df0c3d26f84236b7b8a1 49dce8d5f5e476af46fc0102a86625c8a4306d6c6e0b95e7ad70d4c5376b1d74 +test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.ql 851d84073f4a14cef24ce945a099bc43b22381fc21672ba9ba424623d66d9e0e b3ca3309da0054501dc49f83b9e1b51c155966a14504521565ea980cf1600f55 +test/extractor-tests/generated/OrPat/OrPat.ql 8742e1708da0bcc172c8cc637082672c92a136aa50bb2f0ef928387337aefa3e 1901c223502e8cc046c233a10d923226373bad0837264e2b837fd549929020e3 +test/extractor-tests/generated/Param/Param.ql de90709cbd61e1852c857ffb6cedd17818464c93bb7bdc92c900ee04f4d2a27c a105ee30716345987989d48c4fa6194c34741fc48528515aeca673662b5259cb +test/extractor-tests/generated/ParamList/ParamList.ql 015cfeec048fc89698d75a04492a0e39303b1264f80e2b6977d178aba18a745d 349455ea6fe026a482bf9d63e9581ed2f368de3331bd2f0b9591ec20ee2a5f21 +test/extractor-tests/generated/ParenExpr/ParenExpr.ql 5ac9654a149f32638a663894db769152ce5a5abff7051e4d865bf0ac2485759a 3fa0afc9522c241d7530cc6d1e52b662d920f0459684bec82fcfda30d2ec9871 +test/extractor-tests/generated/ParenPat/ParenPat.ql 50f99c6a7e5e2f76dc5bbc10a6b2db5f5f40b85e80a992aa616e424744a7606d 5ae681b09e7b8793d2d8fa36e9e7d9b6c32fc94d6c26d43425407d05d351fcb3 +test/extractor-tests/generated/ParenTypeRepr/ParenTypeRepr.ql 86a45a9f9696a55562a7125f08297bcd50b368225a13cd31b6e9eb4071d04e13 53c0b8c4f453a748c9534220960c6ce8c52bd7501cf1d1f74e3928fc6512667c +test/extractor-tests/generated/ParenthesizedArgList/ParenthesizedArgList.ql 6d0e3f7cbcc835f2a5784ccb09b0d65c2bb063c1904edded2e7fc8c9fb57c4fa e41c898b8b0d61078e0d76c6e2e141251dca71f79ad5fa119c012220c54cc409 +test/extractor-tests/generated/Path/Path.ql 0f6b63c723da7f140411c8e9a4bb9fbe043a997a1748a4a491add4bd6e81fd6e 5081db5bd590b72780c3c8032532e65b5d453c327c8771da6b87c10e30071523 +test/extractor-tests/generated/Path/PathExpr.ql 2b032a00d8f5570b34f44bdb4209f199f821e093011472b5c686918a063442a5 9f10b1e38863da09365fc45f749578dde74bbb64d35972fa34b83e6814f0004a +test/extractor-tests/generated/Path/PathPat.ql 8d8053588dba1f35fff3bb89eb66f1534f637cf3b56338a6f3c19d748db7e1ca d7405ca5bf3bfa6960426964be3ea32562e1367c74b1f438c0827573eeaf773a +test/extractor-tests/generated/Path/PathSegment.ql 87774cc2e9d1be7aaf8748d418b151d7ec03fb20fda9430ebabd86ddaebf5538 699545d8eb2d6325bcd2c253d56339bd71170b34e80efe5155189fbbdde9fbbc +test/extractor-tests/generated/Path/PathTypeRepr.ql 32023340cb9aa1fbf52a1a3e330c6f3206e1c64c9dce2f795d9e434aa5a1533b f451de0d4941ab79014d2883b46291f9f05f79d479fcdcab387020ab3ed68703 +test/extractor-tests/generated/PrefixExpr/PrefixExpr.ql 63e9dbae0d0b46d5e9d60c313e408c4c7ee1a93c5a26fe4c01a632911de961d0 09fcc28bb22553356aebf9ea93811703e5404b88022be8dab61ac81d3b187b75 +test/extractor-tests/generated/PtrTypeRepr/PtrTypeRepr.ql d9289bfe1e72d9560b3878e4557f8cfda578ef7bce67eb29d7320921c0ba46a5 f3ea108aa25635bffa7673bb66b2581ce246d3aae86edf878c6f1abca2493c16 +test/extractor-tests/generated/RangeExpr/RangeExpr.ql c9776706d933606d1463bb08ed76457ac03a9558f6dac0218ef2012bc5e8e48f 77cafee86abc2680e1f9c925fbe664c05ba1b9a2533b1873242ef01dde1ce308 +test/extractor-tests/generated/RangePat/RangePat.ql 72b6a5e250fcec844f96623f265762462966775326ad0ad4df03203ff17f0066 04c375e98d6c7d336ebf7dee522f0fc716b7ec8141752534ed083c5d2550c679 +test/extractor-tests/generated/RefExpr/RefExpr.ql 4359b9e10727fc505213a896c4c8761258f355b572e11675a5081d811affb4ea 0c46fcbd866334d168e1c4c481b4ad419df048e4ba74488875b2799d316291a7 +test/extractor-tests/generated/RefPat/RefPat.ql c83d5e79a7d5977f658d64e8caea471b948400bcb90a3610283bdb5e9757b99e 26fa8a337e242ce660eb0dc25709148b837fff3229b259bfcd2987261c58c38b +test/extractor-tests/generated/RefTypeRepr/RefTypeRepr.ql c545689e4cee2035d79fdc3d9b720e7231232f57f35d16848b20d4659650a8c0 f248b342115cb0691f3ebe38ec9a65c8a36440cdf2f28b3ca7faed779a6d4164 +test/extractor-tests/generated/Rename/Rename.ql b65855515219a5fc1889f619d76e3fbb8fbe6a631f931e313608964640f68abe 7da9373ceb58054189036fcf5a262d9cb6897ea9d1008c963f8a18c34b99a60b +test/extractor-tests/generated/RestPat/RestPat.ql 59fbb7dc4bbad60a0a7ec91d8997ccf8a7036d4bb20c88332791906d88672c1f b104f06c2d350a9d703abdb28619672618d0082a0fbe7bcc67fa8df5526b266d +test/extractor-tests/generated/RetTypeRepr/RetTypeRepr.ql a6a8ad01a54f8f4384d3e1ab6352cca1e55c9041673705658b9feec3e3a1d3b4 d9ba5a13087e7731019d947219f20af547664965b2b304bd23155994ea1aa397 +test/extractor-tests/generated/ReturnExpr/ReturnExpr.ql b44ca36c30cd584c9f976e625a6bc09242792016d5e78057f9ec4174f3a0341f f61dcce549d282a9b7f0bbdcb612909799156231f22f2b5824ec6083630013ec test/extractor-tests/generated/ReturnTypeSyntax/ReturnTypeSyntax.ql b08a4d4ad63ea6e62f8b9646fd838cac9d122a93f5716ee91ff7c62fa987a1d0 264d485a301f4220eaa580ae90964b05c1a2b19b898698e7cdcc86b624ba3aba -test/extractor-tests/generated/SelfParam/SelfParam.ql c1d46b7a3786f0ddb20dcc1516f9dda890b19e0f2a938487f7fb025ebd821652 6a5382306b6a5ddf4617f10d5f9c58918719017e3f9f8a09b96e079e229b0263 -test/extractor-tests/generated/SlicePat/SlicePat.ql 5cebafa861e59823969023c0261c89756b164ff4b66d6d0b27e81a2e32791ba7 f7860597662cfd764ca858ced12d57a00efa0fdd8c8165343923388accae8f52 -test/extractor-tests/generated/SliceTypeRepr/SliceTypeRepr.ql e247427510d6db23508bc88ce67a9ef653437b283a7a3cbc66bddd66ea256ac9 76142b987624281dbda5b6c661f1f0d8235d5c5b85d1959d0e8ff37f3bd78abb -test/extractor-tests/generated/SourceFile/SourceFile.ql 008e056aa3b5767db02f473e085997ee1f685cf61489a3f5ee94acbd0fddb05e 6a239712c44a6d04d737d0aac3a4c5e057db580e1b98fc2d44c879fa3ea8d3b0 -test/extractor-tests/generated/Static/Static.ql e5fee6156a5940a007a5f7103c8a3be0a42662384c4899f2824efb3471c187cc 53f51bcc61c4c71608b9518c5953fb0740ff91a1bd45ef2a1f24a354639efbdc -test/extractor-tests/generated/StmtList/StmtList.ql 3837f40540137cbed13e5a655c07a3030c1d1e12e1e7d461551f19d11dc600e7 332b132fae5b35f047a3221e6481e414a25a714d4c163c1940335d2700560e06 -test/extractor-tests/generated/Struct/Struct.ql 88065f0b52096fb90af497f7e9b340e7d3974d6ca9af9715a4706446f9a6c877 600484b716d5fb1dbe953cee92c1aeeeb7028ebea7e6c08dd84be9756b0769a2 -test/extractor-tests/generated/StructExpr/StructExpr.ql 219563f630469270f162cbab43091300e2441768d77c402c9ad135320c5059a0 ed50862bc7ac9ec2a76a75bc4a318d845a52f5aac87256d56bec8078b3c6cf88 -test/extractor-tests/generated/StructExprField/StructExprField.ql bd0a520d229544a186f03b9eff803fb1358f8e661d24997f3025e40a9a0680d4 d3073dbc5a65fcbf094ef6a9b803a6bcf68c1e5faa8bd8962924a832937ad746 -test/extractor-tests/generated/StructExprFieldList/StructExprFieldList.ql 95559d69ef1a343c6329da7eb004b4ee6e7cce1553ba9899da3f827f3d69885a f9dbcc7dce8371e23a827f91dd07f7da97bdda19107214c1a1e1cd39e4378e31 -test/extractor-tests/generated/StructField/StructField.ql 2ea449886dea1b6528001d318e25bbbe31804db9c15da505cda3f64bc83f0b94 10e0bb0a1d64a385cb9dd588b732684265ba66c3dbe80e7dc790aaff7d49bbea -test/extractor-tests/generated/StructFieldList/StructFieldList.ql fdeaed2216d64834c57b61c05ad45a2ebf1510561f3c68aac66988cc7c72c2bb 7567265ef5b878c269dcd311b7e23c1cb0946ee62c42b8bb47123ce33131cb01 -test/extractor-tests/generated/StructPat/StructPat.ql 130c5fbd23bd0fdf3ee10d94fc03572e40884e9c3c6242d3c43f44dc7edef0b3 4ee4eb291464273b0d17cc49ae2bb8aaa7ffe85bf5109a44848d92031cc7dc79 -test/extractor-tests/generated/StructPatField/StructPatField.ql 71707a256d378e9c4646bb3f69c04588f790cd1056ac54955f23356e516571c7 b78d2a04ef5749e2b0bf2d2190cbf467a2d6bb4af0b467195a2dc936e2250cec -test/extractor-tests/generated/StructPatFieldList/StructPatFieldList.ql d458c2bd51dbea2ea8df9c9ec237edc49a7dd006e3800702dbbcc738dbbbd9be f1c061c750a42fcf7877300f27a935e608e3208deaeb79f55ec13e2822037690 +test/extractor-tests/generated/SelfParam/SelfParam.ql 7e57dd845ddc9142cce250c7e67e36044f2cc27b618a3b8876db7a6ac336d3e3 e546b5a690770e57bcfb07a662430f62128a3fed4eb46bd17c60c9e4595154ba +test/extractor-tests/generated/SlicePat/SlicePat.ql ec056b803471d22c8575313e0caca89a3d527d228719375e87cc6061c3da4ffe fb0af765ce9d04805cdd445e2222d6f956c6789285705bb1079e540935ae6cc5 +test/extractor-tests/generated/SliceTypeRepr/SliceTypeRepr.ql a009f2ba47f3b082db274b6bd7068d65c0205bd11b13d2c202e43a6b9b48e76b a3092ea5f2b7113235aec5136800205265f1607c5cfac9f5a3552bed5d98cdf2 +test/extractor-tests/generated/SourceFile/SourceFile.ql 19ae5570a88b9e2d82db66685a31b01cc8e0c86c622a4bfaabe8c5b397b27eea 60e2ba5eb82518d6408254fb4ec01277b6c6c0e4316d4f3cdc809da9c32c4a57 +test/extractor-tests/generated/Static/Static.ql 103276adfe23b609b5965439d024007d4ed6831562452f880ee89300aab3e3a6 0418668d83b2e570bddb6edbf4eb7927f4fa6933ccda86c0354463bb839f724f +test/extractor-tests/generated/StmtList/StmtList.ql 4c6b9d5d8fd7535f97d81b968d4f67fc50e10c5d0f980e7c2704bbf5cd07481e ad972adb8d9a7892e6f8a12d96649340441f947afc99e633ea438c4d5c795ce4 +test/extractor-tests/generated/Struct/Struct.ql 197de8de01ede52110d827c4a673fcedc9175b1245b736a211b8724b4345902b fdf5d848a3b5dde164f1a540d7212fd3a3f6b0228c4645ddca773190830e2eb4 +test/extractor-tests/generated/StructExpr/StructExpr.ql 1e577f7cc83aa86fc82e4ac467bfb8a0c239408d4217f92a0a689957ea4fe6fe 35568a6cb7f0aaa3026e11a3b0e750eb5e93d4c0b6f737171e27c84f5dc967ac +test/extractor-tests/generated/StructExprField/StructExprField.ql b65375963aa24f0d1dd4c10784e32ab8c337ad431462ea1d081a0e456fbb1362 7f5a49e8df03ed0890b51c2e941d636fbbf70445a53d3af2c0f34a04f26bc6ef +test/extractor-tests/generated/StructExprFieldList/StructExprFieldList.ql 01dc3ef66d79836a3d372464f05454015648ab093f9547c5d9c5d55271acb718 83625301c097fa38d4e6021ea28b8adc6338076c8c2aa88a86a22aac412839f6 +test/extractor-tests/generated/StructField/StructField.ql dbdb627202975a0ca07ed441449ecc95d9d0764084a49a18e7849164b2e65ce2 8e7f32f28d15104575eaa985e892c162ec775adf3481c227ef618b5668168de7 +test/extractor-tests/generated/StructFieldList/StructFieldList.ql 292170b20f3a55c0cd6a8d78ce99474ca68daf6fb380cffe00b2bd7074e1b73a 404bab780f290ae04d1d71d3c6d4e0092bb3d8c55e956168d2a445cbd6d1f06d +test/extractor-tests/generated/StructPat/StructPat.ql 73bd755ffb8d5ff3c77d7570c6d50eab7b51d8d4a44b638cf5904c37065f496e 9589dc8d8abd80d9f48d445af3dbdbd906a9c19dc75582688bf9c3abaa16861e +test/extractor-tests/generated/StructPatField/StructPatField.ql 92cb6a4b5234359c02d66085b10d41f37b77370491ed478ad6d4d9b12b943ecf 14bc2079763b53bc6ab11356f3bb21820ae9e4dd1b2a42a78665c32181c4ef92 +test/extractor-tests/generated/StructPatFieldList/StructPatFieldList.ql a3ba3e99d3c87d5e0ae0ad82cbea3600ac1745e9364d54d8d51224b51a5a09a5 5942ed2722c006bae99de9174249110bfc79594c5ef9a6dfc098ae2be269b8f3 test/extractor-tests/generated/TokenTree/TokenTree.ql 55592f43a6fe99045d0b0b1e2323211d3a3fd64a8c7d2b083f2518d4c3e2e4b0 8eeef2060c80b0918857ba9b3a8543a4b866ca04be3d5ca18aae8a26cbdb836e -test/extractor-tests/generated/Trait/AssocItemList.ql 46a0cf0c5805dbd7f6f4618e4340fcc73c1b46c925446d2def373791fbc42fad 246d726e6d84d804f1bb6dac464352f78cc3f8c3f3700335a3557436b19cdfd7 -test/extractor-tests/generated/Trait/Trait.ql add2a891978f85b28274fe8ba2e2968a146b0775a16d3e1afa910b001f173efe 10bd9f99e90bac1f78318be5be50ef896e8ec6ef4fcdb4fdb9b963e3c64fc849 -test/extractor-tests/generated/TraitAlias/TraitAlias.ql 74853b3529a99f19bd3e9738052582f684459f9c6ca8d0835696eeb6a8575001 bcdb41a27aa1a4d25c006504ba1a52705233d64483c249d2ff66f74271f1dfe9 -test/extractor-tests/generated/TryExpr/TryExpr.ql 117b4d1b0c2b75f02a46c595efbbdc1f6f12914882c4d7e7a10c93ee6d777e24 381556ac2dfe36e6625b5f3d688ac89540efb09974aa7260437867108df084d7 -test/extractor-tests/generated/TupleExpr/TupleExpr.ql c5a18a976c1efbc8d0b0a187e0412d92c76e7dbbb568ea69da10d168a2148711 ed927c16e72b5320aa7cda120bfc2213874db4b7c5b32ea8afcd53361b7550e0 -test/extractor-tests/generated/TupleField/TupleField.ql 611cd986b821b25e7e537d61251904807c33b3635fd0c422b09ee70fc6cee665 89a9c0ba49d80bc0d97eb413d5e714d527dcddc8be821396f63c9d5696522fa3 -test/extractor-tests/generated/TupleFieldList/TupleFieldList.ql 2d3f8a1338f1d01377d629b5a7eac29cfdd0cafb16d81e1f1d140a6455a6bcf7 f6c6accbe702a9a27aa87ee4d35a35e64bbf4f4a7498e412a96c49788196c044 -test/extractor-tests/generated/TuplePat/TuplePat.ql f6ba04e5cd2b02b46d09a23c99ef2f161616aab77bb1afbc2ea0a3166b4ab42e 05892d8c5f731a4abe877bbaa85e050d8df2a1044db026ebd761ed2b72179e4e -test/extractor-tests/generated/TupleStructPat/TupleStructPat.ql 14efc97b6c7b657fda082a88367da78eb6222f625cd81f5dae63cd919687fb80 179686ba04d01e13b10bffa203a5d08ef4b764897c254b8a91d84af015d23e9d -test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr.ql 042d2bdcfd80894ff1dde1a1d267e6518ed8f860abc51304653f15526f41f222 e2cfe1d40fdde8018278dbbcfedd39f368d203a550ebda6d4efab16082d8b20b -test/extractor-tests/generated/TypeAlias/TypeAlias.ql ef7b8b47bf61330618e4bdef60b12ef8b1c4aa22f7dd06018b784192b8098b69 2130448d770d6f4e8a69db1481fcb778a5ddeb62572ee63ecdc15e69d8207d64 -test/extractor-tests/generated/TypeArg/TypeArg.ql f461f3151f37bdcf1da2212bfaec703573c387d82c7c71113964a526a93d9f5b 4eb7e89236d07ca6ebaa05296ccd76b9bc57bc3098f2f67c099975db20a11b5a -test/extractor-tests/generated/TypeBound/TypeBound.ql 570ba4456e76523ecdb8139713a7a63d1f90829c105c211c828dfe302898310a 00acce8eacd21bc0be57bb65fc7b0dd267f5678e1db389430023ecff327af7bc -test/extractor-tests/generated/TypeBoundList/TypeBoundList.ql e3c13bbd169c3f8e4d6d0243bc1b2bb474b05b8e86c6eaad7eb842b51dd0aec5 e45984b4bdbc9f05614ec345c5a4626750ef8ae469a21a8486350d285f5af219 -test/extractor-tests/generated/TypeParam/TypeParam.ql 795e8b9d80e43a55418443981278b9f62abdc342795de7afa0e1956cd59799ba e83faaa1c48d9b8c89ac31fa47754f9ff147aec3d397f13b1d44dff281761a8f -test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr.ql fd8e3f02dbcb660d76a8f567896026fc05d34a7377ccbff194b419c43f93071f 020ff884ed0ab6b08806b604450aad662b2214c131e8422495eaa591b7731c38 -test/extractor-tests/generated/Union/Union.ql bcaee20c97bd89ed10104df86da104d1f09538cb8b0208ce41dfaf7acada6360 ace13464c76107885d499463d96dc12b762aec08b46e454ba87871875a6d9067 -test/extractor-tests/generated/Use/Use.ql ed960f411be6d98bfed41d16640af9a070b06e2234f108da16b31720f936ca1b 2ec31c90f95c7b6771eabea338147329fc06bc0b876507b1a1589fcb03f3c526 -test/extractor-tests/generated/UseBoundGenericArgs/UseBoundGenericArgs.ql 2573dc28f705a1016724605d7860bbca4d389d33ffdb188b40be2d03d3345826 3898939cdcd333b25bd7f2fd8014519bde7fc9805af0cafb5ddbec612d8ceee9 -test/extractor-tests/generated/UseTree/UseTree.ql 6a7e7ab1e52afc0644d336f21d6bdfeb14cc43f04577d146cf14e6057134f08f 14b822ac2ff2fdc363b6ba4c8f8211edfb480a628c5c4d9e71c4700f5ff36c91 -test/extractor-tests/generated/UseTreeList/UseTreeList.ql 26c99ec196cd97cdc32dc770dc3aedc89622eca98bd984590f109d5aa7de21bf 8d114ced9062417f7cea485addc9f14658ac157514ec6b06e26c94cc7f76891c -test/extractor-tests/generated/Variant/Variant.ql 48768edd1cc9006288847e3efcbfd5361fe64ec9ff2db72fa65d4787558a9a6a ca35d4aaa6a5722c30e10f5a0cd16e0f5b7dfddfa983badf500f7b285278959f -test/extractor-tests/generated/VariantList/VariantList.ql 102856a74ef5409a2fc2d079a8d9c7dad8622aa017432e510709421527a17183 d0fd9f19c02814a8beb41cea7566854b90fc2cf0b679f743272bb3a380411457 -test/extractor-tests/generated/Visibility/Visibility.ql 0db452f1bf77c271b001745958ec226103bf6bc99f81bb0722d16e950644e186 7752fcc2f54cf7d19ec2ecac674977aff35e5912dd565bbe9a15f633153d0f8a -test/extractor-tests/generated/WhereClause/WhereClause.ql 6ae112390006c6af5b8296d95b528b5d48d8156183db4e1a5e24b3ffc35431ca 6d268bf500316b22ecbfe93eb126fc2aae75070e1c3ce2e03526b0c4d1b6251c -test/extractor-tests/generated/WherePred/WherePred.ql c74328a8e99d97c9dd01a135de35caef5a2f5b5c7cd3d08ed8e2db84b47e43cd a409013c55b46acefb0a43d7aaea0b6526df40896d470a523ac1e5c318d04745 -test/extractor-tests/generated/WhileExpr/WhileExpr.ql 70989278938c6e541dabb431a80cea8f4368adb1e891db1fa6c98569cbd78407 f28ac4090143a7ffc1d52ee8bd6c6809b4f09d718ea26d1637c22802f5c1735b +test/extractor-tests/generated/Trait/AssocItemList.ql 065c4903992500423d796800e7dc9a5835a07cbada595108f3af6efa72517782 aa797bf5ddefb800d5ca7f49c19c5124b1007e1658129b27c8c3de34427c7f08 +test/extractor-tests/generated/Trait/Trait.ql ba40c2de2e8f2225ea7876c36b2510079838c0f4a99232bf0f3a3ab56b7705c4 c34364d0425f597a645fbb8b6a3874588cc652044909f1db73b09f2b6deae072 +test/extractor-tests/generated/TraitAlias/TraitAlias.ql 434558e26e1cdc4054536dd7a3e5e636509cd0f8576ba1612224a9873882a383 c904109afa94cffeacd6749dd4ad8b9d2e2cb3b228c275898d88625615dbedfc +test/extractor-tests/generated/TryExpr/TryExpr.ql 4e3c224a7d5fb8f01654c7d3c79414daa575897cfa6f351fcd5b5832f53a151f d961a497c304c1c5aa1d94e04aed2bf17a2c422e315f05986e1a9027e69dbd2a +test/extractor-tests/generated/TupleExpr/TupleExpr.ql 4011d94438903e96fa321285558f5791bee7e1d1fb26be0381586511cf439d1b c6bc8d08a8d5d98d7a52b72d5c597b63754fe12cec653c520833e4b71a9dcea4 +test/extractor-tests/generated/TupleField/TupleField.ql ed681b7fee5e68d24db4999389727b2589e5af793d3c2ddc8b1e245713c0e1f8 4f867b29adf91b4bfa5052e16d392c16bf260e858aad11b60c42f1eddb476e61 +test/extractor-tests/generated/TupleFieldList/TupleFieldList.ql 3c3fcef21231550bbbf6804314b94d44cc18d445987c23cb6f2c88015570cc4a 8958e6748296bc6d0ad469e52852c38445fe462a8599a2e71867aa5d7066595e +test/extractor-tests/generated/TuplePat/TuplePat.ql 80609f1c525e90e13f34d55a81d47a83a03e064241f8d33232e2a79eaeea5159 d289b19dae4cbae0180cc58bb946f41646bb9dc008f5ce8a0e12eaddbc7e63e9 +test/extractor-tests/generated/TupleStructPat/TupleStructPat.ql d00b185013bb4e5f878a5ec261ab2cfbf1fe2f67d1ad2e05d062629211f677ec 24254631a28c24ca78b4fa1b89c53b0b002cb43fe585e274155fcca0c481056c +test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr.ql 2f1503734d272cd0616e5885cd344659cbd0ae7309a375c8351f57f2b86c3302 276a4fe91b8dc64cdca4467343e2bb2e240c66ec1e4e11bf8cba73819c6532cc +test/extractor-tests/generated/TypeAlias/TypeAlias.ql 2b120c7fe640b233540f6982153fddf50ddc089b8284dca321b4c48eecf93dfd 6d40a0d8c927dd499fd92fd95638c50eeca8f956aa1706c17913dbf83f0f500c +test/extractor-tests/generated/TypeArg/TypeArg.ql e1ca286c03bd2d44054f5dd75aac250382037f243046c49ec752ad8d65e4c0ba f316d5fa84a721427c0aadf6bfa0ed4cfd86e4d318cfb0fe82efc52e65c4733b +test/extractor-tests/generated/TypeBound/TypeBound.ql 4f5a2a49075c01c982988e66759f61c5285343d78cda94e228e17593d16fee6e 7aae320e881d6ea969e31b1e8fe586feb07b1db43c65da684cbac66157354851 +test/extractor-tests/generated/TypeBoundList/TypeBoundList.ql 6827529eca62f5e7be87538af6231099f5932f39d8694f7a76369273b93f28ea 539dac4ccda7e51b7ae1a9e05d8a56a98176d9de25d5ed4347ebe2fbea8adeb1 +test/extractor-tests/generated/TypeParam/TypeParam.ql c5f8f62f2877c719c3cf069f9d0ca83cebc14f7611c6c2dce86c85114ea2635c 751c630986f35a8d0d32fbeb61ca6ff801c96cd1829dbccc874fbf5f5158e98d +test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr.ql a7b7a93104fff28515154cf8e79045d3eea2494b5c46f1caf36639c53b1c64a7 070ee2e1664e3291646ea56681b5c93331f94dcc519deb28622beca3e26e16f3 +test/extractor-tests/generated/Union/Union.ql ef31f8b10ced5ed3a441f8ad0640e2fb46e566c859856e84f5a7fd6c85424b2c 1066561577ab19bf028ea29622750adc17de5b4d5dd0a8f77a8a50c8a15062b6 +test/extractor-tests/generated/Use/Use.ql a12b9867cc71a681cd4602c4045e75288a7cca502d48e20ccf17e155be130b3b 2b9dcac18670b062461193a6b40fcf569f19605b14daff82239fb39fd7fa3408 +test/extractor-tests/generated/UseBoundGenericArgs/UseBoundGenericArgs.ql 46ff2cf0fc8b561b21f8dff3230550f2feafbe52a7ea8b28bf183abef94ff241 92646f3bd15a8cf4c23ee9de4d857ac5c147e570ef0eb223423a109b4b79aedf +test/extractor-tests/generated/UseTree/UseTree.ql 3c2bc924b54b9af5c95784023d4098924571ba464c5982124acea712c3ce0e93 8d9f963b61a9a8a83efd93438ce8b43d4aa763493338ad9afd2a3dc7a440892d +test/extractor-tests/generated/UseTreeList/UseTreeList.ql faff7bfc060d5b0a922f38b37bf586596566186f704c9921651785580e86d684 81e5b90edeef0d3883547844a030e72b555d714de1ed8dded1c22a3772b4449a +test/extractor-tests/generated/Variant/Variant.ql 9405704e9192cac4838dcba8625261d5c1f839bb8c26dac44c2d517d172a06da 7236de83eb542cb4024e07d2cb5a899c851116a3a66b3896270ecf663439c6fe +test/extractor-tests/generated/VariantList/VariantList.ql 1c1d82ce3ecfa7daaae1920662510e81892ed899a3c2f785e2ff3670245a03cd 29d4c5ab2b737a92c7525789e10a4aa9848f1a327e34f4e9543018021106b303 +test/extractor-tests/generated/Visibility/Visibility.ql 725d47d7444332133df603f9b06592dc40b0f83bf5e21ad4781c5658e001a3aa 2d65a30702a8bb5bc91caf6ae2d0e4c769b3eeb0d72ffbd9cdb81048be4061ad +test/extractor-tests/generated/WhereClause/WhereClause.ql a6f0e69ffa6b997cac04d4da442eb8bde517a576840c953abcc40863b9099ba1 7ce888fffc3038d5b18f8c94d3b045815cd45500e1bb3849c05fc874edbeb695 +test/extractor-tests/generated/WherePred/WherePred.ql 504d00a40e418542c3e0ff30d43c4d2d0e7218b2a31fcf32c9310d705d97b9fe 61c53dde539a9e1e3d6bf13ca1d0dab8af6ea6b54ab698a0a5a5f49bf627934b +test/extractor-tests/generated/WhileExpr/WhileExpr.ql dcfe1ed375514a7b7513272767ed195cdbf339b56e00e62d207ca1eee080f164 f067283510655f0cf810cae834ac29ad2c6007ba312d027ebcdf695a23ec33e4 test/extractor-tests/generated/WildcardPat/WildcardPat.ql d36f52a1d00d338b43894b6f8e198ad0c409542f436e3e57d527205c3dfee38c 4e1321e714cedb606e0d84f10ed37c72da61b3a1616754b967f721ff0bc0e4ee -test/extractor-tests/generated/YeetExpr/YeetExpr.ql 59c3aba09061d43a5af7ff06319b5c55b389fdbe1f823331e9dec77790e9be56 64f033fb000762ab818f2b448449ccb7f26e9ec62d55c5a76029b62c1baad90d -test/extractor-tests/generated/YieldExpr/YieldExpr.ql f2aa61b98ed1251ee89da61a6f60e2b93094ec393c98d029614307ab37909ea9 fd3ec990dc1d7d47253db528c7eaf01131b0bb48a6bd1efba4937de58de7c4ae +test/extractor-tests/generated/YeetExpr/YeetExpr.ql 5c552b490ccf5b123f7a2fa3e73d03d008e4df5928ffa0bd503dc6bd7736462c 09a4f413ae045051abe392f29949d6feab1a808d666c6b8dac0901f84a8a4740 +test/extractor-tests/generated/YieldExpr/YieldExpr.ql 1d948eaa69ccffb12a2f832b84918d36becfd356d1c6d7cfa9315df03e77ca95 c31281830aee6866b0d4757a427183df4d2f06245345db61f69e9bfa5cd09a63 diff --git a/rust/ql/test/extractor-tests/generated/Abi/Abi.expected b/rust/ql/test/extractor-tests/generated/Abi/Abi.expected index 9a92f0924dd..158233ee757 100644 --- a/rust/ql/test/extractor-tests/generated/Abi/Abi.expected +++ b/rust/ql/test/extractor-tests/generated/Abi/Abi.expected @@ -1,4 +1,4 @@ instances -| gen_abi.rs:7:5:7:14 | Abi | hasAbiString: | yes | +| gen_abi.rs:7:5:7:14 | Abi | getAbiString | gen_abi.rs:7:5:7:14 | Abi | "C" | diff --git a/rust/ql/test/extractor-tests/generated/Abi/Abi.ql b/rust/ql/test/extractor-tests/generated/Abi/Abi.ql index 5b39b23704b..bbf211911a4 100644 --- a/rust/ql/test/extractor-tests/generated/Abi/Abi.ql +++ b/rust/ql/test/extractor-tests/generated/Abi/Abi.ql @@ -2,12 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances(Abi x, string hasAbiString__label, string hasAbiString) { - toBeTested(x) and - not x.isUnknown() and - hasAbiString__label = "hasAbiString:" and - if x.hasAbiString() then hasAbiString = "yes" else hasAbiString = "no" -} +query predicate instances(Abi x) { toBeTested(x) and not x.isUnknown() } query predicate getAbiString(Abi x, string getAbiString) { toBeTested(x) and not x.isUnknown() and getAbiString = x.getAbiString() diff --git a/rust/ql/test/extractor-tests/generated/ArgList/ArgList.expected b/rust/ql/test/extractor-tests/generated/ArgList/ArgList.expected index 8b04d7ad717..cf6f3a3a058 100644 --- a/rust/ql/test/extractor-tests/generated/ArgList/ArgList.expected +++ b/rust/ql/test/extractor-tests/generated/ArgList/ArgList.expected @@ -1,5 +1,5 @@ instances -| gen_arg_list.rs:7:8:7:16 | ArgList | getNumberOfArgs: | 3 | +| gen_arg_list.rs:7:8:7:16 | ArgList | getArg | gen_arg_list.rs:7:8:7:16 | ArgList | 0 | gen_arg_list.rs:7:9:7:9 | 1 | | gen_arg_list.rs:7:8:7:16 | ArgList | 1 | gen_arg_list.rs:7:12:7:12 | 2 | diff --git a/rust/ql/test/extractor-tests/generated/ArgList/ArgList.ql b/rust/ql/test/extractor-tests/generated/ArgList/ArgList.ql index 82b819a3305..91bbcef10e6 100644 --- a/rust/ql/test/extractor-tests/generated/ArgList/ArgList.ql +++ b/rust/ql/test/extractor-tests/generated/ArgList/ArgList.ql @@ -2,12 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances(ArgList x, string getNumberOfArgs__label, int getNumberOfArgs) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfArgs__label = "getNumberOfArgs:" and - getNumberOfArgs = x.getNumberOfArgs() -} +query predicate instances(ArgList x) { toBeTested(x) and not x.isUnknown() } query predicate getArg(ArgList x, int index, Expr getArg) { toBeTested(x) and not x.isUnknown() and getArg = x.getArg(index) diff --git a/rust/ql/test/extractor-tests/generated/ArrayListExpr/ArrayListExpr.expected b/rust/ql/test/extractor-tests/generated/ArrayListExpr/ArrayListExpr.expected index 28e164ab0d9..fbe635d579d 100644 --- a/rust/ql/test/extractor-tests/generated/ArrayListExpr/ArrayListExpr.expected +++ b/rust/ql/test/extractor-tests/generated/ArrayListExpr/ArrayListExpr.expected @@ -1,5 +1,5 @@ instances -| gen_array_list_expr.rs:5:5:5:13 | [...] | getNumberOfExprs: | 3 | getNumberOfAttrs: | 0 | +| gen_array_list_expr.rs:5:5:5:13 | [...] | getExpr | gen_array_list_expr.rs:5:5:5:13 | [...] | 0 | gen_array_list_expr.rs:5:6:5:6 | 1 | | gen_array_list_expr.rs:5:5:5:13 | [...] | 1 | gen_array_list_expr.rs:5:9:5:9 | 2 | diff --git a/rust/ql/test/extractor-tests/generated/ArrayListExpr/ArrayListExpr.ql b/rust/ql/test/extractor-tests/generated/ArrayListExpr/ArrayListExpr.ql index 30e5dd7b631..36f7bb41db9 100644 --- a/rust/ql/test/extractor-tests/generated/ArrayListExpr/ArrayListExpr.ql +++ b/rust/ql/test/extractor-tests/generated/ArrayListExpr/ArrayListExpr.ql @@ -2,17 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - ArrayListExpr x, string getNumberOfExprs__label, int getNumberOfExprs, - string getNumberOfAttrs__label, int getNumberOfAttrs -) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfExprs__label = "getNumberOfExprs:" and - getNumberOfExprs = x.getNumberOfExprs() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() -} +query predicate instances(ArrayListExpr x) { toBeTested(x) and not x.isUnknown() } query predicate getExpr(ArrayListExpr x, int index, Expr getExpr) { toBeTested(x) and not x.isUnknown() and getExpr = x.getExpr(index) diff --git a/rust/ql/test/extractor-tests/generated/ArrayRepeatExpr/ArrayRepeatExpr.expected b/rust/ql/test/extractor-tests/generated/ArrayRepeatExpr/ArrayRepeatExpr.expected index bf13b122edc..39bb2b685be 100644 --- a/rust/ql/test/extractor-tests/generated/ArrayRepeatExpr/ArrayRepeatExpr.expected +++ b/rust/ql/test/extractor-tests/generated/ArrayRepeatExpr/ArrayRepeatExpr.expected @@ -1,5 +1,5 @@ instances -| gen_array_repeat_expr.rs:5:5:5:11 | [1; 10] | getNumberOfExprs: | 2 | getNumberOfAttrs: | 0 | getRepeatOperand: | gen_array_repeat_expr.rs:5:6:5:6 | 1 | getRepeatLength: | gen_array_repeat_expr.rs:5:9:5:10 | 10 | +| gen_array_repeat_expr.rs:5:5:5:11 | [1; 10] | getRepeatOperand: | gen_array_repeat_expr.rs:5:6:5:6 | 1 | getRepeatLength: | gen_array_repeat_expr.rs:5:9:5:10 | 10 | getExpr | gen_array_repeat_expr.rs:5:5:5:11 | [1; 10] | 0 | gen_array_repeat_expr.rs:5:6:5:6 | 1 | | gen_array_repeat_expr.rs:5:5:5:11 | [1; 10] | 1 | gen_array_repeat_expr.rs:5:9:5:10 | 10 | diff --git a/rust/ql/test/extractor-tests/generated/ArrayRepeatExpr/ArrayRepeatExpr.ql b/rust/ql/test/extractor-tests/generated/ArrayRepeatExpr/ArrayRepeatExpr.ql index ab822b84c41..7f337fc87b5 100644 --- a/rust/ql/test/extractor-tests/generated/ArrayRepeatExpr/ArrayRepeatExpr.ql +++ b/rust/ql/test/extractor-tests/generated/ArrayRepeatExpr/ArrayRepeatExpr.ql @@ -3,16 +3,11 @@ import codeql.rust.elements import TestUtils query predicate instances( - ArrayRepeatExpr x, string getNumberOfExprs__label, int getNumberOfExprs, - string getNumberOfAttrs__label, int getNumberOfAttrs, string getRepeatOperand__label, - Expr getRepeatOperand, string getRepeatLength__label, Expr getRepeatLength + ArrayRepeatExpr x, string getRepeatOperand__label, Expr getRepeatOperand, + string getRepeatLength__label, Expr getRepeatLength ) { toBeTested(x) and not x.isUnknown() and - getNumberOfExprs__label = "getNumberOfExprs:" and - getNumberOfExprs = x.getNumberOfExprs() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and getRepeatOperand__label = "getRepeatOperand:" and getRepeatOperand = x.getRepeatOperand() and getRepeatLength__label = "getRepeatLength:" and diff --git a/rust/ql/test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr.expected b/rust/ql/test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr.expected index 42cc87636b6..98da7c6b5a9 100644 --- a/rust/ql/test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr.expected +++ b/rust/ql/test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr.expected @@ -1,5 +1,5 @@ instances -| gen_array_type_repr.rs:7:14:7:21 | ArrayTypeRepr | hasConstArg: | yes | hasElementTypeRepr: | yes | +| gen_array_type_repr.rs:7:14:7:21 | ArrayTypeRepr | getConstArg | gen_array_type_repr.rs:7:14:7:21 | ArrayTypeRepr | gen_array_type_repr.rs:7:20:7:20 | ConstArg | getElementTypeRepr diff --git a/rust/ql/test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr.ql b/rust/ql/test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr.ql index 3bc2a65f431..e12f81b7b71 100644 --- a/rust/ql/test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr.ql +++ b/rust/ql/test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr.ql @@ -2,17 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - ArrayTypeRepr x, string hasConstArg__label, string hasConstArg, string hasElementTypeRepr__label, - string hasElementTypeRepr -) { - toBeTested(x) and - not x.isUnknown() and - hasConstArg__label = "hasConstArg:" and - (if x.hasConstArg() then hasConstArg = "yes" else hasConstArg = "no") and - hasElementTypeRepr__label = "hasElementTypeRepr:" and - if x.hasElementTypeRepr() then hasElementTypeRepr = "yes" else hasElementTypeRepr = "no" -} +query predicate instances(ArrayTypeRepr x) { toBeTested(x) and not x.isUnknown() } query predicate getConstArg(ArrayTypeRepr x, ConstArg getConstArg) { toBeTested(x) and not x.isUnknown() and getConstArg = x.getConstArg() diff --git a/rust/ql/test/extractor-tests/generated/AsmConst/AsmConst.expected b/rust/ql/test/extractor-tests/generated/AsmConst/AsmConst.expected index 40e656f638e..30ed42e46f9 100644 --- a/rust/ql/test/extractor-tests/generated/AsmConst/AsmConst.expected +++ b/rust/ql/test/extractor-tests/generated/AsmConst/AsmConst.expected @@ -1,4 +1,4 @@ instances -| gen_asm_const.rs:8:30:8:37 | AsmConst | hasExpr: | yes | isConst: | yes | +| gen_asm_const.rs:8:30:8:37 | AsmConst | isConst: | yes | getExpr | gen_asm_const.rs:8:30:8:37 | AsmConst | gen_asm_const.rs:8:36:8:37 | 42 | diff --git a/rust/ql/test/extractor-tests/generated/AsmConst/AsmConst.ql b/rust/ql/test/extractor-tests/generated/AsmConst/AsmConst.ql index 01a77897fde..dbec4fe27e3 100644 --- a/rust/ql/test/extractor-tests/generated/AsmConst/AsmConst.ql +++ b/rust/ql/test/extractor-tests/generated/AsmConst/AsmConst.ql @@ -2,13 +2,9 @@ import codeql.rust.elements import TestUtils -query predicate instances( - AsmConst x, string hasExpr__label, string hasExpr, string isConst__label, string isConst -) { +query predicate instances(AsmConst x, string isConst__label, string isConst) { toBeTested(x) and not x.isUnknown() and - hasExpr__label = "hasExpr:" and - (if x.hasExpr() then hasExpr = "yes" else hasExpr = "no") and isConst__label = "isConst:" and if x.isConst() then isConst = "yes" else isConst = "no" } diff --git a/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.expected b/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.expected index 444113fa963..2091c3814d5 100644 --- a/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.expected +++ b/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.expected @@ -1,5 +1,5 @@ instances -| gen_asm_expr.rs:6:9:7:59 | AsmExpr | getNumberOfAsmPieces: | 2 | getNumberOfAttrs: | 1 | getNumberOfTemplates: | 1 | +| gen_asm_expr.rs:6:9:7:59 | AsmExpr | getAsmPiece | gen_asm_expr.rs:6:9:7:59 | AsmExpr | 0 | gen_asm_expr.rs:7:39:7:47 | AsmOperandNamed | | gen_asm_expr.rs:6:9:7:59 | AsmExpr | 1 | gen_asm_expr.rs:7:50:7:58 | AsmOperandNamed | diff --git a/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.ql b/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.ql index 3c7748a5058..11cc082dae0 100644 --- a/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.ql +++ b/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.ql @@ -2,20 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - AsmExpr x, string getNumberOfAsmPieces__label, int getNumberOfAsmPieces, - string getNumberOfAttrs__label, int getNumberOfAttrs, string getNumberOfTemplates__label, - int getNumberOfTemplates -) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfAsmPieces__label = "getNumberOfAsmPieces:" and - getNumberOfAsmPieces = x.getNumberOfAsmPieces() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - getNumberOfTemplates__label = "getNumberOfTemplates:" and - getNumberOfTemplates = x.getNumberOfTemplates() -} +query predicate instances(AsmExpr x) { toBeTested(x) and not x.isUnknown() } query predicate getAsmPiece(AsmExpr x, int index, AsmPiece getAsmPiece) { toBeTested(x) and not x.isUnknown() and getAsmPiece = x.getAsmPiece(index) diff --git a/rust/ql/test/extractor-tests/generated/AsmLabel/AsmLabel.expected b/rust/ql/test/extractor-tests/generated/AsmLabel/AsmLabel.expected index 75bc10f415e..cbd9eac398a 100644 --- a/rust/ql/test/extractor-tests/generated/AsmLabel/AsmLabel.expected +++ b/rust/ql/test/extractor-tests/generated/AsmLabel/AsmLabel.expected @@ -1,4 +1,4 @@ instances -| gen_asm_label.rs:10:9:10:47 | AsmLabel | hasBlockExpr: | yes | +| gen_asm_label.rs:10:9:10:47 | AsmLabel | getBlockExpr | gen_asm_label.rs:10:9:10:47 | AsmLabel | gen_asm_label.rs:10:15:10:47 | { ... } | diff --git a/rust/ql/test/extractor-tests/generated/AsmLabel/AsmLabel.ql b/rust/ql/test/extractor-tests/generated/AsmLabel/AsmLabel.ql index 80f265240b3..d2517cdd413 100644 --- a/rust/ql/test/extractor-tests/generated/AsmLabel/AsmLabel.ql +++ b/rust/ql/test/extractor-tests/generated/AsmLabel/AsmLabel.ql @@ -2,12 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances(AsmLabel x, string hasBlockExpr__label, string hasBlockExpr) { - toBeTested(x) and - not x.isUnknown() and - hasBlockExpr__label = "hasBlockExpr:" and - if x.hasBlockExpr() then hasBlockExpr = "yes" else hasBlockExpr = "no" -} +query predicate instances(AsmLabel x) { toBeTested(x) and not x.isUnknown() } query predicate getBlockExpr(AsmLabel x, BlockExpr getBlockExpr) { toBeTested(x) and not x.isUnknown() and getBlockExpr = x.getBlockExpr() diff --git a/rust/ql/test/extractor-tests/generated/AsmOperandExpr/AsmOperandExpr.expected b/rust/ql/test/extractor-tests/generated/AsmOperandExpr/AsmOperandExpr.expected index 7874d02d91d..262ca3ada57 100644 --- a/rust/ql/test/extractor-tests/generated/AsmOperandExpr/AsmOperandExpr.expected +++ b/rust/ql/test/extractor-tests/generated/AsmOperandExpr/AsmOperandExpr.expected @@ -1,6 +1,6 @@ instances -| gen_asm_operand_expr.rs:8:35:8:35 | AsmOperandExpr | hasInExpr: | yes | hasOutExpr: | yes | -| gen_asm_operand_expr.rs:8:46:8:46 | AsmOperandExpr | hasInExpr: | yes | hasOutExpr: | yes | +| gen_asm_operand_expr.rs:8:35:8:35 | AsmOperandExpr | +| gen_asm_operand_expr.rs:8:46:8:46 | AsmOperandExpr | getInExpr | gen_asm_operand_expr.rs:8:35:8:35 | AsmOperandExpr | gen_asm_operand_expr.rs:8:35:8:35 | x | | gen_asm_operand_expr.rs:8:46:8:46 | AsmOperandExpr | gen_asm_operand_expr.rs:8:46:8:46 | y | diff --git a/rust/ql/test/extractor-tests/generated/AsmOperandExpr/AsmOperandExpr.ql b/rust/ql/test/extractor-tests/generated/AsmOperandExpr/AsmOperandExpr.ql index ee316dd283f..c8dda7a07e0 100644 --- a/rust/ql/test/extractor-tests/generated/AsmOperandExpr/AsmOperandExpr.ql +++ b/rust/ql/test/extractor-tests/generated/AsmOperandExpr/AsmOperandExpr.ql @@ -2,17 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - AsmOperandExpr x, string hasInExpr__label, string hasInExpr, string hasOutExpr__label, - string hasOutExpr -) { - toBeTested(x) and - not x.isUnknown() and - hasInExpr__label = "hasInExpr:" and - (if x.hasInExpr() then hasInExpr = "yes" else hasInExpr = "no") and - hasOutExpr__label = "hasOutExpr:" and - if x.hasOutExpr() then hasOutExpr = "yes" else hasOutExpr = "no" -} +query predicate instances(AsmOperandExpr x) { toBeTested(x) and not x.isUnknown() } query predicate getInExpr(AsmOperandExpr x, Expr getInExpr) { toBeTested(x) and not x.isUnknown() and getInExpr = x.getInExpr() diff --git a/rust/ql/test/extractor-tests/generated/AsmOperandNamed/AsmOperandNamed.expected b/rust/ql/test/extractor-tests/generated/AsmOperandNamed/AsmOperandNamed.expected index 0401b9208bb..c8aec731ff8 100644 --- a/rust/ql/test/extractor-tests/generated/AsmOperandNamed/AsmOperandNamed.expected +++ b/rust/ql/test/extractor-tests/generated/AsmOperandNamed/AsmOperandNamed.expected @@ -1,6 +1,6 @@ instances -| gen_asm_operand_named.rs:8:34:8:43 | AsmOperandNamed | hasAsmOperand: | yes | hasName: | no | -| gen_asm_operand_named.rs:8:46:8:62 | AsmOperandNamed | hasAsmOperand: | yes | hasName: | yes | +| gen_asm_operand_named.rs:8:34:8:43 | AsmOperandNamed | +| gen_asm_operand_named.rs:8:46:8:62 | AsmOperandNamed | getAsmOperand | gen_asm_operand_named.rs:8:34:8:43 | AsmOperandNamed | gen_asm_operand_named.rs:8:34:8:43 | AsmRegOperand | | gen_asm_operand_named.rs:8:46:8:62 | AsmOperandNamed | gen_asm_operand_named.rs:8:54:8:62 | AsmRegOperand | diff --git a/rust/ql/test/extractor-tests/generated/AsmOperandNamed/AsmOperandNamed.ql b/rust/ql/test/extractor-tests/generated/AsmOperandNamed/AsmOperandNamed.ql index d47556b27e8..9c900afe42e 100644 --- a/rust/ql/test/extractor-tests/generated/AsmOperandNamed/AsmOperandNamed.ql +++ b/rust/ql/test/extractor-tests/generated/AsmOperandNamed/AsmOperandNamed.ql @@ -2,17 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - AsmOperandNamed x, string hasAsmOperand__label, string hasAsmOperand, string hasName__label, - string hasName -) { - toBeTested(x) and - not x.isUnknown() and - hasAsmOperand__label = "hasAsmOperand:" and - (if x.hasAsmOperand() then hasAsmOperand = "yes" else hasAsmOperand = "no") and - hasName__label = "hasName:" and - if x.hasName() then hasName = "yes" else hasName = "no" -} +query predicate instances(AsmOperandNamed x) { toBeTested(x) and not x.isUnknown() } query predicate getAsmOperand(AsmOperandNamed x, AsmOperand getAsmOperand) { toBeTested(x) and not x.isUnknown() and getAsmOperand = x.getAsmOperand() diff --git a/rust/ql/test/extractor-tests/generated/AsmOptionsList/AsmOptionsList.expected b/rust/ql/test/extractor-tests/generated/AsmOptionsList/AsmOptionsList.expected index 35242695ee1..cf9ec35d070 100644 --- a/rust/ql/test/extractor-tests/generated/AsmOptionsList/AsmOptionsList.expected +++ b/rust/ql/test/extractor-tests/generated/AsmOptionsList/AsmOptionsList.expected @@ -1,5 +1,5 @@ instances -| gen_asm_options_list.rs:8:14:8:36 | AsmOptionsList | getNumberOfAsmOptions: | 2 | +| gen_asm_options_list.rs:8:14:8:36 | AsmOptionsList | getAsmOption | gen_asm_options_list.rs:8:14:8:36 | AsmOptionsList | 0 | gen_asm_options_list.rs:8:22:8:28 | AsmOption | | gen_asm_options_list.rs:8:14:8:36 | AsmOptionsList | 1 | gen_asm_options_list.rs:8:31:8:35 | AsmOption | diff --git a/rust/ql/test/extractor-tests/generated/AsmOptionsList/AsmOptionsList.ql b/rust/ql/test/extractor-tests/generated/AsmOptionsList/AsmOptionsList.ql index f4b36d1a97c..a4806cce353 100644 --- a/rust/ql/test/extractor-tests/generated/AsmOptionsList/AsmOptionsList.ql +++ b/rust/ql/test/extractor-tests/generated/AsmOptionsList/AsmOptionsList.ql @@ -2,14 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - AsmOptionsList x, string getNumberOfAsmOptions__label, int getNumberOfAsmOptions -) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfAsmOptions__label = "getNumberOfAsmOptions:" and - getNumberOfAsmOptions = x.getNumberOfAsmOptions() -} +query predicate instances(AsmOptionsList x) { toBeTested(x) and not x.isUnknown() } query predicate getAsmOption(AsmOptionsList x, int index, AsmOption getAsmOption) { toBeTested(x) and not x.isUnknown() and getAsmOption = x.getAsmOption(index) diff --git a/rust/ql/test/extractor-tests/generated/AsmRegOperand/AsmRegOperand.expected b/rust/ql/test/extractor-tests/generated/AsmRegOperand/AsmRegOperand.expected index 10c0e5fbc8d..a141f1a25c2 100644 --- a/rust/ql/test/extractor-tests/generated/AsmRegOperand/AsmRegOperand.expected +++ b/rust/ql/test/extractor-tests/generated/AsmRegOperand/AsmRegOperand.expected @@ -1,6 +1,6 @@ instances -| gen_asm_reg_operand.rs:8:26:8:35 | AsmRegOperand | hasAsmDirSpec: | yes | hasAsmOperandExpr: | yes | hasAsmRegSpec: | yes | -| gen_asm_reg_operand.rs:8:38:8:46 | AsmRegOperand | hasAsmDirSpec: | yes | hasAsmOperandExpr: | yes | hasAsmRegSpec: | yes | +| gen_asm_reg_operand.rs:8:26:8:35 | AsmRegOperand | +| gen_asm_reg_operand.rs:8:38:8:46 | AsmRegOperand | getAsmDirSpec | gen_asm_reg_operand.rs:8:26:8:35 | AsmRegOperand | gen_asm_reg_operand.rs:8:26:8:28 | AsmDirSpec | | gen_asm_reg_operand.rs:8:38:8:46 | AsmRegOperand | gen_asm_reg_operand.rs:8:38:8:39 | AsmDirSpec | diff --git a/rust/ql/test/extractor-tests/generated/AsmRegOperand/AsmRegOperand.ql b/rust/ql/test/extractor-tests/generated/AsmRegOperand/AsmRegOperand.ql index 64105ef2d77..ae7a9bb84f1 100644 --- a/rust/ql/test/extractor-tests/generated/AsmRegOperand/AsmRegOperand.ql +++ b/rust/ql/test/extractor-tests/generated/AsmRegOperand/AsmRegOperand.ql @@ -2,20 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - AsmRegOperand x, string hasAsmDirSpec__label, string hasAsmDirSpec, - string hasAsmOperandExpr__label, string hasAsmOperandExpr, string hasAsmRegSpec__label, - string hasAsmRegSpec -) { - toBeTested(x) and - not x.isUnknown() and - hasAsmDirSpec__label = "hasAsmDirSpec:" and - (if x.hasAsmDirSpec() then hasAsmDirSpec = "yes" else hasAsmDirSpec = "no") and - hasAsmOperandExpr__label = "hasAsmOperandExpr:" and - (if x.hasAsmOperandExpr() then hasAsmOperandExpr = "yes" else hasAsmOperandExpr = "no") and - hasAsmRegSpec__label = "hasAsmRegSpec:" and - if x.hasAsmRegSpec() then hasAsmRegSpec = "yes" else hasAsmRegSpec = "no" -} +query predicate instances(AsmRegOperand x) { toBeTested(x) and not x.isUnknown() } query predicate getAsmDirSpec(AsmRegOperand x, AsmDirSpec getAsmDirSpec) { toBeTested(x) and not x.isUnknown() and getAsmDirSpec = x.getAsmDirSpec() diff --git a/rust/ql/test/extractor-tests/generated/AsmRegSpec/AsmRegSpec.expected b/rust/ql/test/extractor-tests/generated/AsmRegSpec/AsmRegSpec.expected index ed7ef775969..120ba8d2093 100644 --- a/rust/ql/test/extractor-tests/generated/AsmRegSpec/AsmRegSpec.expected +++ b/rust/ql/test/extractor-tests/generated/AsmRegSpec/AsmRegSpec.expected @@ -1,5 +1,5 @@ instances -| gen_asm_reg_spec.rs:8:30:8:34 | AsmRegSpec | hasIdentifier: | no | -| gen_asm_reg_spec.rs:8:43:8:45 | AsmRegSpec | hasIdentifier: | yes | +| gen_asm_reg_spec.rs:8:30:8:34 | AsmRegSpec | +| gen_asm_reg_spec.rs:8:43:8:45 | AsmRegSpec | getIdentifier | gen_asm_reg_spec.rs:8:43:8:45 | AsmRegSpec | gen_asm_reg_spec.rs:8:43:8:45 | EBX | diff --git a/rust/ql/test/extractor-tests/generated/AsmRegSpec/AsmRegSpec.ql b/rust/ql/test/extractor-tests/generated/AsmRegSpec/AsmRegSpec.ql index dfa5dad3e23..a84d2843da2 100644 --- a/rust/ql/test/extractor-tests/generated/AsmRegSpec/AsmRegSpec.ql +++ b/rust/ql/test/extractor-tests/generated/AsmRegSpec/AsmRegSpec.ql @@ -2,12 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances(AsmRegSpec x, string hasIdentifier__label, string hasIdentifier) { - toBeTested(x) and - not x.isUnknown() and - hasIdentifier__label = "hasIdentifier:" and - if x.hasIdentifier() then hasIdentifier = "yes" else hasIdentifier = "no" -} +query predicate instances(AsmRegSpec x) { toBeTested(x) and not x.isUnknown() } query predicate getIdentifier(AsmRegSpec x, NameRef getIdentifier) { toBeTested(x) and not x.isUnknown() and getIdentifier = x.getIdentifier() diff --git a/rust/ql/test/extractor-tests/generated/AsmSym/AsmSym.expected b/rust/ql/test/extractor-tests/generated/AsmSym/AsmSym.expected index 3644a5399a2..e3f8fbc9ec7 100644 --- a/rust/ql/test/extractor-tests/generated/AsmSym/AsmSym.expected +++ b/rust/ql/test/extractor-tests/generated/AsmSym/AsmSym.expected @@ -1,4 +1,4 @@ instances -| gen_asm_sym.rs:8:30:8:44 | AsmSym | hasPath: | yes | +| gen_asm_sym.rs:8:30:8:44 | AsmSym | getPath | gen_asm_sym.rs:8:30:8:44 | AsmSym | gen_asm_sym.rs:8:34:8:44 | my_function | diff --git a/rust/ql/test/extractor-tests/generated/AsmSym/AsmSym.ql b/rust/ql/test/extractor-tests/generated/AsmSym/AsmSym.ql index d138bd6b7aa..d105903ad16 100644 --- a/rust/ql/test/extractor-tests/generated/AsmSym/AsmSym.ql +++ b/rust/ql/test/extractor-tests/generated/AsmSym/AsmSym.ql @@ -2,12 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances(AsmSym x, string hasPath__label, string hasPath) { - toBeTested(x) and - not x.isUnknown() and - hasPath__label = "hasPath:" and - if x.hasPath() then hasPath = "yes" else hasPath = "no" -} +query predicate instances(AsmSym x) { toBeTested(x) and not x.isUnknown() } query predicate getPath(AsmSym x, Path getPath) { toBeTested(x) and not x.isUnknown() and getPath = x.getPath() diff --git a/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg.expected b/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg.expected index c7c15f5b58b..83bfd832501 100644 --- a/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg.expected +++ b/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg.expected @@ -1,5 +1,5 @@ instances -| gen_assoc_type_arg.rs:9:21:9:31 | AssocTypeArg | hasConstArg: | no | hasGenericArgList: | no | hasIdentifier: | yes | hasParamList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTypeBoundList: | yes | +| gen_assoc_type_arg.rs:9:21:9:31 | AssocTypeArg | getConstArg getGenericArgList getIdentifier diff --git a/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg.ql b/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg.ql index 7555e6b2b2a..1117c934180 100644 --- a/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg.ql +++ b/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg.ql @@ -2,32 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - AssocTypeArg x, string hasConstArg__label, string hasConstArg, string hasGenericArgList__label, - string hasGenericArgList, string hasIdentifier__label, string hasIdentifier, - string hasParamList__label, string hasParamList, string hasRetType__label, string hasRetType, - string hasReturnTypeSyntax__label, string hasReturnTypeSyntax, string hasTypeRepr__label, - string hasTypeRepr, string hasTypeBoundList__label, string hasTypeBoundList -) { - toBeTested(x) and - not x.isUnknown() and - hasConstArg__label = "hasConstArg:" and - (if x.hasConstArg() then hasConstArg = "yes" else hasConstArg = "no") and - hasGenericArgList__label = "hasGenericArgList:" and - (if x.hasGenericArgList() then hasGenericArgList = "yes" else hasGenericArgList = "no") and - hasIdentifier__label = "hasIdentifier:" and - (if x.hasIdentifier() then hasIdentifier = "yes" else hasIdentifier = "no") and - hasParamList__label = "hasParamList:" and - (if x.hasParamList() then hasParamList = "yes" else hasParamList = "no") and - hasRetType__label = "hasRetType:" and - (if x.hasRetType() then hasRetType = "yes" else hasRetType = "no") and - hasReturnTypeSyntax__label = "hasReturnTypeSyntax:" and - (if x.hasReturnTypeSyntax() then hasReturnTypeSyntax = "yes" else hasReturnTypeSyntax = "no") and - hasTypeRepr__label = "hasTypeRepr:" and - (if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no") and - hasTypeBoundList__label = "hasTypeBoundList:" and - if x.hasTypeBoundList() then hasTypeBoundList = "yes" else hasTypeBoundList = "no" -} +query predicate instances(AssocTypeArg x) { toBeTested(x) and not x.isUnknown() } query predicate getConstArg(AssocTypeArg x, ConstArg getConstArg) { toBeTested(x) and not x.isUnknown() and getConstArg = x.getConstArg() diff --git a/rust/ql/test/extractor-tests/generated/Attr/Attr.expected b/rust/ql/test/extractor-tests/generated/Attr/Attr.expected index 6b994a76ae4..1272453173d 100644 --- a/rust/ql/test/extractor-tests/generated/Attr/Attr.expected +++ b/rust/ql/test/extractor-tests/generated/Attr/Attr.expected @@ -1,4 +1,4 @@ instances -| gen_attr.rs:7:5:7:20 | Attr | hasMeta: | yes | +| gen_attr.rs:7:5:7:20 | Attr | getMeta | gen_attr.rs:7:5:7:20 | Attr | gen_attr.rs:7:7:7:19 | Meta | diff --git a/rust/ql/test/extractor-tests/generated/Attr/Attr.ql b/rust/ql/test/extractor-tests/generated/Attr/Attr.ql index 9ef4096d2ac..4f717cc7f4d 100644 --- a/rust/ql/test/extractor-tests/generated/Attr/Attr.ql +++ b/rust/ql/test/extractor-tests/generated/Attr/Attr.ql @@ -2,12 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances(Attr x, string hasMeta__label, string hasMeta) { - toBeTested(x) and - not x.isUnknown() and - hasMeta__label = "hasMeta:" and - if x.hasMeta() then hasMeta = "yes" else hasMeta = "no" -} +query predicate instances(Attr x) { toBeTested(x) and not x.isUnknown() } query predicate getMeta(Attr x, Meta getMeta) { toBeTested(x) and not x.isUnknown() and getMeta = x.getMeta() diff --git a/rust/ql/test/extractor-tests/generated/AwaitExpr/AwaitExpr.expected b/rust/ql/test/extractor-tests/generated/AwaitExpr/AwaitExpr.expected index 0d562cf3c06..1135e3b3e45 100644 --- a/rust/ql/test/extractor-tests/generated/AwaitExpr/AwaitExpr.expected +++ b/rust/ql/test/extractor-tests/generated/AwaitExpr/AwaitExpr.expected @@ -1,5 +1,5 @@ instances -| gen_await_expr.rs:6:17:6:27 | await ... | getNumberOfAttrs: | 0 | hasExpr: | yes | +| gen_await_expr.rs:6:17:6:27 | await ... | getAttr getExpr | gen_await_expr.rs:6:17:6:27 | await ... | gen_await_expr.rs:6:17:6:21 | foo(...) | diff --git a/rust/ql/test/extractor-tests/generated/AwaitExpr/AwaitExpr.ql b/rust/ql/test/extractor-tests/generated/AwaitExpr/AwaitExpr.ql index 825cb9959b4..d98d833c951 100644 --- a/rust/ql/test/extractor-tests/generated/AwaitExpr/AwaitExpr.ql +++ b/rust/ql/test/extractor-tests/generated/AwaitExpr/AwaitExpr.ql @@ -2,17 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - AwaitExpr x, string getNumberOfAttrs__label, int getNumberOfAttrs, string hasExpr__label, - string hasExpr -) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasExpr__label = "hasExpr:" and - if x.hasExpr() then hasExpr = "yes" else hasExpr = "no" -} +query predicate instances(AwaitExpr x) { toBeTested(x) and not x.isUnknown() } query predicate getAttr(AwaitExpr x, int index, Attr getAttr) { toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index) diff --git a/rust/ql/test/extractor-tests/generated/BecomeExpr/BecomeExpr.expected b/rust/ql/test/extractor-tests/generated/BecomeExpr/BecomeExpr.expected index 75146fedb5c..2ec05480e36 100644 --- a/rust/ql/test/extractor-tests/generated/BecomeExpr/BecomeExpr.expected +++ b/rust/ql/test/extractor-tests/generated/BecomeExpr/BecomeExpr.expected @@ -1,5 +1,5 @@ instances -| gen_become_expr.rs:8:10:8:36 | become ... | getNumberOfAttrs: | 0 | hasExpr: | yes | +| gen_become_expr.rs:8:10:8:36 | become ... | getAttr getExpr | gen_become_expr.rs:8:10:8:36 | become ... | gen_become_expr.rs:8:17:8:36 | fact_a(...) | diff --git a/rust/ql/test/extractor-tests/generated/BecomeExpr/BecomeExpr.ql b/rust/ql/test/extractor-tests/generated/BecomeExpr/BecomeExpr.ql index 2842afad332..d8b5775da70 100644 --- a/rust/ql/test/extractor-tests/generated/BecomeExpr/BecomeExpr.ql +++ b/rust/ql/test/extractor-tests/generated/BecomeExpr/BecomeExpr.ql @@ -2,17 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - BecomeExpr x, string getNumberOfAttrs__label, int getNumberOfAttrs, string hasExpr__label, - string hasExpr -) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasExpr__label = "hasExpr:" and - if x.hasExpr() then hasExpr = "yes" else hasExpr = "no" -} +query predicate instances(BecomeExpr x) { toBeTested(x) and not x.isUnknown() } query predicate getAttr(BecomeExpr x, int index, Attr getAttr) { toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index) diff --git a/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr.expected b/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr.expected index e435ece76b3..f1b99f24258 100644 --- a/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr.expected +++ b/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr.expected @@ -1,9 +1,9 @@ instances -| gen_binary_expr.rs:5:5:5:9 | ... + ... | getNumberOfAttrs: | 0 | hasLhs: | yes | hasOperatorName: | yes | hasRhs: | yes | -| gen_binary_expr.rs:6:5:6:10 | ... && ... | getNumberOfAttrs: | 0 | hasLhs: | yes | hasOperatorName: | yes | hasRhs: | yes | -| gen_binary_expr.rs:7:5:7:10 | ... <= ... | getNumberOfAttrs: | 0 | hasLhs: | yes | hasOperatorName: | yes | hasRhs: | yes | -| gen_binary_expr.rs:8:5:8:9 | ... = ... | getNumberOfAttrs: | 0 | hasLhs: | yes | hasOperatorName: | yes | hasRhs: | yes | -| gen_binary_expr.rs:9:5:9:10 | ... += ... | getNumberOfAttrs: | 0 | hasLhs: | yes | hasOperatorName: | yes | hasRhs: | yes | +| gen_binary_expr.rs:5:5:5:9 | ... + ... | +| gen_binary_expr.rs:6:5:6:10 | ... && ... | +| gen_binary_expr.rs:7:5:7:10 | ... <= ... | +| gen_binary_expr.rs:8:5:8:9 | ... = ... | +| gen_binary_expr.rs:9:5:9:10 | ... += ... | getAttr getLhs | gen_binary_expr.rs:5:5:5:9 | ... + ... | gen_binary_expr.rs:5:5:5:5 | x | diff --git a/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr.ql b/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr.ql index dec60b16d6c..6b5bf4ba206 100644 --- a/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr.ql +++ b/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr.ql @@ -2,22 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - BinaryExpr x, string getNumberOfAttrs__label, int getNumberOfAttrs, string hasLhs__label, - string hasLhs, string hasOperatorName__label, string hasOperatorName, string hasRhs__label, - string hasRhs -) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasLhs__label = "hasLhs:" and - (if x.hasLhs() then hasLhs = "yes" else hasLhs = "no") and - hasOperatorName__label = "hasOperatorName:" and - (if x.hasOperatorName() then hasOperatorName = "yes" else hasOperatorName = "no") and - hasRhs__label = "hasRhs:" and - if x.hasRhs() then hasRhs = "yes" else hasRhs = "no" -} +query predicate instances(BinaryExpr x) { toBeTested(x) and not x.isUnknown() } query predicate getAttr(BinaryExpr x, int index, Attr getAttr) { toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index) diff --git a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr.expected b/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr.expected index 6dfca050bfe..0423524834b 100644 --- a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr.expected +++ b/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr.expected @@ -1,7 +1,7 @@ instances -| gen_block_expr.rs:3:28:12:1 | { ... } | hasLabel: | no | getNumberOfAttrs: | 0 | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isTry: | no | isUnsafe: | no | hasStmtList: | yes | -| gen_block_expr.rs:5:5:7:5 | { ... } | hasLabel: | no | getNumberOfAttrs: | 0 | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isTry: | no | isUnsafe: | no | hasStmtList: | yes | -| gen_block_expr.rs:8:5:11:5 | 'label: { ... } | hasLabel: | yes | getNumberOfAttrs: | 0 | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isTry: | no | isUnsafe: | no | hasStmtList: | yes | +| gen_block_expr.rs:3:28:12:1 | { ... } | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isTry: | no | isUnsafe: | no | +| gen_block_expr.rs:5:5:7:5 | { ... } | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isTry: | no | isUnsafe: | no | +| gen_block_expr.rs:8:5:11:5 | 'label: { ... } | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isTry: | no | isUnsafe: | no | getLabel | gen_block_expr.rs:8:5:11:5 | 'label: { ... } | gen_block_expr.rs:8:5:8:11 | 'label | getAttr diff --git a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr.ql b/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr.ql index 8c411738753..4b69689bb91 100644 --- a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr.ql +++ b/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr.ql @@ -3,18 +3,12 @@ import codeql.rust.elements import TestUtils query predicate instances( - BlockExpr x, string hasLabel__label, string hasLabel, string getNumberOfAttrs__label, - int getNumberOfAttrs, string isAsync__label, string isAsync, string isConst__label, - string isConst, string isGen__label, string isGen, string isMove__label, string isMove, - string isTry__label, string isTry, string isUnsafe__label, string isUnsafe, - string hasStmtList__label, string hasStmtList + BlockExpr x, string isAsync__label, string isAsync, string isConst__label, string isConst, + string isGen__label, string isGen, string isMove__label, string isMove, string isTry__label, + string isTry, string isUnsafe__label, string isUnsafe ) { toBeTested(x) and not x.isUnknown() and - hasLabel__label = "hasLabel:" and - (if x.hasLabel() then hasLabel = "yes" else hasLabel = "no") and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and isAsync__label = "isAsync:" and (if x.isAsync() then isAsync = "yes" else isAsync = "no") and isConst__label = "isConst:" and @@ -26,9 +20,7 @@ query predicate instances( isTry__label = "isTry:" and (if x.isTry() then isTry = "yes" else isTry = "no") and isUnsafe__label = "isUnsafe:" and - (if x.isUnsafe() then isUnsafe = "yes" else isUnsafe = "no") and - hasStmtList__label = "hasStmtList:" and - if x.hasStmtList() then hasStmtList = "yes" else hasStmtList = "no" + if x.isUnsafe() then isUnsafe = "yes" else isUnsafe = "no" } query predicate getLabel(BlockExpr x, Label getLabel) { diff --git a/rust/ql/test/extractor-tests/generated/BoxPat/BoxPat.expected b/rust/ql/test/extractor-tests/generated/BoxPat/BoxPat.expected index 5ef37d197bc..67b2f917b49 100644 --- a/rust/ql/test/extractor-tests/generated/BoxPat/BoxPat.expected +++ b/rust/ql/test/extractor-tests/generated/BoxPat/BoxPat.expected @@ -1,6 +1,6 @@ instances -| gen_box_pat.rs:6:9:6:27 | box ... | hasPat: | yes | -| gen_box_pat.rs:7:9:7:24 | box ...::None | hasPat: | yes | +| gen_box_pat.rs:6:9:6:27 | box ... | +| gen_box_pat.rs:7:9:7:24 | box ...::None | getPat | gen_box_pat.rs:6:9:6:27 | box ... | gen_box_pat.rs:6:13:6:27 | ...::Some(...) | | gen_box_pat.rs:7:9:7:24 | box ...::None | gen_box_pat.rs:7:13:7:24 | ...::None | diff --git a/rust/ql/test/extractor-tests/generated/BoxPat/BoxPat.ql b/rust/ql/test/extractor-tests/generated/BoxPat/BoxPat.ql index add8284cfba..3bed43b630a 100644 --- a/rust/ql/test/extractor-tests/generated/BoxPat/BoxPat.ql +++ b/rust/ql/test/extractor-tests/generated/BoxPat/BoxPat.ql @@ -2,12 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances(BoxPat x, string hasPat__label, string hasPat) { - toBeTested(x) and - not x.isUnknown() and - hasPat__label = "hasPat:" and - if x.hasPat() then hasPat = "yes" else hasPat = "no" -} +query predicate instances(BoxPat x) { toBeTested(x) and not x.isUnknown() } query predicate getPat(BoxPat x, Pat getPat) { toBeTested(x) and not x.isUnknown() and getPat = x.getPat() diff --git a/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr.expected b/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr.expected index 1d42933c102..6901bc607f4 100644 --- a/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr.expected +++ b/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr.expected @@ -1,7 +1,7 @@ instances -| gen_break_expr.rs:7:13:7:17 | break | getNumberOfAttrs: | 0 | hasExpr: | no | hasLifetime: | no | -| gen_break_expr.rs:12:13:12:27 | break 'label 42 | getNumberOfAttrs: | 0 | hasExpr: | yes | hasLifetime: | yes | -| gen_break_expr.rs:17:13:17:27 | break 'label 42 | getNumberOfAttrs: | 0 | hasExpr: | yes | hasLifetime: | yes | +| gen_break_expr.rs:7:13:7:17 | break | +| gen_break_expr.rs:12:13:12:27 | break 'label 42 | +| gen_break_expr.rs:17:13:17:27 | break 'label 42 | getAttr getExpr | gen_break_expr.rs:12:13:12:27 | break 'label 42 | gen_break_expr.rs:12:26:12:27 | 42 | diff --git a/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr.ql b/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr.ql index 821f1e73fa2..c9d9fb9ee66 100644 --- a/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr.ql +++ b/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr.ql @@ -2,19 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - BreakExpr x, string getNumberOfAttrs__label, int getNumberOfAttrs, string hasExpr__label, - string hasExpr, string hasLifetime__label, string hasLifetime -) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasExpr__label = "hasExpr:" and - (if x.hasExpr() then hasExpr = "yes" else hasExpr = "no") and - hasLifetime__label = "hasLifetime:" and - if x.hasLifetime() then hasLifetime = "yes" else hasLifetime = "no" -} +query predicate instances(BreakExpr x) { toBeTested(x) and not x.isUnknown() } query predicate getAttr(BreakExpr x, int index, Attr getAttr) { toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index) diff --git a/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr.expected b/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr.expected index 181a7dbff8c..3aaaed00da2 100644 --- a/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr.expected +++ b/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr.expected @@ -1,8 +1,8 @@ instances -| gen_call_expr.rs:5:5:5:11 | foo(...) | hasArgList: | yes | getNumberOfAttrs: | 0 | getNumberOfArgs: | 1 | hasFunction: | yes | -| gen_call_expr.rs:6:5:6:23 | foo::<...>(...) | hasArgList: | yes | getNumberOfAttrs: | 0 | getNumberOfArgs: | 1 | hasFunction: | yes | -| gen_call_expr.rs:7:5:7:14 | ...(...) | hasArgList: | yes | getNumberOfAttrs: | 0 | getNumberOfArgs: | 1 | hasFunction: | yes | -| gen_call_expr.rs:8:5:8:10 | foo(...) | hasArgList: | yes | getNumberOfAttrs: | 0 | getNumberOfArgs: | 1 | hasFunction: | yes | +| gen_call_expr.rs:5:5:5:11 | foo(...) | +| gen_call_expr.rs:6:5:6:23 | foo::<...>(...) | +| gen_call_expr.rs:7:5:7:14 | ...(...) | +| gen_call_expr.rs:8:5:8:10 | foo(...) | getArgList | gen_call_expr.rs:5:5:5:11 | foo(...) | gen_call_expr.rs:5:8:5:11 | ArgList | | gen_call_expr.rs:6:5:6:23 | foo::<...>(...) | gen_call_expr.rs:6:20:6:23 | ArgList | diff --git a/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr.ql b/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr.ql index fae788451cf..e16ab837325 100644 --- a/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr.ql +++ b/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr.ql @@ -2,22 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - CallExpr x, string hasArgList__label, string hasArgList, string getNumberOfAttrs__label, - int getNumberOfAttrs, string getNumberOfArgs__label, int getNumberOfArgs, - string hasFunction__label, string hasFunction -) { - toBeTested(x) and - not x.isUnknown() and - hasArgList__label = "hasArgList:" and - (if x.hasArgList() then hasArgList = "yes" else hasArgList = "no") and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - getNumberOfArgs__label = "getNumberOfArgs:" and - getNumberOfArgs = x.getNumberOfArgs() and - hasFunction__label = "hasFunction:" and - if x.hasFunction() then hasFunction = "yes" else hasFunction = "no" -} +query predicate instances(CallExpr x) { toBeTested(x) and not x.isUnknown() } query predicate getArgList(CallExpr x, ArgList getArgList) { toBeTested(x) and not x.isUnknown() and getArgList = x.getArgList() diff --git a/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.expected b/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.expected index 8ed3a2a8416..05f618ced10 100644 --- a/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.expected +++ b/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.expected @@ -1,5 +1,5 @@ instances -| gen_cast_expr.rs:5:5:5:16 | value as u64 | getNumberOfAttrs: | 0 | hasExpr: | yes | hasTypeRepr: | yes | +| gen_cast_expr.rs:5:5:5:16 | value as u64 | getAttr getExpr | gen_cast_expr.rs:5:5:5:16 | value as u64 | gen_cast_expr.rs:5:5:5:9 | value | diff --git a/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.ql b/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.ql index c649242b576..46c06b4c21c 100644 --- a/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.ql +++ b/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.ql @@ -2,19 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - CastExpr x, string getNumberOfAttrs__label, int getNumberOfAttrs, string hasExpr__label, - string hasExpr, string hasTypeRepr__label, string hasTypeRepr -) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasExpr__label = "hasExpr:" and - (if x.hasExpr() then hasExpr = "yes" else hasExpr = "no") and - hasTypeRepr__label = "hasTypeRepr:" and - if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no" -} +query predicate instances(CastExpr x) { toBeTested(x) and not x.isUnknown() } query predicate getAttr(CastExpr x, int index, Attr getAttr) { toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index) diff --git a/rust/ql/test/extractor-tests/generated/ClosureBinder/ClosureBinder.expected b/rust/ql/test/extractor-tests/generated/ClosureBinder/ClosureBinder.expected index 38a6da316b0..dfd2bd58d07 100644 --- a/rust/ql/test/extractor-tests/generated/ClosureBinder/ClosureBinder.expected +++ b/rust/ql/test/extractor-tests/generated/ClosureBinder/ClosureBinder.expected @@ -1,4 +1,4 @@ instances -| gen_closure_binder.rs:7:21:7:43 | ClosureBinder | hasGenericParamList: | yes | +| gen_closure_binder.rs:7:21:7:43 | ClosureBinder | getGenericParamList | gen_closure_binder.rs:7:21:7:43 | ClosureBinder | gen_closure_binder.rs:7:24:7:43 | <...> | diff --git a/rust/ql/test/extractor-tests/generated/ClosureBinder/ClosureBinder.ql b/rust/ql/test/extractor-tests/generated/ClosureBinder/ClosureBinder.ql index a791e16c442..d204c5fbde1 100644 --- a/rust/ql/test/extractor-tests/generated/ClosureBinder/ClosureBinder.ql +++ b/rust/ql/test/extractor-tests/generated/ClosureBinder/ClosureBinder.ql @@ -2,14 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - ClosureBinder x, string hasGenericParamList__label, string hasGenericParamList -) { - toBeTested(x) and - not x.isUnknown() and - hasGenericParamList__label = "hasGenericParamList:" and - if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no" -} +query predicate instances(ClosureBinder x) { toBeTested(x) and not x.isUnknown() } query predicate getGenericParamList(ClosureBinder x, GenericParamList getGenericParamList) { toBeTested(x) and not x.isUnknown() and getGenericParamList = x.getGenericParamList() diff --git a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.expected b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.expected index e76fbfeaf75..041669861b9 100644 --- a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.expected +++ b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.expected @@ -1,9 +1,9 @@ instances -| gen_closure_expr.rs:5:5:5:13 | \|...\| ... | hasParamList: | yes | getNumberOfAttrs: | 0 | getNumberOfParams: | 1 | hasBody: | yes | hasClosureBinder: | no | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isStatic: | no | hasRetType: | no | -| gen_closure_expr.rs:6:5:6:34 | \|...\| ... | hasParamList: | yes | getNumberOfAttrs: | 0 | getNumberOfParams: | 1 | hasBody: | yes | hasClosureBinder: | no | isAsync: | no | isConst: | no | isGen: | no | isMove: | yes | isStatic: | no | hasRetType: | yes | -| gen_closure_expr.rs:7:5:7:27 | \|...\| ... | hasParamList: | yes | getNumberOfAttrs: | 0 | getNumberOfParams: | 2 | hasBody: | yes | hasClosureBinder: | no | isAsync: | yes | isConst: | no | isGen: | no | isMove: | no | isStatic: | no | hasRetType: | no | -| gen_closure_expr.rs:8:6:9:15 | \|...\| ... | hasParamList: | yes | getNumberOfAttrs: | 1 | getNumberOfParams: | 1 | hasBody: | yes | hasClosureBinder: | no | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isStatic: | no | hasRetType: | no | -| gen_closure_expr.rs:10:6:11:23 | \|...\| ... | hasParamList: | yes | getNumberOfAttrs: | 1 | getNumberOfParams: | 1 | hasBody: | yes | hasClosureBinder: | no | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isStatic: | yes | hasRetType: | no | +| gen_closure_expr.rs:5:5:5:13 | \|...\| ... | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isStatic: | no | +| gen_closure_expr.rs:6:5:6:34 | \|...\| ... | isAsync: | no | isConst: | no | isGen: | no | isMove: | yes | isStatic: | no | +| gen_closure_expr.rs:7:5:7:27 | \|...\| ... | isAsync: | yes | isConst: | no | isGen: | no | isMove: | no | isStatic: | no | +| gen_closure_expr.rs:8:6:9:15 | \|...\| ... | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isStatic: | no | +| gen_closure_expr.rs:10:6:11:23 | \|...\| ... | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isStatic: | yes | getParamList | gen_closure_expr.rs:5:5:5:13 | \|...\| ... | gen_closure_expr.rs:5:5:5:7 | ParamList | | gen_closure_expr.rs:6:5:6:34 | \|...\| ... | gen_closure_expr.rs:6:10:6:17 | ParamList | diff --git a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql index 88aebe283c9..acf3b130677 100644 --- a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql +++ b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql @@ -3,25 +3,12 @@ import codeql.rust.elements import TestUtils query predicate instances( - ClosureExpr x, string hasParamList__label, string hasParamList, string getNumberOfAttrs__label, - int getNumberOfAttrs, string getNumberOfParams__label, int getNumberOfParams, - string hasBody__label, string hasBody, string hasClosureBinder__label, string hasClosureBinder, - string isAsync__label, string isAsync, string isConst__label, string isConst, string isGen__label, - string isGen, string isMove__label, string isMove, string isStatic__label, string isStatic, - string hasRetType__label, string hasRetType + ClosureExpr x, string isAsync__label, string isAsync, string isConst__label, string isConst, + string isGen__label, string isGen, string isMove__label, string isMove, string isStatic__label, + string isStatic ) { toBeTested(x) and not x.isUnknown() and - hasParamList__label = "hasParamList:" and - (if x.hasParamList() then hasParamList = "yes" else hasParamList = "no") and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - getNumberOfParams__label = "getNumberOfParams:" and - getNumberOfParams = x.getNumberOfParams() and - hasBody__label = "hasBody:" and - (if x.hasBody() then hasBody = "yes" else hasBody = "no") and - hasClosureBinder__label = "hasClosureBinder:" and - (if x.hasClosureBinder() then hasClosureBinder = "yes" else hasClosureBinder = "no") and isAsync__label = "isAsync:" and (if x.isAsync() then isAsync = "yes" else isAsync = "no") and isConst__label = "isConst:" and @@ -31,9 +18,7 @@ query predicate instances( isMove__label = "isMove:" and (if x.isMove() then isMove = "yes" else isMove = "no") and isStatic__label = "isStatic:" and - (if x.isStatic() then isStatic = "yes" else isStatic = "no") and - hasRetType__label = "hasRetType:" and - if x.hasRetType() then hasRetType = "yes" else hasRetType = "no" + if x.isStatic() then isStatic = "yes" else isStatic = "no" } query predicate getParamList(ClosureExpr x, ParamList getParamList) { diff --git a/rust/ql/test/extractor-tests/generated/Const/Const.expected b/rust/ql/test/extractor-tests/generated/Const/Const.expected index 3a6cac12184..9dd51311bc4 100644 --- a/rust/ql/test/extractor-tests/generated/Const/Const.expected +++ b/rust/ql/test/extractor-tests/generated/Const/Const.expected @@ -1,5 +1,5 @@ instances -| gen_const.rs:4:5:7:22 | Const | hasExtendedCanonicalPath: | no | hasCrateOrigin: | no | hasAttributeMacroExpansion: | no | getNumberOfAttrs: | 0 | hasBody: | yes | hasGenericParamList: | no | isConst: | yes | isDefault: | no | hasName: | yes | hasTypeRepr: | yes | hasVisibility: | no | hasWhereClause: | no | hasImplementation: | yes | +| gen_const.rs:4:5:7:22 | Const | isConst: | yes | isDefault: | no | getExtendedCanonicalPath getCrateOrigin getAttributeMacroExpansion diff --git a/rust/ql/test/extractor-tests/generated/Const/Const.ql b/rust/ql/test/extractor-tests/generated/Const/Const.ql index 536f02a0a27..ef88f980fc0 100644 --- a/rust/ql/test/extractor-tests/generated/Const/Const.ql +++ b/rust/ql/test/extractor-tests/generated/Const/Const.ql @@ -3,50 +3,15 @@ import codeql.rust.elements import TestUtils query predicate instances( - Const x, string hasExtendedCanonicalPath__label, string hasExtendedCanonicalPath, - string hasCrateOrigin__label, string hasCrateOrigin, string hasAttributeMacroExpansion__label, - string hasAttributeMacroExpansion, string getNumberOfAttrs__label, int getNumberOfAttrs, - string hasBody__label, string hasBody, string hasGenericParamList__label, - string hasGenericParamList, string isConst__label, string isConst, string isDefault__label, - string isDefault, string hasName__label, string hasName, string hasTypeRepr__label, - string hasTypeRepr, string hasVisibility__label, string hasVisibility, - string hasWhereClause__label, string hasWhereClause, string hasImplementation__label, - string hasImplementation + Const x, string isConst__label, string isConst, string isDefault__label, string isDefault, + string hasImplementation__label, string hasImplementation ) { toBeTested(x) and not x.isUnknown() and - hasExtendedCanonicalPath__label = "hasExtendedCanonicalPath:" and - ( - if x.hasExtendedCanonicalPath() - then hasExtendedCanonicalPath = "yes" - else hasExtendedCanonicalPath = "no" - ) and - hasCrateOrigin__label = "hasCrateOrigin:" and - (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and - hasAttributeMacroExpansion__label = "hasAttributeMacroExpansion:" and - ( - if x.hasAttributeMacroExpansion() - then hasAttributeMacroExpansion = "yes" - else hasAttributeMacroExpansion = "no" - ) and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasBody__label = "hasBody:" and - (if x.hasBody() then hasBody = "yes" else hasBody = "no") and - hasGenericParamList__label = "hasGenericParamList:" and - (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and isConst__label = "isConst:" and (if x.isConst() then isConst = "yes" else isConst = "no") and isDefault__label = "isDefault:" and (if x.isDefault() then isDefault = "yes" else isDefault = "no") and - hasName__label = "hasName:" and - (if x.hasName() then hasName = "yes" else hasName = "no") and - hasTypeRepr__label = "hasTypeRepr:" and - (if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no") and - hasVisibility__label = "hasVisibility:" and - (if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no") and - hasWhereClause__label = "hasWhereClause:" and - (if x.hasWhereClause() then hasWhereClause = "yes" else hasWhereClause = "no") and hasImplementation__label = "hasImplementation:" and if x.hasImplementation() then hasImplementation = "yes" else hasImplementation = "no" } diff --git a/rust/ql/test/extractor-tests/generated/ConstArg/ConstArg.expected b/rust/ql/test/extractor-tests/generated/ConstArg/ConstArg.expected index b6e35b39a8b..111690872fe 100644 --- a/rust/ql/test/extractor-tests/generated/ConstArg/ConstArg.expected +++ b/rust/ql/test/extractor-tests/generated/ConstArg/ConstArg.expected @@ -1,4 +1,4 @@ instances -| gen_const_arg.rs:7:11:7:11 | ConstArg | hasExpr: | yes | +| gen_const_arg.rs:7:11:7:11 | ConstArg | getExpr | gen_const_arg.rs:7:11:7:11 | ConstArg | gen_const_arg.rs:7:11:7:11 | 3 | diff --git a/rust/ql/test/extractor-tests/generated/ConstArg/ConstArg.ql b/rust/ql/test/extractor-tests/generated/ConstArg/ConstArg.ql index 57377f66c4a..c89b791090a 100644 --- a/rust/ql/test/extractor-tests/generated/ConstArg/ConstArg.ql +++ b/rust/ql/test/extractor-tests/generated/ConstArg/ConstArg.ql @@ -2,12 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances(ConstArg x, string hasExpr__label, string hasExpr) { - toBeTested(x) and - not x.isUnknown() and - hasExpr__label = "hasExpr:" and - if x.hasExpr() then hasExpr = "yes" else hasExpr = "no" -} +query predicate instances(ConstArg x) { toBeTested(x) and not x.isUnknown() } query predicate getExpr(ConstArg x, Expr getExpr) { toBeTested(x) and not x.isUnknown() and getExpr = x.getExpr() diff --git a/rust/ql/test/extractor-tests/generated/ConstBlockPat/ConstBlockPat.expected b/rust/ql/test/extractor-tests/generated/ConstBlockPat/ConstBlockPat.expected index 36c06854a29..742ac11f985 100644 --- a/rust/ql/test/extractor-tests/generated/ConstBlockPat/ConstBlockPat.expected +++ b/rust/ql/test/extractor-tests/generated/ConstBlockPat/ConstBlockPat.expected @@ -1,4 +1,4 @@ instances -| gen_const_block_pat.rs:6:9:6:27 | ConstBlockPat | hasBlockExpr: | yes | isConst: | yes | +| gen_const_block_pat.rs:6:9:6:27 | ConstBlockPat | isConst: | yes | getBlockExpr | gen_const_block_pat.rs:6:9:6:27 | ConstBlockPat | gen_const_block_pat.rs:6:15:6:27 | { ... } | diff --git a/rust/ql/test/extractor-tests/generated/ConstBlockPat/ConstBlockPat.ql b/rust/ql/test/extractor-tests/generated/ConstBlockPat/ConstBlockPat.ql index 1a0ba771a6c..324b275e007 100644 --- a/rust/ql/test/extractor-tests/generated/ConstBlockPat/ConstBlockPat.ql +++ b/rust/ql/test/extractor-tests/generated/ConstBlockPat/ConstBlockPat.ql @@ -2,14 +2,9 @@ import codeql.rust.elements import TestUtils -query predicate instances( - ConstBlockPat x, string hasBlockExpr__label, string hasBlockExpr, string isConst__label, - string isConst -) { +query predicate instances(ConstBlockPat x, string isConst__label, string isConst) { toBeTested(x) and not x.isUnknown() and - hasBlockExpr__label = "hasBlockExpr:" and - (if x.hasBlockExpr() then hasBlockExpr = "yes" else hasBlockExpr = "no") and isConst__label = "isConst:" and if x.isConst() then isConst = "yes" else isConst = "no" } diff --git a/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam.expected b/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam.expected index 0ed9b2a27cb..f6067623d27 100644 --- a/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam.expected +++ b/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam.expected @@ -1,5 +1,5 @@ instances -| gen_const_param.rs:7:17:7:30 | ConstParam | getNumberOfAttrs: | 0 | hasDefaultVal: | no | isConst: | yes | hasName: | yes | hasTypeRepr: | yes | +| gen_const_param.rs:7:17:7:30 | ConstParam | isConst: | yes | getAttr getDefaultVal getName diff --git a/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam.ql b/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam.ql index 3cce74dd9d3..cfbf6f3cc45 100644 --- a/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam.ql +++ b/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam.ql @@ -2,23 +2,11 @@ import codeql.rust.elements import TestUtils -query predicate instances( - ConstParam x, string getNumberOfAttrs__label, int getNumberOfAttrs, string hasDefaultVal__label, - string hasDefaultVal, string isConst__label, string isConst, string hasName__label, - string hasName, string hasTypeRepr__label, string hasTypeRepr -) { +query predicate instances(ConstParam x, string isConst__label, string isConst) { toBeTested(x) and not x.isUnknown() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasDefaultVal__label = "hasDefaultVal:" and - (if x.hasDefaultVal() then hasDefaultVal = "yes" else hasDefaultVal = "no") and isConst__label = "isConst:" and - (if x.isConst() then isConst = "yes" else isConst = "no") and - hasName__label = "hasName:" and - (if x.hasName() then hasName = "yes" else hasName = "no") and - hasTypeRepr__label = "hasTypeRepr:" and - if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no" + if x.isConst() then isConst = "yes" else isConst = "no" } query predicate getAttr(ConstParam x, int index, Attr getAttr) { diff --git a/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr.expected b/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr.expected index 9c3222ea810..e9547d569a3 100644 --- a/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr.expected +++ b/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr.expected @@ -1,6 +1,6 @@ instances -| gen_continue_expr.rs:7:13:7:20 | continue | getNumberOfAttrs: | 0 | hasLifetime: | no | -| gen_continue_expr.rs:12:13:12:27 | continue 'label | getNumberOfAttrs: | 0 | hasLifetime: | yes | +| gen_continue_expr.rs:7:13:7:20 | continue | +| gen_continue_expr.rs:12:13:12:27 | continue 'label | getAttr getLifetime | gen_continue_expr.rs:12:13:12:27 | continue 'label | gen_continue_expr.rs:12:22:12:27 | 'label | diff --git a/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr.ql b/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr.ql index 87cbb63a73f..590b8d1faa5 100644 --- a/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr.ql +++ b/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr.ql @@ -2,17 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - ContinueExpr x, string getNumberOfAttrs__label, int getNumberOfAttrs, string hasLifetime__label, - string hasLifetime -) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasLifetime__label = "hasLifetime:" and - if x.hasLifetime() then hasLifetime = "yes" else hasLifetime = "no" -} +query predicate instances(ContinueExpr x) { toBeTested(x) and not x.isUnknown() } query predicate getAttr(ContinueExpr x, int index, Attr getAttr) { toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index) diff --git a/rust/ql/test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr.expected b/rust/ql/test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr.expected index 467ee4d57b5..14ff9874ffb 100644 --- a/rust/ql/test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr.expected +++ b/rust/ql/test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr.expected @@ -1,4 +1,4 @@ instances -| gen_dyn_trait_type_repr.rs:7:13:7:21 | DynTraitTypeRepr | hasTypeBoundList: | yes | +| gen_dyn_trait_type_repr.rs:7:13:7:21 | DynTraitTypeRepr | getTypeBoundList | gen_dyn_trait_type_repr.rs:7:13:7:21 | DynTraitTypeRepr | gen_dyn_trait_type_repr.rs:7:17:7:21 | TypeBoundList | diff --git a/rust/ql/test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr.ql b/rust/ql/test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr.ql index a3b42f5c602..e67423fadfd 100644 --- a/rust/ql/test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr.ql +++ b/rust/ql/test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr.ql @@ -2,14 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - DynTraitTypeRepr x, string hasTypeBoundList__label, string hasTypeBoundList -) { - toBeTested(x) and - not x.isUnknown() and - hasTypeBoundList__label = "hasTypeBoundList:" and - if x.hasTypeBoundList() then hasTypeBoundList = "yes" else hasTypeBoundList = "no" -} +query predicate instances(DynTraitTypeRepr x) { toBeTested(x) and not x.isUnknown() } query predicate getTypeBoundList(DynTraitTypeRepr x, TypeBoundList getTypeBoundList) { toBeTested(x) and not x.isUnknown() and getTypeBoundList = x.getTypeBoundList() diff --git a/rust/ql/test/extractor-tests/generated/Enum/Enum.expected b/rust/ql/test/extractor-tests/generated/Enum/Enum.expected index 97770de91d2..45154c93e48 100644 --- a/rust/ql/test/extractor-tests/generated/Enum/Enum.expected +++ b/rust/ql/test/extractor-tests/generated/Enum/Enum.expected @@ -1,5 +1,5 @@ instances -| gen_enum.rs:4:5:7:34 | enum E | hasExtendedCanonicalPath: | no | hasCrateOrigin: | no | hasAttributeMacroExpansion: | no | getNumberOfDeriveMacroExpansions: | 0 | getNumberOfAttrs: | 0 | hasGenericParamList: | no | hasName: | yes | hasVariantList: | yes | hasVisibility: | no | hasWhereClause: | no | +| gen_enum.rs:4:5:7:34 | enum E | getExtendedCanonicalPath getCrateOrigin getAttributeMacroExpansion diff --git a/rust/ql/test/extractor-tests/generated/Enum/Enum.ql b/rust/ql/test/extractor-tests/generated/Enum/Enum.ql index 194230c7b22..e5c4c12693e 100644 --- a/rust/ql/test/extractor-tests/generated/Enum/Enum.ql +++ b/rust/ql/test/extractor-tests/generated/Enum/Enum.ql @@ -2,46 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - Enum x, string hasExtendedCanonicalPath__label, string hasExtendedCanonicalPath, - string hasCrateOrigin__label, string hasCrateOrigin, string hasAttributeMacroExpansion__label, - string hasAttributeMacroExpansion, string getNumberOfDeriveMacroExpansions__label, - int getNumberOfDeriveMacroExpansions, string getNumberOfAttrs__label, int getNumberOfAttrs, - string hasGenericParamList__label, string hasGenericParamList, string hasName__label, - string hasName, string hasVariantList__label, string hasVariantList, string hasVisibility__label, - string hasVisibility, string hasWhereClause__label, string hasWhereClause -) { - toBeTested(x) and - not x.isUnknown() and - hasExtendedCanonicalPath__label = "hasExtendedCanonicalPath:" and - ( - if x.hasExtendedCanonicalPath() - then hasExtendedCanonicalPath = "yes" - else hasExtendedCanonicalPath = "no" - ) and - hasCrateOrigin__label = "hasCrateOrigin:" and - (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and - hasAttributeMacroExpansion__label = "hasAttributeMacroExpansion:" and - ( - if x.hasAttributeMacroExpansion() - then hasAttributeMacroExpansion = "yes" - else hasAttributeMacroExpansion = "no" - ) and - getNumberOfDeriveMacroExpansions__label = "getNumberOfDeriveMacroExpansions:" and - getNumberOfDeriveMacroExpansions = x.getNumberOfDeriveMacroExpansions() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasGenericParamList__label = "hasGenericParamList:" and - (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and - hasName__label = "hasName:" and - (if x.hasName() then hasName = "yes" else hasName = "no") and - hasVariantList__label = "hasVariantList:" and - (if x.hasVariantList() then hasVariantList = "yes" else hasVariantList = "no") and - hasVisibility__label = "hasVisibility:" and - (if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no") and - hasWhereClause__label = "hasWhereClause:" and - if x.hasWhereClause() then hasWhereClause = "yes" else hasWhereClause = "no" -} +query predicate instances(Enum x) { toBeTested(x) and not x.isUnknown() } query predicate getExtendedCanonicalPath(Enum x, string getExtendedCanonicalPath) { toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath() diff --git a/rust/ql/test/extractor-tests/generated/ExprStmt/ExprStmt.expected b/rust/ql/test/extractor-tests/generated/ExprStmt/ExprStmt.expected index 16b3cc14c46..35db91b7cfb 100644 --- a/rust/ql/test/extractor-tests/generated/ExprStmt/ExprStmt.expected +++ b/rust/ql/test/extractor-tests/generated/ExprStmt/ExprStmt.expected @@ -1,6 +1,6 @@ instances -| gen_expr_stmt.rs:5:5:5:12 | ExprStmt | hasExpr: | yes | -| gen_expr_stmt.rs:6:5:6:13 | ExprStmt | hasExpr: | yes | +| gen_expr_stmt.rs:5:5:5:12 | ExprStmt | +| gen_expr_stmt.rs:6:5:6:13 | ExprStmt | getExpr | gen_expr_stmt.rs:5:5:5:12 | ExprStmt | gen_expr_stmt.rs:5:5:5:11 | start(...) | | gen_expr_stmt.rs:6:5:6:13 | ExprStmt | gen_expr_stmt.rs:6:5:6:12 | finish(...) | diff --git a/rust/ql/test/extractor-tests/generated/ExprStmt/ExprStmt.ql b/rust/ql/test/extractor-tests/generated/ExprStmt/ExprStmt.ql index 587fb6731d8..34995cf5014 100644 --- a/rust/ql/test/extractor-tests/generated/ExprStmt/ExprStmt.ql +++ b/rust/ql/test/extractor-tests/generated/ExprStmt/ExprStmt.ql @@ -2,12 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances(ExprStmt x, string hasExpr__label, string hasExpr) { - toBeTested(x) and - not x.isUnknown() and - hasExpr__label = "hasExpr:" and - if x.hasExpr() then hasExpr = "yes" else hasExpr = "no" -} +query predicate instances(ExprStmt x) { toBeTested(x) and not x.isUnknown() } query predicate getExpr(ExprStmt x, Expr getExpr) { toBeTested(x) and not x.isUnknown() and getExpr = x.getExpr() diff --git a/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.expected b/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.expected index a523b209713..8e061f24a56 100644 --- a/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.expected +++ b/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.expected @@ -1,5 +1,5 @@ instances -| gen_extern_block.rs:7:5:9:5 | ExternBlock | hasExtendedCanonicalPath: | no | hasCrateOrigin: | no | hasAttributeMacroExpansion: | no | hasAbi: | yes | getNumberOfAttrs: | 0 | hasExternItemList: | yes | isUnsafe: | no | +| gen_extern_block.rs:7:5:9:5 | ExternBlock | isUnsafe: | no | getExtendedCanonicalPath getCrateOrigin getAttributeMacroExpansion diff --git a/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.ql b/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.ql index 9985e3ceb0e..2f07e5dfcae 100644 --- a/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.ql +++ b/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.ql @@ -2,35 +2,9 @@ import codeql.rust.elements import TestUtils -query predicate instances( - ExternBlock x, string hasExtendedCanonicalPath__label, string hasExtendedCanonicalPath, - string hasCrateOrigin__label, string hasCrateOrigin, string hasAttributeMacroExpansion__label, - string hasAttributeMacroExpansion, string hasAbi__label, string hasAbi, - string getNumberOfAttrs__label, int getNumberOfAttrs, string hasExternItemList__label, - string hasExternItemList, string isUnsafe__label, string isUnsafe -) { +query predicate instances(ExternBlock x, string isUnsafe__label, string isUnsafe) { toBeTested(x) and not x.isUnknown() and - hasExtendedCanonicalPath__label = "hasExtendedCanonicalPath:" and - ( - if x.hasExtendedCanonicalPath() - then hasExtendedCanonicalPath = "yes" - else hasExtendedCanonicalPath = "no" - ) and - hasCrateOrigin__label = "hasCrateOrigin:" and - (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and - hasAttributeMacroExpansion__label = "hasAttributeMacroExpansion:" and - ( - if x.hasAttributeMacroExpansion() - then hasAttributeMacroExpansion = "yes" - else hasAttributeMacroExpansion = "no" - ) and - hasAbi__label = "hasAbi:" and - (if x.hasAbi() then hasAbi = "yes" else hasAbi = "no") and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasExternItemList__label = "hasExternItemList:" and - (if x.hasExternItemList() then hasExternItemList = "yes" else hasExternItemList = "no") and isUnsafe__label = "isUnsafe:" and if x.isUnsafe() then isUnsafe = "yes" else isUnsafe = "no" } diff --git a/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.expected b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.expected index 5f58cb72be5..6e1b1a84e1a 100644 --- a/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.expected +++ b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.expected @@ -1,5 +1,5 @@ instances -| gen_extern_crate.rs:4:5:7:23 | ExternCrate | hasExtendedCanonicalPath: | no | hasCrateOrigin: | no | hasAttributeMacroExpansion: | no | getNumberOfAttrs: | 0 | hasIdentifier: | yes | hasRename: | no | hasVisibility: | no | +| gen_extern_crate.rs:4:5:7:23 | ExternCrate | getExtendedCanonicalPath getCrateOrigin getAttributeMacroExpansion diff --git a/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.ql b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.ql index fd2054d942e..b0c2c372896 100644 --- a/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.ql +++ b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.ql @@ -2,38 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - ExternCrate x, string hasExtendedCanonicalPath__label, string hasExtendedCanonicalPath, - string hasCrateOrigin__label, string hasCrateOrigin, string hasAttributeMacroExpansion__label, - string hasAttributeMacroExpansion, string getNumberOfAttrs__label, int getNumberOfAttrs, - string hasIdentifier__label, string hasIdentifier, string hasRename__label, string hasRename, - string hasVisibility__label, string hasVisibility -) { - toBeTested(x) and - not x.isUnknown() and - hasExtendedCanonicalPath__label = "hasExtendedCanonicalPath:" and - ( - if x.hasExtendedCanonicalPath() - then hasExtendedCanonicalPath = "yes" - else hasExtendedCanonicalPath = "no" - ) and - hasCrateOrigin__label = "hasCrateOrigin:" and - (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and - hasAttributeMacroExpansion__label = "hasAttributeMacroExpansion:" and - ( - if x.hasAttributeMacroExpansion() - then hasAttributeMacroExpansion = "yes" - else hasAttributeMacroExpansion = "no" - ) and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasIdentifier__label = "hasIdentifier:" and - (if x.hasIdentifier() then hasIdentifier = "yes" else hasIdentifier = "no") and - hasRename__label = "hasRename:" and - (if x.hasRename() then hasRename = "yes" else hasRename = "no") and - hasVisibility__label = "hasVisibility:" and - if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no" -} +query predicate instances(ExternCrate x) { toBeTested(x) and not x.isUnknown() } query predicate getExtendedCanonicalPath(ExternCrate x, string getExtendedCanonicalPath) { toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath() diff --git a/rust/ql/test/extractor-tests/generated/ExternItemList/ExternItemList.expected b/rust/ql/test/extractor-tests/generated/ExternItemList/ExternItemList.expected index 7d9cf0f9166..8b6eb94b1b2 100644 --- a/rust/ql/test/extractor-tests/generated/ExternItemList/ExternItemList.expected +++ b/rust/ql/test/extractor-tests/generated/ExternItemList/ExternItemList.expected @@ -1,5 +1,5 @@ instances -| gen_extern_item_list.rs:7:16:10:5 | ExternItemList | getNumberOfAttrs: | 0 | getNumberOfExternItems: | 2 | +| gen_extern_item_list.rs:7:16:10:5 | ExternItemList | getAttr getExternItem | gen_extern_item_list.rs:7:16:10:5 | ExternItemList | 0 | gen_extern_item_list.rs:8:9:8:17 | fn foo | diff --git a/rust/ql/test/extractor-tests/generated/ExternItemList/ExternItemList.ql b/rust/ql/test/extractor-tests/generated/ExternItemList/ExternItemList.ql index d74448c8ce3..b947daaff64 100644 --- a/rust/ql/test/extractor-tests/generated/ExternItemList/ExternItemList.ql +++ b/rust/ql/test/extractor-tests/generated/ExternItemList/ExternItemList.ql @@ -2,17 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - ExternItemList x, string getNumberOfAttrs__label, int getNumberOfAttrs, - string getNumberOfExternItems__label, int getNumberOfExternItems -) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - getNumberOfExternItems__label = "getNumberOfExternItems:" and - getNumberOfExternItems = x.getNumberOfExternItems() -} +query predicate instances(ExternItemList x) { toBeTested(x) and not x.isUnknown() } query predicate getAttr(ExternItemList x, int index, Attr getAttr) { toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index) diff --git a/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr.expected b/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr.expected index d527171975b..dab9e4a05b4 100644 --- a/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr.expected +++ b/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr.expected @@ -1,5 +1,5 @@ instances -| gen_field_expr.rs:5:5:5:9 | x.foo | getNumberOfAttrs: | 0 | hasContainer: | yes | hasIdentifier: | yes | +| gen_field_expr.rs:5:5:5:9 | x.foo | getAttr getContainer | gen_field_expr.rs:5:5:5:9 | x.foo | gen_field_expr.rs:5:5:5:5 | x | diff --git a/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr.ql b/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr.ql index d335d09c35d..49780f145b8 100644 --- a/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr.ql +++ b/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr.ql @@ -2,19 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - FieldExpr x, string getNumberOfAttrs__label, int getNumberOfAttrs, string hasContainer__label, - string hasContainer, string hasIdentifier__label, string hasIdentifier -) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasContainer__label = "hasContainer:" and - (if x.hasContainer() then hasContainer = "yes" else hasContainer = "no") and - hasIdentifier__label = "hasIdentifier:" and - if x.hasIdentifier() then hasIdentifier = "yes" else hasIdentifier = "no" -} +query predicate instances(FieldExpr x) { toBeTested(x) and not x.isUnknown() } query predicate getAttr(FieldExpr x, int index, Attr getAttr) { toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index) diff --git a/rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr.expected b/rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr.expected index 705459cf980..1e61549b3f3 100644 --- a/rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr.expected +++ b/rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr.expected @@ -1,5 +1,5 @@ instances -| gen_fn_ptr_type_repr.rs:7:12:7:25 | FnPtrTypeRepr | hasAbi: | no | isAsync: | no | isConst: | no | isUnsafe: | no | hasParamList: | yes | hasRetType: | yes | +| gen_fn_ptr_type_repr.rs:7:12:7:25 | FnPtrTypeRepr | isAsync: | no | isConst: | no | isUnsafe: | no | getAbi getParamList | gen_fn_ptr_type_repr.rs:7:12:7:25 | FnPtrTypeRepr | gen_fn_ptr_type_repr.rs:7:14:7:18 | ParamList | diff --git a/rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr.ql b/rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr.ql index a9504b4d1b6..47cbb8ee28c 100644 --- a/rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr.ql +++ b/rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr.ql @@ -3,24 +3,17 @@ import codeql.rust.elements import TestUtils query predicate instances( - FnPtrTypeRepr x, string hasAbi__label, string hasAbi, string isAsync__label, string isAsync, - string isConst__label, string isConst, string isUnsafe__label, string isUnsafe, - string hasParamList__label, string hasParamList, string hasRetType__label, string hasRetType + FnPtrTypeRepr x, string isAsync__label, string isAsync, string isConst__label, string isConst, + string isUnsafe__label, string isUnsafe ) { toBeTested(x) and not x.isUnknown() and - hasAbi__label = "hasAbi:" and - (if x.hasAbi() then hasAbi = "yes" else hasAbi = "no") and isAsync__label = "isAsync:" and (if x.isAsync() then isAsync = "yes" else isAsync = "no") and isConst__label = "isConst:" and (if x.isConst() then isConst = "yes" else isConst = "no") and isUnsafe__label = "isUnsafe:" and - (if x.isUnsafe() then isUnsafe = "yes" else isUnsafe = "no") and - hasParamList__label = "hasParamList:" and - (if x.hasParamList() then hasParamList = "yes" else hasParamList = "no") and - hasRetType__label = "hasRetType:" and - if x.hasRetType() then hasRetType = "yes" else hasRetType = "no" + if x.isUnsafe() then isUnsafe = "yes" else isUnsafe = "no" } query predicate getAbi(FnPtrTypeRepr x, Abi getAbi) { diff --git a/rust/ql/test/extractor-tests/generated/ForExpr/ForExpr.expected b/rust/ql/test/extractor-tests/generated/ForExpr/ForExpr.expected index 46d37f6db4f..2e91473136f 100644 --- a/rust/ql/test/extractor-tests/generated/ForExpr/ForExpr.expected +++ b/rust/ql/test/extractor-tests/generated/ForExpr/ForExpr.expected @@ -1,5 +1,5 @@ instances -| gen_for_expr.rs:7:5:9:5 | for ... in ... { ... } | hasLabel: | no | hasLoopBody: | yes | getNumberOfAttrs: | 0 | hasIterable: | yes | hasPat: | yes | +| gen_for_expr.rs:7:5:9:5 | for ... in ... { ... } | getLabel getLoopBody | gen_for_expr.rs:7:5:9:5 | for ... in ... { ... } | gen_for_expr.rs:7:20:9:5 | { ... } | diff --git a/rust/ql/test/extractor-tests/generated/ForExpr/ForExpr.ql b/rust/ql/test/extractor-tests/generated/ForExpr/ForExpr.ql index 3d76f1e06d1..1bb7bba5c49 100644 --- a/rust/ql/test/extractor-tests/generated/ForExpr/ForExpr.ql +++ b/rust/ql/test/extractor-tests/generated/ForExpr/ForExpr.ql @@ -2,24 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - ForExpr x, string hasLabel__label, string hasLabel, string hasLoopBody__label, string hasLoopBody, - string getNumberOfAttrs__label, int getNumberOfAttrs, string hasIterable__label, - string hasIterable, string hasPat__label, string hasPat -) { - toBeTested(x) and - not x.isUnknown() and - hasLabel__label = "hasLabel:" and - (if x.hasLabel() then hasLabel = "yes" else hasLabel = "no") and - hasLoopBody__label = "hasLoopBody:" and - (if x.hasLoopBody() then hasLoopBody = "yes" else hasLoopBody = "no") and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasIterable__label = "hasIterable:" and - (if x.hasIterable() then hasIterable = "yes" else hasIterable = "no") and - hasPat__label = "hasPat:" and - if x.hasPat() then hasPat = "yes" else hasPat = "no" -} +query predicate instances(ForExpr x) { toBeTested(x) and not x.isUnknown() } query predicate getLabel(ForExpr x, Label getLabel) { toBeTested(x) and not x.isUnknown() and getLabel = x.getLabel() diff --git a/rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr.expected b/rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr.expected index c86e0a2a5b3..8f5ac12ec36 100644 --- a/rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr.expected +++ b/rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr.expected @@ -1,5 +1,5 @@ instances -| gen_for_type_repr.rs:9:12:9:41 | ForTypeRepr | hasGenericParamList: | yes | hasTypeRepr: | yes | +| gen_for_type_repr.rs:9:12:9:41 | ForTypeRepr | getGenericParamList | gen_for_type_repr.rs:9:12:9:41 | ForTypeRepr | gen_for_type_repr.rs:9:15:9:18 | <...> | getTypeRepr diff --git a/rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr.ql b/rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr.ql index 5efdf7267db..398a317a3dd 100644 --- a/rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr.ql +++ b/rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr.ql @@ -2,17 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - ForTypeRepr x, string hasGenericParamList__label, string hasGenericParamList, - string hasTypeRepr__label, string hasTypeRepr -) { - toBeTested(x) and - not x.isUnknown() and - hasGenericParamList__label = "hasGenericParamList:" and - (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and - hasTypeRepr__label = "hasTypeRepr:" and - if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no" -} +query predicate instances(ForTypeRepr x) { toBeTested(x) and not x.isUnknown() } query predicate getGenericParamList(ForTypeRepr x, GenericParamList getGenericParamList) { toBeTested(x) and not x.isUnknown() and getGenericParamList = x.getGenericParamList() diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/Format.expected b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/Format.expected index 343766da1fe..ec9fba8965a 100644 --- a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/Format.expected +++ b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/Format.expected @@ -1,21 +1,21 @@ instances -| gen_format.rs:5:21:5:22 | {} | getParent: | gen_format.rs:5:14:5:32 | FormatArgsExpr | getIndex: | 1 | hasArgumentRef: | no | hasWidthArgument: | no | hasPrecisionArgument: | no | -| gen_format.rs:7:21:7:46 | {value:#width$.precision$} | getParent: | gen_format.rs:7:14:7:47 | FormatArgsExpr | getIndex: | 1 | hasArgumentRef: | yes | hasWidthArgument: | yes | hasPrecisionArgument: | yes | -| gen_format.rs:11:15:11:20 | {name} | getParent: | gen_format.rs:11:14:11:35 | FormatArgsExpr | getIndex: | 1 | hasArgumentRef: | yes | hasWidthArgument: | no | hasPrecisionArgument: | no | -| gen_format.rs:12:15:12:17 | {0} | getParent: | gen_format.rs:12:14:12:38 | FormatArgsExpr | getIndex: | 1 | hasArgumentRef: | yes | hasWidthArgument: | no | hasPrecisionArgument: | no | -| gen_format.rs:16:15:16:23 | {:width$} | getParent: | gen_format.rs:16:14:16:28 | FormatArgsExpr | getIndex: | 1 | hasArgumentRef: | no | hasWidthArgument: | yes | hasPrecisionArgument: | no | -| gen_format.rs:17:15:17:19 | {:1$} | getParent: | gen_format.rs:17:14:17:31 | FormatArgsExpr | getIndex: | 1 | hasArgumentRef: | no | hasWidthArgument: | yes | hasPrecisionArgument: | no | -| gen_format.rs:21:15:21:23 | {:.prec$} | getParent: | gen_format.rs:21:14:21:28 | FormatArgsExpr | getIndex: | 1 | hasArgumentRef: | no | hasWidthArgument: | no | hasPrecisionArgument: | yes | -| gen_format.rs:22:15:22:20 | {:.1$} | getParent: | gen_format.rs:22:14:22:31 | FormatArgsExpr | getIndex: | 1 | hasArgumentRef: | no | hasWidthArgument: | no | hasPrecisionArgument: | yes | -| gen_format_args_arg.rs:5:26:5:27 | {} | getParent: | gen_format_args_arg.rs:5:17:5:39 | FormatArgsExpr | getIndex: | 1 | hasArgumentRef: | no | hasWidthArgument: | no | hasPrecisionArgument: | no | -| gen_format_args_expr.rs:6:19:6:20 | {} | getParent: | gen_format_args_expr.rs:6:17:6:37 | FormatArgsExpr | getIndex: | 1 | hasArgumentRef: | no | hasWidthArgument: | no | hasPrecisionArgument: | no | -| gen_format_args_expr.rs:6:26:6:29 | {:?} | getParent: | gen_format_args_expr.rs:6:17:6:37 | FormatArgsExpr | getIndex: | 3 | hasArgumentRef: | no | hasWidthArgument: | no | hasPrecisionArgument: | no | -| gen_format_args_expr.rs:7:19:7:21 | {b} | getParent: | gen_format_args_expr.rs:7:17:7:43 | FormatArgsExpr | getIndex: | 1 | hasArgumentRef: | yes | hasWidthArgument: | no | hasPrecisionArgument: | no | -| gen_format_args_expr.rs:7:27:7:31 | {a:?} | getParent: | gen_format_args_expr.rs:7:17:7:43 | FormatArgsExpr | getIndex: | 3 | hasArgumentRef: | yes | hasWidthArgument: | no | hasPrecisionArgument: | no | -| gen_format_args_expr.rs:9:19:9:21 | {x} | getParent: | gen_format_args_expr.rs:9:17:9:28 | FormatArgsExpr | getIndex: | 1 | hasArgumentRef: | yes | hasWidthArgument: | no | hasPrecisionArgument: | no | -| gen_format_args_expr.rs:9:24:9:26 | {y} | getParent: | gen_format_args_expr.rs:9:17:9:28 | FormatArgsExpr | getIndex: | 3 | hasArgumentRef: | yes | hasWidthArgument: | no | hasPrecisionArgument: | no | -| gen_format_argument.rs:5:21:5:46 | {value:#width$.precision$} | getParent: | gen_format_argument.rs:5:14:5:47 | FormatArgsExpr | getIndex: | 1 | hasArgumentRef: | yes | hasWidthArgument: | yes | hasPrecisionArgument: | yes | -| gen_format_argument.rs:7:21:7:30 | {0:#1$.2$} | getParent: | gen_format_argument.rs:7:14:7:56 | FormatArgsExpr | getIndex: | 1 | hasArgumentRef: | yes | hasWidthArgument: | yes | hasPrecisionArgument: | yes | +| gen_format.rs:5:21:5:22 | {} | getParent: | gen_format.rs:5:14:5:32 | FormatArgsExpr | getIndex: | 1 | +| gen_format.rs:7:21:7:46 | {value:#width$.precision$} | getParent: | gen_format.rs:7:14:7:47 | FormatArgsExpr | getIndex: | 1 | +| gen_format.rs:11:15:11:20 | {name} | getParent: | gen_format.rs:11:14:11:35 | FormatArgsExpr | getIndex: | 1 | +| gen_format.rs:12:15:12:17 | {0} | getParent: | gen_format.rs:12:14:12:38 | FormatArgsExpr | getIndex: | 1 | +| gen_format.rs:16:15:16:23 | {:width$} | getParent: | gen_format.rs:16:14:16:28 | FormatArgsExpr | getIndex: | 1 | +| gen_format.rs:17:15:17:19 | {:1$} | getParent: | gen_format.rs:17:14:17:31 | FormatArgsExpr | getIndex: | 1 | +| gen_format.rs:21:15:21:23 | {:.prec$} | getParent: | gen_format.rs:21:14:21:28 | FormatArgsExpr | getIndex: | 1 | +| gen_format.rs:22:15:22:20 | {:.1$} | getParent: | gen_format.rs:22:14:22:31 | FormatArgsExpr | getIndex: | 1 | +| gen_format_args_arg.rs:5:26:5:27 | {} | getParent: | gen_format_args_arg.rs:5:17:5:39 | FormatArgsExpr | getIndex: | 1 | +| gen_format_args_expr.rs:6:19:6:20 | {} | getParent: | gen_format_args_expr.rs:6:17:6:37 | FormatArgsExpr | getIndex: | 1 | +| gen_format_args_expr.rs:6:26:6:29 | {:?} | getParent: | gen_format_args_expr.rs:6:17:6:37 | FormatArgsExpr | getIndex: | 3 | +| gen_format_args_expr.rs:7:19:7:21 | {b} | getParent: | gen_format_args_expr.rs:7:17:7:43 | FormatArgsExpr | getIndex: | 1 | +| gen_format_args_expr.rs:7:27:7:31 | {a:?} | getParent: | gen_format_args_expr.rs:7:17:7:43 | FormatArgsExpr | getIndex: | 3 | +| gen_format_args_expr.rs:9:19:9:21 | {x} | getParent: | gen_format_args_expr.rs:9:17:9:28 | FormatArgsExpr | getIndex: | 1 | +| gen_format_args_expr.rs:9:24:9:26 | {y} | getParent: | gen_format_args_expr.rs:9:17:9:28 | FormatArgsExpr | getIndex: | 3 | +| gen_format_argument.rs:5:21:5:46 | {value:#width$.precision$} | getParent: | gen_format_argument.rs:5:14:5:47 | FormatArgsExpr | getIndex: | 1 | +| gen_format_argument.rs:7:21:7:30 | {0:#1$.2$} | getParent: | gen_format_argument.rs:7:14:7:56 | FormatArgsExpr | getIndex: | 1 | getArgumentRef | gen_format.rs:7:21:7:46 | {value:#width$.precision$} | gen_format.rs:7:22:7:26 | value | | gen_format.rs:11:15:11:20 | {name} | gen_format.rs:11:16:11:19 | name | diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/Format.ql b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/Format.ql index d4338607d07..5a74e34cbaf 100644 --- a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/Format.ql +++ b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/Format.ql @@ -3,22 +3,14 @@ import codeql.rust.elements import TestUtils query predicate instances( - Format x, string getParent__label, FormatArgsExpr getParent, string getIndex__label, int getIndex, - string hasArgumentRef__label, string hasArgumentRef, string hasWidthArgument__label, - string hasWidthArgument, string hasPrecisionArgument__label, string hasPrecisionArgument + Format x, string getParent__label, FormatArgsExpr getParent, string getIndex__label, int getIndex ) { toBeTested(x) and not x.isUnknown() and getParent__label = "getParent:" and getParent = x.getParent() and getIndex__label = "getIndex:" and - getIndex = x.getIndex() and - hasArgumentRef__label = "hasArgumentRef:" and - (if x.hasArgumentRef() then hasArgumentRef = "yes" else hasArgumentRef = "no") and - hasWidthArgument__label = "hasWidthArgument:" and - (if x.hasWidthArgument() then hasWidthArgument = "yes" else hasWidthArgument = "no") and - hasPrecisionArgument__label = "hasPrecisionArgument:" and - if x.hasPrecisionArgument() then hasPrecisionArgument = "yes" else hasPrecisionArgument = "no" + getIndex = x.getIndex() } query predicate getArgumentRef(Format x, FormatArgument getArgumentRef) { diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsArg.expected b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsArg.expected index 7a5d087c888..32a73ae1c7c 100644 --- a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsArg.expected +++ b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsArg.expected @@ -1,20 +1,20 @@ instances -| gen_format.rs:5:26:5:32 | FormatArgsArg | hasExpr: | yes | hasName: | no | -| gen_format.rs:12:35:12:38 | FormatArgsArg | hasExpr: | yes | hasName: | no | -| gen_format.rs:16:27:16:28 | FormatArgsArg | hasExpr: | yes | hasName: | no | -| gen_format.rs:17:23:17:24 | FormatArgsArg | hasExpr: | yes | hasName: | no | -| gen_format.rs:17:27:17:31 | FormatArgsArg | hasExpr: | yes | hasName: | no | -| gen_format.rs:21:27:21:28 | FormatArgsArg | hasExpr: | yes | hasName: | no | -| gen_format.rs:22:24:22:25 | FormatArgsArg | hasExpr: | yes | hasName: | no | -| gen_format.rs:22:28:22:31 | FormatArgsArg | hasExpr: | yes | hasName: | no | -| gen_format_args_arg.rs:5:32:5:38 | FormatArgsArg | hasExpr: | yes | hasName: | no | -| gen_format_args_expr.rs:6:33:6:33 | FormatArgsArg | hasExpr: | yes | hasName: | no | -| gen_format_args_expr.rs:6:36:6:36 | FormatArgsArg | hasExpr: | yes | hasName: | no | -| gen_format_args_expr.rs:7:35:7:37 | FormatArgsArg | hasExpr: | yes | hasName: | yes | -| gen_format_args_expr.rs:7:40:7:42 | FormatArgsArg | hasExpr: | yes | hasName: | yes | -| gen_format_argument.rs:7:34:7:38 | FormatArgsArg | hasExpr: | yes | hasName: | no | -| gen_format_argument.rs:7:41:7:45 | FormatArgsArg | hasExpr: | yes | hasName: | no | -| gen_format_argument.rs:7:48:7:56 | FormatArgsArg | hasExpr: | yes | hasName: | no | +| gen_format.rs:5:26:5:32 | FormatArgsArg | +| gen_format.rs:12:35:12:38 | FormatArgsArg | +| gen_format.rs:16:27:16:28 | FormatArgsArg | +| gen_format.rs:17:23:17:24 | FormatArgsArg | +| gen_format.rs:17:27:17:31 | FormatArgsArg | +| gen_format.rs:21:27:21:28 | FormatArgsArg | +| gen_format.rs:22:24:22:25 | FormatArgsArg | +| gen_format.rs:22:28:22:31 | FormatArgsArg | +| gen_format_args_arg.rs:5:32:5:38 | FormatArgsArg | +| gen_format_args_expr.rs:6:33:6:33 | FormatArgsArg | +| gen_format_args_expr.rs:6:36:6:36 | FormatArgsArg | +| gen_format_args_expr.rs:7:35:7:37 | FormatArgsArg | +| gen_format_args_expr.rs:7:40:7:42 | FormatArgsArg | +| gen_format_argument.rs:7:34:7:38 | FormatArgsArg | +| gen_format_argument.rs:7:41:7:45 | FormatArgsArg | +| gen_format_argument.rs:7:48:7:56 | FormatArgsArg | getExpr | gen_format.rs:5:26:5:32 | FormatArgsArg | gen_format.rs:5:26:5:32 | "world" | | gen_format.rs:12:35:12:38 | FormatArgsArg | gen_format.rs:12:35:12:38 | name | diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsArg.ql b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsArg.ql index 5da9bdc575e..d3931f98511 100644 --- a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsArg.ql +++ b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsArg.ql @@ -2,16 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - FormatArgsArg x, string hasExpr__label, string hasExpr, string hasName__label, string hasName -) { - toBeTested(x) and - not x.isUnknown() and - hasExpr__label = "hasExpr:" and - (if x.hasExpr() then hasExpr = "yes" else hasExpr = "no") and - hasName__label = "hasName:" and - if x.hasName() then hasName = "yes" else hasName = "no" -} +query predicate instances(FormatArgsArg x) { toBeTested(x) and not x.isUnknown() } query predicate getExpr(FormatArgsArg x, Expr getExpr) { toBeTested(x) and not x.isUnknown() and getExpr = x.getExpr() diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr.expected b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr.expected index 06d53d41b5c..36afee17dac 100644 --- a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr.expected +++ b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr.expected @@ -1,19 +1,19 @@ instances -| gen_format.rs:5:14:5:32 | FormatArgsExpr | getNumberOfArgs: | 1 | getNumberOfAttrs: | 0 | hasTemplate: | yes | getNumberOfFormats: | 1 | -| gen_format.rs:7:14:7:47 | FormatArgsExpr | getNumberOfArgs: | 0 | getNumberOfAttrs: | 0 | hasTemplate: | yes | getNumberOfFormats: | 1 | -| gen_format.rs:11:14:11:35 | FormatArgsExpr | getNumberOfArgs: | 0 | getNumberOfAttrs: | 0 | hasTemplate: | yes | getNumberOfFormats: | 1 | -| gen_format.rs:12:14:12:38 | FormatArgsExpr | getNumberOfArgs: | 1 | getNumberOfAttrs: | 0 | hasTemplate: | yes | getNumberOfFormats: | 1 | -| gen_format.rs:16:14:16:28 | FormatArgsExpr | getNumberOfArgs: | 1 | getNumberOfAttrs: | 0 | hasTemplate: | yes | getNumberOfFormats: | 1 | -| gen_format.rs:17:14:17:31 | FormatArgsExpr | getNumberOfArgs: | 2 | getNumberOfAttrs: | 0 | hasTemplate: | yes | getNumberOfFormats: | 1 | -| gen_format.rs:21:14:21:28 | FormatArgsExpr | getNumberOfArgs: | 1 | getNumberOfAttrs: | 0 | hasTemplate: | yes | getNumberOfFormats: | 1 | -| gen_format.rs:22:14:22:31 | FormatArgsExpr | getNumberOfArgs: | 2 | getNumberOfAttrs: | 0 | hasTemplate: | yes | getNumberOfFormats: | 1 | -| gen_format_args_arg.rs:5:17:5:39 | FormatArgsExpr | getNumberOfArgs: | 1 | getNumberOfAttrs: | 0 | hasTemplate: | yes | getNumberOfFormats: | 1 | -| gen_format_args_expr.rs:5:17:5:27 | FormatArgsExpr | getNumberOfArgs: | 0 | getNumberOfAttrs: | 0 | hasTemplate: | yes | getNumberOfFormats: | 0 | -| gen_format_args_expr.rs:6:17:6:37 | FormatArgsExpr | getNumberOfArgs: | 2 | getNumberOfAttrs: | 0 | hasTemplate: | yes | getNumberOfFormats: | 2 | -| gen_format_args_expr.rs:7:17:7:43 | FormatArgsExpr | getNumberOfArgs: | 2 | getNumberOfAttrs: | 0 | hasTemplate: | yes | getNumberOfFormats: | 2 | -| gen_format_args_expr.rs:9:17:9:28 | FormatArgsExpr | getNumberOfArgs: | 0 | getNumberOfAttrs: | 0 | hasTemplate: | yes | getNumberOfFormats: | 2 | -| gen_format_argument.rs:5:14:5:47 | FormatArgsExpr | getNumberOfArgs: | 0 | getNumberOfAttrs: | 0 | hasTemplate: | yes | getNumberOfFormats: | 1 | -| gen_format_argument.rs:7:14:7:56 | FormatArgsExpr | getNumberOfArgs: | 3 | getNumberOfAttrs: | 0 | hasTemplate: | yes | getNumberOfFormats: | 1 | +| gen_format.rs:5:14:5:32 | FormatArgsExpr | +| gen_format.rs:7:14:7:47 | FormatArgsExpr | +| gen_format.rs:11:14:11:35 | FormatArgsExpr | +| gen_format.rs:12:14:12:38 | FormatArgsExpr | +| gen_format.rs:16:14:16:28 | FormatArgsExpr | +| gen_format.rs:17:14:17:31 | FormatArgsExpr | +| gen_format.rs:21:14:21:28 | FormatArgsExpr | +| gen_format.rs:22:14:22:31 | FormatArgsExpr | +| gen_format_args_arg.rs:5:17:5:39 | FormatArgsExpr | +| gen_format_args_expr.rs:5:17:5:27 | FormatArgsExpr | +| gen_format_args_expr.rs:6:17:6:37 | FormatArgsExpr | +| gen_format_args_expr.rs:7:17:7:43 | FormatArgsExpr | +| gen_format_args_expr.rs:9:17:9:28 | FormatArgsExpr | +| gen_format_argument.rs:5:14:5:47 | FormatArgsExpr | +| gen_format_argument.rs:7:14:7:56 | FormatArgsExpr | getArg | gen_format.rs:5:14:5:32 | FormatArgsExpr | 0 | gen_format.rs:5:26:5:32 | FormatArgsArg | | gen_format.rs:12:14:12:38 | FormatArgsExpr | 0 | gen_format.rs:12:35:12:38 | FormatArgsArg | diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr.ql b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr.ql index 25a605ba291..04e7a007e67 100644 --- a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr.ql +++ b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr.ql @@ -2,22 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - FormatArgsExpr x, string getNumberOfArgs__label, int getNumberOfArgs, - string getNumberOfAttrs__label, int getNumberOfAttrs, string hasTemplate__label, - string hasTemplate, string getNumberOfFormats__label, int getNumberOfFormats -) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfArgs__label = "getNumberOfArgs:" and - getNumberOfArgs = x.getNumberOfArgs() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasTemplate__label = "hasTemplate:" and - (if x.hasTemplate() then hasTemplate = "yes" else hasTemplate = "no") and - getNumberOfFormats__label = "getNumberOfFormats:" and - getNumberOfFormats = x.getNumberOfFormats() -} +query predicate instances(FormatArgsExpr x) { toBeTested(x) and not x.isUnknown() } query predicate getArg(FormatArgsExpr x, int index, FormatArgsArg getArg) { toBeTested(x) and not x.isUnknown() and getArg = x.getArg(index) diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgument.expected b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgument.expected index 05488044629..d51a409ea94 100644 --- a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgument.expected +++ b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgument.expected @@ -1,23 +1,23 @@ instances -| gen_format.rs:7:22:7:26 | value | getParent: | gen_format.rs:7:21:7:46 | {value:#width$.precision$} | hasVariable: | yes | -| gen_format.rs:7:29:7:33 | width | getParent: | gen_format.rs:7:21:7:46 | {value:#width$.precision$} | hasVariable: | yes | -| gen_format.rs:7:36:7:44 | precision | getParent: | gen_format.rs:7:21:7:46 | {value:#width$.precision$} | hasVariable: | yes | -| gen_format.rs:11:16:11:19 | name | getParent: | gen_format.rs:11:15:11:20 | {name} | hasVariable: | yes | -| gen_format.rs:12:16:12:16 | 0 | getParent: | gen_format.rs:12:15:12:17 | {0} | hasVariable: | no | -| gen_format.rs:16:17:16:21 | width | getParent: | gen_format.rs:16:15:16:23 | {:width$} | hasVariable: | yes | -| gen_format.rs:17:17:17:17 | 1 | getParent: | gen_format.rs:17:15:17:19 | {:1$} | hasVariable: | no | -| gen_format.rs:21:18:21:21 | prec | getParent: | gen_format.rs:21:15:21:23 | {:.prec$} | hasVariable: | yes | -| gen_format.rs:22:18:22:18 | 1 | getParent: | gen_format.rs:22:15:22:20 | {:.1$} | hasVariable: | no | -| gen_format_args_expr.rs:7:20:7:20 | b | getParent: | gen_format_args_expr.rs:7:19:7:21 | {b} | hasVariable: | no | -| gen_format_args_expr.rs:7:28:7:28 | a | getParent: | gen_format_args_expr.rs:7:27:7:31 | {a:?} | hasVariable: | no | -| gen_format_args_expr.rs:9:20:9:20 | x | getParent: | gen_format_args_expr.rs:9:19:9:21 | {x} | hasVariable: | yes | -| gen_format_args_expr.rs:9:25:9:25 | y | getParent: | gen_format_args_expr.rs:9:24:9:26 | {y} | hasVariable: | yes | -| gen_format_argument.rs:5:22:5:26 | value | getParent: | gen_format_argument.rs:5:21:5:46 | {value:#width$.precision$} | hasVariable: | yes | -| gen_format_argument.rs:5:29:5:33 | width | getParent: | gen_format_argument.rs:5:21:5:46 | {value:#width$.precision$} | hasVariable: | yes | -| gen_format_argument.rs:5:36:5:44 | precision | getParent: | gen_format_argument.rs:5:21:5:46 | {value:#width$.precision$} | hasVariable: | yes | -| gen_format_argument.rs:7:22:7:22 | 0 | getParent: | gen_format_argument.rs:7:21:7:30 | {0:#1$.2$} | hasVariable: | no | -| gen_format_argument.rs:7:25:7:25 | 1 | getParent: | gen_format_argument.rs:7:21:7:30 | {0:#1$.2$} | hasVariable: | no | -| gen_format_argument.rs:7:28:7:28 | 2 | getParent: | gen_format_argument.rs:7:21:7:30 | {0:#1$.2$} | hasVariable: | no | +| gen_format.rs:7:22:7:26 | value | getParent: | gen_format.rs:7:21:7:46 | {value:#width$.precision$} | +| gen_format.rs:7:29:7:33 | width | getParent: | gen_format.rs:7:21:7:46 | {value:#width$.precision$} | +| gen_format.rs:7:36:7:44 | precision | getParent: | gen_format.rs:7:21:7:46 | {value:#width$.precision$} | +| gen_format.rs:11:16:11:19 | name | getParent: | gen_format.rs:11:15:11:20 | {name} | +| gen_format.rs:12:16:12:16 | 0 | getParent: | gen_format.rs:12:15:12:17 | {0} | +| gen_format.rs:16:17:16:21 | width | getParent: | gen_format.rs:16:15:16:23 | {:width$} | +| gen_format.rs:17:17:17:17 | 1 | getParent: | gen_format.rs:17:15:17:19 | {:1$} | +| gen_format.rs:21:18:21:21 | prec | getParent: | gen_format.rs:21:15:21:23 | {:.prec$} | +| gen_format.rs:22:18:22:18 | 1 | getParent: | gen_format.rs:22:15:22:20 | {:.1$} | +| gen_format_args_expr.rs:7:20:7:20 | b | getParent: | gen_format_args_expr.rs:7:19:7:21 | {b} | +| gen_format_args_expr.rs:7:28:7:28 | a | getParent: | gen_format_args_expr.rs:7:27:7:31 | {a:?} | +| gen_format_args_expr.rs:9:20:9:20 | x | getParent: | gen_format_args_expr.rs:9:19:9:21 | {x} | +| gen_format_args_expr.rs:9:25:9:25 | y | getParent: | gen_format_args_expr.rs:9:24:9:26 | {y} | +| gen_format_argument.rs:5:22:5:26 | value | getParent: | gen_format_argument.rs:5:21:5:46 | {value:#width$.precision$} | +| gen_format_argument.rs:5:29:5:33 | width | getParent: | gen_format_argument.rs:5:21:5:46 | {value:#width$.precision$} | +| gen_format_argument.rs:5:36:5:44 | precision | getParent: | gen_format_argument.rs:5:21:5:46 | {value:#width$.precision$} | +| gen_format_argument.rs:7:22:7:22 | 0 | getParent: | gen_format_argument.rs:7:21:7:30 | {0:#1$.2$} | +| gen_format_argument.rs:7:25:7:25 | 1 | getParent: | gen_format_argument.rs:7:21:7:30 | {0:#1$.2$} | +| gen_format_argument.rs:7:28:7:28 | 2 | getParent: | gen_format_argument.rs:7:21:7:30 | {0:#1$.2$} | getVariable | gen_format.rs:7:22:7:26 | value | gen_format.rs:7:22:7:26 | value | | gen_format.rs:7:29:7:33 | width | gen_format.rs:7:29:7:33 | width | diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgument.ql b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgument.ql index 803f657e089..0c8498fba86 100644 --- a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgument.ql +++ b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgument.ql @@ -2,16 +2,11 @@ import codeql.rust.elements import TestUtils -query predicate instances( - FormatArgument x, string getParent__label, Format getParent, string hasVariable__label, - string hasVariable -) { +query predicate instances(FormatArgument x, string getParent__label, Format getParent) { toBeTested(x) and not x.isUnknown() and getParent__label = "getParent:" and - getParent = x.getParent() and - hasVariable__label = "hasVariable:" and - if x.hasVariable() then hasVariable = "yes" else hasVariable = "no" + getParent = x.getParent() } query predicate getVariable(FormatArgument x, FormatTemplateVariableAccess getVariable) { diff --git a/rust/ql/test/extractor-tests/generated/Function/Function.expected b/rust/ql/test/extractor-tests/generated/Function/Function.expected index 2bcd8aa2f59..f2df1f154b4 100644 --- a/rust/ql/test/extractor-tests/generated/Function/Function.expected +++ b/rust/ql/test/extractor-tests/generated/Function/Function.expected @@ -1,6 +1,6 @@ instances -| gen_function.rs:3:1:4:38 | fn foo | hasParamList: | yes | getNumberOfAttrs: | 0 | getNumberOfParams: | 1 | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | hasAttributeMacroExpansion: | no | hasAbi: | no | hasBody: | yes | hasGenericParamList: | no | isAsync: | no | isConst: | no | isDefault: | no | isGen: | no | isUnsafe: | no | hasName: | yes | hasRetType: | yes | hasVisibility: | no | hasWhereClause: | no | hasImplementation: | yes | -| gen_function.rs:7:5:7:13 | fn bar | hasParamList: | yes | getNumberOfAttrs: | 0 | getNumberOfParams: | 0 | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | hasAttributeMacroExpansion: | no | hasAbi: | no | hasBody: | no | hasGenericParamList: | no | isAsync: | no | isConst: | no | isDefault: | no | isGen: | no | isUnsafe: | no | hasName: | yes | hasRetType: | no | hasVisibility: | no | hasWhereClause: | no | hasImplementation: | no | +| gen_function.rs:3:1:4:38 | fn foo | isAsync: | no | isConst: | no | isDefault: | no | isGen: | no | isUnsafe: | no | +| gen_function.rs:7:5:7:13 | fn bar | isAsync: | no | isConst: | no | isDefault: | no | isGen: | no | isUnsafe: | no | getParamList | gen_function.rs:3:1:4:38 | fn foo | gen_function.rs:4:7:4:14 | ParamList | | gen_function.rs:7:5:7:13 | fn bar | gen_function.rs:7:11:7:12 | ParamList | diff --git a/rust/ql/test/extractor-tests/generated/Function/Function.ql b/rust/ql/test/extractor-tests/generated/Function/Function.ql index 3eeabcbe35c..81f578573b0 100644 --- a/rust/ql/test/extractor-tests/generated/Function/Function.ql +++ b/rust/ql/test/extractor-tests/generated/Function/Function.ql @@ -3,47 +3,12 @@ import codeql.rust.elements import TestUtils query predicate instances( - Function x, string hasParamList__label, string hasParamList, string getNumberOfAttrs__label, - int getNumberOfAttrs, string getNumberOfParams__label, int getNumberOfParams, - string hasExtendedCanonicalPath__label, string hasExtendedCanonicalPath, - string hasCrateOrigin__label, string hasCrateOrigin, string hasAttributeMacroExpansion__label, - string hasAttributeMacroExpansion, string hasAbi__label, string hasAbi, string hasBody__label, - string hasBody, string hasGenericParamList__label, string hasGenericParamList, - string isAsync__label, string isAsync, string isConst__label, string isConst, + Function x, string isAsync__label, string isAsync, string isConst__label, string isConst, string isDefault__label, string isDefault, string isGen__label, string isGen, - string isUnsafe__label, string isUnsafe, string hasName__label, string hasName, - string hasRetType__label, string hasRetType, string hasVisibility__label, string hasVisibility, - string hasWhereClause__label, string hasWhereClause, string hasImplementation__label, - string hasImplementation + string isUnsafe__label, string isUnsafe, string hasImplementation__label, string hasImplementation ) { toBeTested(x) and not x.isUnknown() and - hasParamList__label = "hasParamList:" and - (if x.hasParamList() then hasParamList = "yes" else hasParamList = "no") and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - getNumberOfParams__label = "getNumberOfParams:" and - getNumberOfParams = x.getNumberOfParams() and - hasExtendedCanonicalPath__label = "hasExtendedCanonicalPath:" and - ( - if x.hasExtendedCanonicalPath() - then hasExtendedCanonicalPath = "yes" - else hasExtendedCanonicalPath = "no" - ) and - hasCrateOrigin__label = "hasCrateOrigin:" and - (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and - hasAttributeMacroExpansion__label = "hasAttributeMacroExpansion:" and - ( - if x.hasAttributeMacroExpansion() - then hasAttributeMacroExpansion = "yes" - else hasAttributeMacroExpansion = "no" - ) and - hasAbi__label = "hasAbi:" and - (if x.hasAbi() then hasAbi = "yes" else hasAbi = "no") and - hasBody__label = "hasBody:" and - (if x.hasBody() then hasBody = "yes" else hasBody = "no") and - hasGenericParamList__label = "hasGenericParamList:" and - (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and isAsync__label = "isAsync:" and (if x.isAsync() then isAsync = "yes" else isAsync = "no") and isConst__label = "isConst:" and @@ -54,14 +19,6 @@ query predicate instances( (if x.isGen() then isGen = "yes" else isGen = "no") and isUnsafe__label = "isUnsafe:" and (if x.isUnsafe() then isUnsafe = "yes" else isUnsafe = "no") and - hasName__label = "hasName:" and - (if x.hasName() then hasName = "yes" else hasName = "no") and - hasRetType__label = "hasRetType:" and - (if x.hasRetType() then hasRetType = "yes" else hasRetType = "no") and - hasVisibility__label = "hasVisibility:" and - (if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no") and - hasWhereClause__label = "hasWhereClause:" and - (if x.hasWhereClause() then hasWhereClause = "yes" else hasWhereClause = "no") and hasImplementation__label = "hasImplementation:" and if x.hasImplementation() then hasImplementation = "yes" else hasImplementation = "no" } diff --git a/rust/ql/test/extractor-tests/generated/GenericArgList/GenericArgList.expected b/rust/ql/test/extractor-tests/generated/GenericArgList/GenericArgList.expected index 12c897e3ba9..79282232386 100644 --- a/rust/ql/test/extractor-tests/generated/GenericArgList/GenericArgList.expected +++ b/rust/ql/test/extractor-tests/generated/GenericArgList/GenericArgList.expected @@ -1,5 +1,5 @@ instances -| gen_generic_arg_list.rs:5:10:5:21 | <...> | getNumberOfGenericArgs: | 2 | +| gen_generic_arg_list.rs:5:10:5:21 | <...> | getGenericArg | gen_generic_arg_list.rs:5:10:5:21 | <...> | 0 | gen_generic_arg_list.rs:5:13:5:15 | TypeArg | | gen_generic_arg_list.rs:5:10:5:21 | <...> | 1 | gen_generic_arg_list.rs:5:18:5:20 | TypeArg | diff --git a/rust/ql/test/extractor-tests/generated/GenericArgList/GenericArgList.ql b/rust/ql/test/extractor-tests/generated/GenericArgList/GenericArgList.ql index 6d4d6790931..3ba930f204a 100644 --- a/rust/ql/test/extractor-tests/generated/GenericArgList/GenericArgList.ql +++ b/rust/ql/test/extractor-tests/generated/GenericArgList/GenericArgList.ql @@ -2,14 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - GenericArgList x, string getNumberOfGenericArgs__label, int getNumberOfGenericArgs -) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfGenericArgs__label = "getNumberOfGenericArgs:" and - getNumberOfGenericArgs = x.getNumberOfGenericArgs() -} +query predicate instances(GenericArgList x) { toBeTested(x) and not x.isUnknown() } query predicate getGenericArg(GenericArgList x, int index, GenericArg getGenericArg) { toBeTested(x) and not x.isUnknown() and getGenericArg = x.getGenericArg(index) diff --git a/rust/ql/test/extractor-tests/generated/GenericParamList/GenericParamList.expected b/rust/ql/test/extractor-tests/generated/GenericParamList/GenericParamList.expected index e5cfac8b7f8..be0b98eb2c5 100644 --- a/rust/ql/test/extractor-tests/generated/GenericParamList/GenericParamList.expected +++ b/rust/ql/test/extractor-tests/generated/GenericParamList/GenericParamList.expected @@ -1,6 +1,6 @@ instances -| gen_generic_param_list.rs:5:9:5:14 | <...> | getNumberOfGenericParams: | 2 | -| gen_generic_param_list.rs:7:13:7:20 | <...> | getNumberOfGenericParams: | 2 | +| gen_generic_param_list.rs:5:9:5:14 | <...> | +| gen_generic_param_list.rs:7:13:7:20 | <...> | getGenericParam | gen_generic_param_list.rs:5:9:5:14 | <...> | 0 | gen_generic_param_list.rs:5:10:5:10 | A | | gen_generic_param_list.rs:5:9:5:14 | <...> | 1 | gen_generic_param_list.rs:5:13:5:13 | B | diff --git a/rust/ql/test/extractor-tests/generated/GenericParamList/GenericParamList.ql b/rust/ql/test/extractor-tests/generated/GenericParamList/GenericParamList.ql index 3fc02a5ce09..c09637a5757 100644 --- a/rust/ql/test/extractor-tests/generated/GenericParamList/GenericParamList.ql +++ b/rust/ql/test/extractor-tests/generated/GenericParamList/GenericParamList.ql @@ -2,14 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - GenericParamList x, string getNumberOfGenericParams__label, int getNumberOfGenericParams -) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfGenericParams__label = "getNumberOfGenericParams:" and - getNumberOfGenericParams = x.getNumberOfGenericParams() -} +query predicate instances(GenericParamList x) { toBeTested(x) and not x.isUnknown() } query predicate getGenericParam(GenericParamList x, int index, GenericParam getGenericParam) { toBeTested(x) and not x.isUnknown() and getGenericParam = x.getGenericParam(index) diff --git a/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat.expected b/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat.expected index b70e2bfec0c..931a1e9069a 100644 --- a/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat.expected +++ b/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat.expected @@ -1,6 +1,6 @@ instances -| gen_ident_pat.rs:6:22:6:22 | y | getNumberOfAttrs: | 0 | isMut: | no | isRef: | no | hasName: | yes | hasPat: | no | -| gen_ident_pat.rs:10:9:10:25 | y @ ... | getNumberOfAttrs: | 0 | isMut: | no | isRef: | no | hasName: | yes | hasPat: | yes | +| gen_ident_pat.rs:6:22:6:22 | y | isMut: | no | isRef: | no | +| gen_ident_pat.rs:10:9:10:25 | y @ ... | isMut: | no | isRef: | no | getAttr getName | gen_ident_pat.rs:6:22:6:22 | y | gen_ident_pat.rs:6:22:6:22 | y | diff --git a/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat.ql b/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat.ql index 11414905db3..a70bc32ca79 100644 --- a/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat.ql +++ b/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat.ql @@ -3,22 +3,14 @@ import codeql.rust.elements import TestUtils query predicate instances( - IdentPat x, string getNumberOfAttrs__label, int getNumberOfAttrs, string isMut__label, - string isMut, string isRef__label, string isRef, string hasName__label, string hasName, - string hasPat__label, string hasPat + IdentPat x, string isMut__label, string isMut, string isRef__label, string isRef ) { toBeTested(x) and not x.isUnknown() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and isMut__label = "isMut:" and (if x.isMut() then isMut = "yes" else isMut = "no") and isRef__label = "isRef:" and - (if x.isRef() then isRef = "yes" else isRef = "no") and - hasName__label = "hasName:" and - (if x.hasName() then hasName = "yes" else hasName = "no") and - hasPat__label = "hasPat:" and - if x.hasPat() then hasPat = "yes" else hasPat = "no" + if x.isRef() then isRef = "yes" else isRef = "no" } query predicate getAttr(IdentPat x, int index, Attr getAttr) { diff --git a/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr.expected b/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr.expected index e4f4ca3a621..3051c69d10e 100644 --- a/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr.expected +++ b/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr.expected @@ -1,6 +1,6 @@ instances -| gen_if_expr.rs:5:5:7:5 | if ... {...} | getNumberOfAttrs: | 0 | hasCondition: | yes | hasElse: | no | hasThen: | yes | -| gen_if_expr.rs:8:13:12:5 | if ... {...} else {...} | getNumberOfAttrs: | 0 | hasCondition: | yes | hasElse: | yes | hasThen: | yes | +| gen_if_expr.rs:5:5:7:5 | if ... {...} | +| gen_if_expr.rs:8:13:12:5 | if ... {...} else {...} | getAttr getCondition | gen_if_expr.rs:5:5:7:5 | if ... {...} | gen_if_expr.rs:5:8:5:14 | ... == ... | diff --git a/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr.ql b/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr.ql index 68623b44d2e..c41248fa322 100644 --- a/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr.ql +++ b/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr.ql @@ -2,21 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - IfExpr x, string getNumberOfAttrs__label, int getNumberOfAttrs, string hasCondition__label, - string hasCondition, string hasElse__label, string hasElse, string hasThen__label, string hasThen -) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasCondition__label = "hasCondition:" and - (if x.hasCondition() then hasCondition = "yes" else hasCondition = "no") and - hasElse__label = "hasElse:" and - (if x.hasElse() then hasElse = "yes" else hasElse = "no") and - hasThen__label = "hasThen:" and - if x.hasThen() then hasThen = "yes" else hasThen = "no" -} +query predicate instances(IfExpr x) { toBeTested(x) and not x.isUnknown() } query predicate getAttr(IfExpr x, int index, Attr getAttr) { toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index) diff --git a/rust/ql/test/extractor-tests/generated/Impl/Impl.expected b/rust/ql/test/extractor-tests/generated/Impl/Impl.expected index 8984fd58233..2a47a4e20f6 100644 --- a/rust/ql/test/extractor-tests/generated/Impl/Impl.expected +++ b/rust/ql/test/extractor-tests/generated/Impl/Impl.expected @@ -1,5 +1,5 @@ instances -| gen_impl.rs:4:5:9:5 | impl MyTrait for MyType { ... } | hasExtendedCanonicalPath: | no | hasCrateOrigin: | no | hasAttributeMacroExpansion: | no | hasAssocItemList: | yes | getNumberOfAttrs: | 0 | hasGenericParamList: | no | isConst: | no | isDefault: | no | isUnsafe: | no | hasSelfTy: | yes | hasTrait: | yes | hasVisibility: | no | hasWhereClause: | no | +| gen_impl.rs:4:5:9:5 | impl MyTrait for MyType { ... } | isConst: | no | isDefault: | no | isUnsafe: | no | getExtendedCanonicalPath getCrateOrigin getAttributeMacroExpansion diff --git a/rust/ql/test/extractor-tests/generated/Impl/Impl.ql b/rust/ql/test/extractor-tests/generated/Impl/Impl.ql index d8f94a612ad..c64bae752c3 100644 --- a/rust/ql/test/extractor-tests/generated/Impl/Impl.ql +++ b/rust/ql/test/extractor-tests/generated/Impl/Impl.ql @@ -3,51 +3,17 @@ import codeql.rust.elements import TestUtils query predicate instances( - Impl x, string hasExtendedCanonicalPath__label, string hasExtendedCanonicalPath, - string hasCrateOrigin__label, string hasCrateOrigin, string hasAttributeMacroExpansion__label, - string hasAttributeMacroExpansion, string hasAssocItemList__label, string hasAssocItemList, - string getNumberOfAttrs__label, int getNumberOfAttrs, string hasGenericParamList__label, - string hasGenericParamList, string isConst__label, string isConst, string isDefault__label, - string isDefault, string isUnsafe__label, string isUnsafe, string hasSelfTy__label, - string hasSelfTy, string hasTrait__label, string hasTrait, string hasVisibility__label, - string hasVisibility, string hasWhereClause__label, string hasWhereClause + Impl x, string isConst__label, string isConst, string isDefault__label, string isDefault, + string isUnsafe__label, string isUnsafe ) { toBeTested(x) and not x.isUnknown() and - hasExtendedCanonicalPath__label = "hasExtendedCanonicalPath:" and - ( - if x.hasExtendedCanonicalPath() - then hasExtendedCanonicalPath = "yes" - else hasExtendedCanonicalPath = "no" - ) and - hasCrateOrigin__label = "hasCrateOrigin:" and - (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and - hasAttributeMacroExpansion__label = "hasAttributeMacroExpansion:" and - ( - if x.hasAttributeMacroExpansion() - then hasAttributeMacroExpansion = "yes" - else hasAttributeMacroExpansion = "no" - ) and - hasAssocItemList__label = "hasAssocItemList:" and - (if x.hasAssocItemList() then hasAssocItemList = "yes" else hasAssocItemList = "no") and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasGenericParamList__label = "hasGenericParamList:" and - (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and isConst__label = "isConst:" and (if x.isConst() then isConst = "yes" else isConst = "no") and isDefault__label = "isDefault:" and (if x.isDefault() then isDefault = "yes" else isDefault = "no") and isUnsafe__label = "isUnsafe:" and - (if x.isUnsafe() then isUnsafe = "yes" else isUnsafe = "no") and - hasSelfTy__label = "hasSelfTy:" and - (if x.hasSelfTy() then hasSelfTy = "yes" else hasSelfTy = "no") and - hasTrait__label = "hasTrait:" and - (if x.hasTrait() then hasTrait = "yes" else hasTrait = "no") and - hasVisibility__label = "hasVisibility:" and - (if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no") and - hasWhereClause__label = "hasWhereClause:" and - if x.hasWhereClause() then hasWhereClause = "yes" else hasWhereClause = "no" + if x.isUnsafe() then isUnsafe = "yes" else isUnsafe = "no" } query predicate getExtendedCanonicalPath(Impl x, string getExtendedCanonicalPath) { diff --git a/rust/ql/test/extractor-tests/generated/ImplTraitTypeRepr/ImplTraitTypeRepr.expected b/rust/ql/test/extractor-tests/generated/ImplTraitTypeRepr/ImplTraitTypeRepr.expected index fc8f34a4858..aa04363dc44 100644 --- a/rust/ql/test/extractor-tests/generated/ImplTraitTypeRepr/ImplTraitTypeRepr.expected +++ b/rust/ql/test/extractor-tests/generated/ImplTraitTypeRepr/ImplTraitTypeRepr.expected @@ -1,4 +1,4 @@ instances -| gen_impl_trait_type_repr.rs:7:17:7:41 | ImplTraitTypeRepr | hasTypeBoundList: | yes | +| gen_impl_trait_type_repr.rs:7:17:7:41 | ImplTraitTypeRepr | getTypeBoundList | gen_impl_trait_type_repr.rs:7:17:7:41 | ImplTraitTypeRepr | gen_impl_trait_type_repr.rs:7:22:7:41 | TypeBoundList | diff --git a/rust/ql/test/extractor-tests/generated/ImplTraitTypeRepr/ImplTraitTypeRepr.ql b/rust/ql/test/extractor-tests/generated/ImplTraitTypeRepr/ImplTraitTypeRepr.ql index d46c574cf36..e877ba909ff 100644 --- a/rust/ql/test/extractor-tests/generated/ImplTraitTypeRepr/ImplTraitTypeRepr.ql +++ b/rust/ql/test/extractor-tests/generated/ImplTraitTypeRepr/ImplTraitTypeRepr.ql @@ -2,14 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - ImplTraitTypeRepr x, string hasTypeBoundList__label, string hasTypeBoundList -) { - toBeTested(x) and - not x.isUnknown() and - hasTypeBoundList__label = "hasTypeBoundList:" and - if x.hasTypeBoundList() then hasTypeBoundList = "yes" else hasTypeBoundList = "no" -} +query predicate instances(ImplTraitTypeRepr x) { toBeTested(x) and not x.isUnknown() } query predicate getTypeBoundList(ImplTraitTypeRepr x, TypeBoundList getTypeBoundList) { toBeTested(x) and not x.isUnknown() and getTypeBoundList = x.getTypeBoundList() diff --git a/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr.expected b/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr.expected index 68d241a9f93..d951344b17e 100644 --- a/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr.expected +++ b/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr.expected @@ -1,6 +1,6 @@ instances -| gen_index_expr.rs:5:5:5:12 | list[42] | getNumberOfAttrs: | 0 | hasBase: | yes | hasIndex: | yes | -| gen_index_expr.rs:6:5:6:12 | list[42] | getNumberOfAttrs: | 0 | hasBase: | yes | hasIndex: | yes | +| gen_index_expr.rs:5:5:5:12 | list[42] | +| gen_index_expr.rs:6:5:6:12 | list[42] | getAttr getBase | gen_index_expr.rs:5:5:5:12 | list[42] | gen_index_expr.rs:5:5:5:8 | list | diff --git a/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr.ql b/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr.ql index f899d8c5995..a7a870b1423 100644 --- a/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr.ql +++ b/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr.ql @@ -2,19 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - IndexExpr x, string getNumberOfAttrs__label, int getNumberOfAttrs, string hasBase__label, - string hasBase, string hasIndex__label, string hasIndex -) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasBase__label = "hasBase:" and - (if x.hasBase() then hasBase = "yes" else hasBase = "no") and - hasIndex__label = "hasIndex:" and - if x.hasIndex() then hasIndex = "yes" else hasIndex = "no" -} +query predicate instances(IndexExpr x) { toBeTested(x) and not x.isUnknown() } query predicate getAttr(IndexExpr x, int index, Attr getAttr) { toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index) diff --git a/rust/ql/test/extractor-tests/generated/ItemList/ItemList.expected b/rust/ql/test/extractor-tests/generated/ItemList/ItemList.expected index 1f5e35e1d2b..2efc834b622 100644 --- a/rust/ql/test/extractor-tests/generated/ItemList/ItemList.expected +++ b/rust/ql/test/extractor-tests/generated/ItemList/ItemList.expected @@ -1,5 +1,5 @@ instances -| gen_item_list.rs:7:11:10:5 | ItemList | getNumberOfAttrs: | 0 | getNumberOfItems: | 2 | +| gen_item_list.rs:7:11:10:5 | ItemList | getAttr getItem | gen_item_list.rs:7:11:10:5 | ItemList | 0 | gen_item_list.rs:8:9:8:19 | fn foo | diff --git a/rust/ql/test/extractor-tests/generated/ItemList/ItemList.ql b/rust/ql/test/extractor-tests/generated/ItemList/ItemList.ql index 8272b2d6ab9..015b8f79125 100644 --- a/rust/ql/test/extractor-tests/generated/ItemList/ItemList.ql +++ b/rust/ql/test/extractor-tests/generated/ItemList/ItemList.ql @@ -2,17 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - ItemList x, string getNumberOfAttrs__label, int getNumberOfAttrs, string getNumberOfItems__label, - int getNumberOfItems -) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - getNumberOfItems__label = "getNumberOfItems:" and - getNumberOfItems = x.getNumberOfItems() -} +query predicate instances(ItemList x) { toBeTested(x) and not x.isUnknown() } query predicate getAttr(ItemList x, int index, Attr getAttr) { toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index) diff --git a/rust/ql/test/extractor-tests/generated/Label/Label.expected b/rust/ql/test/extractor-tests/generated/Label/Label.expected index 567a5114c57..1028afbe3f6 100644 --- a/rust/ql/test/extractor-tests/generated/Label/Label.expected +++ b/rust/ql/test/extractor-tests/generated/Label/Label.expected @@ -1,4 +1,4 @@ instances -| gen_label.rs:5:5:5:11 | 'label | hasLifetime: | yes | +| gen_label.rs:5:5:5:11 | 'label | getLifetime | gen_label.rs:5:5:5:11 | 'label | gen_label.rs:5:5:5:10 | 'label | diff --git a/rust/ql/test/extractor-tests/generated/Label/Label.ql b/rust/ql/test/extractor-tests/generated/Label/Label.ql index 55e2e69abb0..e8cfb2a2b13 100644 --- a/rust/ql/test/extractor-tests/generated/Label/Label.ql +++ b/rust/ql/test/extractor-tests/generated/Label/Label.ql @@ -2,12 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances(Label x, string hasLifetime__label, string hasLifetime) { - toBeTested(x) and - not x.isUnknown() and - hasLifetime__label = "hasLifetime:" and - if x.hasLifetime() then hasLifetime = "yes" else hasLifetime = "no" -} +query predicate instances(Label x) { toBeTested(x) and not x.isUnknown() } query predicate getLifetime(Label x, Lifetime getLifetime) { toBeTested(x) and not x.isUnknown() and getLifetime = x.getLifetime() diff --git a/rust/ql/test/extractor-tests/generated/LetElse/LetElse.expected b/rust/ql/test/extractor-tests/generated/LetElse/LetElse.expected index 550258840ce..f0816731e30 100644 --- a/rust/ql/test/extractor-tests/generated/LetElse/LetElse.expected +++ b/rust/ql/test/extractor-tests/generated/LetElse/LetElse.expected @@ -1,4 +1,4 @@ instances -| gen_let_else.rs:7:23:9:5 | else {...} | hasBlockExpr: | yes | +| gen_let_else.rs:7:23:9:5 | else {...} | getBlockExpr | gen_let_else.rs:7:23:9:5 | else {...} | gen_let_else.rs:7:28:9:5 | { ... } | diff --git a/rust/ql/test/extractor-tests/generated/LetElse/LetElse.ql b/rust/ql/test/extractor-tests/generated/LetElse/LetElse.ql index e09442cec21..12302dcd6fa 100644 --- a/rust/ql/test/extractor-tests/generated/LetElse/LetElse.ql +++ b/rust/ql/test/extractor-tests/generated/LetElse/LetElse.ql @@ -2,12 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances(LetElse x, string hasBlockExpr__label, string hasBlockExpr) { - toBeTested(x) and - not x.isUnknown() and - hasBlockExpr__label = "hasBlockExpr:" and - if x.hasBlockExpr() then hasBlockExpr = "yes" else hasBlockExpr = "no" -} +query predicate instances(LetElse x) { toBeTested(x) and not x.isUnknown() } query predicate getBlockExpr(LetElse x, BlockExpr getBlockExpr) { toBeTested(x) and not x.isUnknown() and getBlockExpr = x.getBlockExpr() diff --git a/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr.expected b/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr.expected index 4d6657846b1..ad1544b9f97 100644 --- a/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr.expected +++ b/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr.expected @@ -1,5 +1,5 @@ instances -| gen_let_expr.rs:5:8:5:31 | let ... = maybe_some | getNumberOfAttrs: | 0 | hasScrutinee: | yes | hasPat: | yes | +| gen_let_expr.rs:5:8:5:31 | let ... = maybe_some | getAttr getScrutinee | gen_let_expr.rs:5:8:5:31 | let ... = maybe_some | gen_let_expr.rs:5:22:5:31 | maybe_some | diff --git a/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr.ql b/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr.ql index 6947eb900db..2f8de7cd2d7 100644 --- a/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr.ql +++ b/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr.ql @@ -2,19 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - LetExpr x, string getNumberOfAttrs__label, int getNumberOfAttrs, string hasScrutinee__label, - string hasScrutinee, string hasPat__label, string hasPat -) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasScrutinee__label = "hasScrutinee:" and - (if x.hasScrutinee() then hasScrutinee = "yes" else hasScrutinee = "no") and - hasPat__label = "hasPat:" and - if x.hasPat() then hasPat = "yes" else hasPat = "no" -} +query predicate instances(LetExpr x) { toBeTested(x) and not x.isUnknown() } query predicate getAttr(LetExpr x, int index, Attr getAttr) { toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index) diff --git a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt.expected b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt.expected index 3518fb2b863..235eb5e04b5 100644 --- a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt.expected +++ b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt.expected @@ -1,10 +1,10 @@ instances -| gen_let_stmt.rs:5:5:5:15 | let ... = 42 | getNumberOfAttrs: | 0 | hasInitializer: | yes | hasLetElse: | no | hasPat: | yes | hasTypeRepr: | no | -| gen_let_stmt.rs:6:5:6:20 | let ... = 42 | getNumberOfAttrs: | 0 | hasInitializer: | yes | hasLetElse: | no | hasPat: | yes | hasTypeRepr: | yes | -| gen_let_stmt.rs:7:5:7:15 | let ... | getNumberOfAttrs: | 0 | hasInitializer: | no | hasLetElse: | no | hasPat: | yes | hasTypeRepr: | yes | -| gen_let_stmt.rs:8:5:8:10 | let ... | getNumberOfAttrs: | 0 | hasInitializer: | no | hasLetElse: | no | hasPat: | yes | hasTypeRepr: | no | -| gen_let_stmt.rs:9:5:9:24 | let ... = ... | getNumberOfAttrs: | 0 | hasInitializer: | yes | hasLetElse: | no | hasPat: | yes | hasTypeRepr: | no | -| gen_let_stmt.rs:10:5:12:6 | let ... = ... else {...} | getNumberOfAttrs: | 0 | hasInitializer: | yes | hasLetElse: | yes | hasPat: | yes | hasTypeRepr: | no | +| gen_let_stmt.rs:5:5:5:15 | let ... = 42 | +| gen_let_stmt.rs:6:5:6:20 | let ... = 42 | +| gen_let_stmt.rs:7:5:7:15 | let ... | +| gen_let_stmt.rs:8:5:8:10 | let ... | +| gen_let_stmt.rs:9:5:9:24 | let ... = ... | +| gen_let_stmt.rs:10:5:12:6 | let ... = ... else {...} | getAttr getInitializer | gen_let_stmt.rs:5:5:5:15 | let ... = 42 | gen_let_stmt.rs:5:13:5:14 | 42 | diff --git a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt.ql b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt.ql index 34a6ba11adf..07feca93399 100644 --- a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt.ql +++ b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt.ql @@ -2,24 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - LetStmt x, string getNumberOfAttrs__label, int getNumberOfAttrs, string hasInitializer__label, - string hasInitializer, string hasLetElse__label, string hasLetElse, string hasPat__label, - string hasPat, string hasTypeRepr__label, string hasTypeRepr -) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasInitializer__label = "hasInitializer:" and - (if x.hasInitializer() then hasInitializer = "yes" else hasInitializer = "no") and - hasLetElse__label = "hasLetElse:" and - (if x.hasLetElse() then hasLetElse = "yes" else hasLetElse = "no") and - hasPat__label = "hasPat:" and - (if x.hasPat() then hasPat = "yes" else hasPat = "no") and - hasTypeRepr__label = "hasTypeRepr:" and - if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no" -} +query predicate instances(LetStmt x) { toBeTested(x) and not x.isUnknown() } query predicate getAttr(LetStmt x, int index, Attr getAttr) { toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index) diff --git a/rust/ql/test/extractor-tests/generated/Lifetime/Lifetime.expected b/rust/ql/test/extractor-tests/generated/Lifetime/Lifetime.expected index c56c25c82b4..e55b5553b5c 100644 --- a/rust/ql/test/extractor-tests/generated/Lifetime/Lifetime.expected +++ b/rust/ql/test/extractor-tests/generated/Lifetime/Lifetime.expected @@ -1,6 +1,6 @@ instances -| gen_lifetime.rs:7:12:7:13 | 'a | hasText: | yes | -| gen_lifetime.rs:7:20:7:21 | 'a | hasText: | yes | +| gen_lifetime.rs:7:12:7:13 | 'a | +| gen_lifetime.rs:7:20:7:21 | 'a | getText | gen_lifetime.rs:7:12:7:13 | 'a | 'a | | gen_lifetime.rs:7:20:7:21 | 'a | 'a | diff --git a/rust/ql/test/extractor-tests/generated/Lifetime/Lifetime.ql b/rust/ql/test/extractor-tests/generated/Lifetime/Lifetime.ql index da18e00fec8..fa2a2e90910 100644 --- a/rust/ql/test/extractor-tests/generated/Lifetime/Lifetime.ql +++ b/rust/ql/test/extractor-tests/generated/Lifetime/Lifetime.ql @@ -2,12 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances(Lifetime x, string hasText__label, string hasText) { - toBeTested(x) and - not x.isUnknown() and - hasText__label = "hasText:" and - if x.hasText() then hasText = "yes" else hasText = "no" -} +query predicate instances(Lifetime x) { toBeTested(x) and not x.isUnknown() } query predicate getText(Lifetime x, string getText) { toBeTested(x) and not x.isUnknown() and getText = x.getText() diff --git a/rust/ql/test/extractor-tests/generated/LifetimeArg/LifetimeArg.expected b/rust/ql/test/extractor-tests/generated/LifetimeArg/LifetimeArg.expected index 7e443594c8a..0e80f0af319 100644 --- a/rust/ql/test/extractor-tests/generated/LifetimeArg/LifetimeArg.expected +++ b/rust/ql/test/extractor-tests/generated/LifetimeArg/LifetimeArg.expected @@ -1,4 +1,4 @@ instances -| gen_lifetime_arg.rs:7:20:7:21 | LifetimeArg | hasLifetime: | yes | +| gen_lifetime_arg.rs:7:20:7:21 | LifetimeArg | getLifetime | gen_lifetime_arg.rs:7:20:7:21 | LifetimeArg | gen_lifetime_arg.rs:7:20:7:21 | 'a | diff --git a/rust/ql/test/extractor-tests/generated/LifetimeArg/LifetimeArg.ql b/rust/ql/test/extractor-tests/generated/LifetimeArg/LifetimeArg.ql index 46bcdc8080a..9d0c48958d8 100644 --- a/rust/ql/test/extractor-tests/generated/LifetimeArg/LifetimeArg.ql +++ b/rust/ql/test/extractor-tests/generated/LifetimeArg/LifetimeArg.ql @@ -2,12 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances(LifetimeArg x, string hasLifetime__label, string hasLifetime) { - toBeTested(x) and - not x.isUnknown() and - hasLifetime__label = "hasLifetime:" and - if x.hasLifetime() then hasLifetime = "yes" else hasLifetime = "no" -} +query predicate instances(LifetimeArg x) { toBeTested(x) and not x.isUnknown() } query predicate getLifetime(LifetimeArg x, Lifetime getLifetime) { toBeTested(x) and not x.isUnknown() and getLifetime = x.getLifetime() diff --git a/rust/ql/test/extractor-tests/generated/LifetimeParam/LifetimeParam.expected b/rust/ql/test/extractor-tests/generated/LifetimeParam/LifetimeParam.expected index c6ac19d43d2..7e33b58d17f 100644 --- a/rust/ql/test/extractor-tests/generated/LifetimeParam/LifetimeParam.expected +++ b/rust/ql/test/extractor-tests/generated/LifetimeParam/LifetimeParam.expected @@ -1,5 +1,5 @@ instances -| gen_lifetime_param.rs:7:12:7:13 | LifetimeParam | getNumberOfAttrs: | 0 | hasLifetime: | yes | hasTypeBoundList: | no | +| gen_lifetime_param.rs:7:12:7:13 | LifetimeParam | getAttr getLifetime | gen_lifetime_param.rs:7:12:7:13 | LifetimeParam | gen_lifetime_param.rs:7:12:7:13 | 'a | diff --git a/rust/ql/test/extractor-tests/generated/LifetimeParam/LifetimeParam.ql b/rust/ql/test/extractor-tests/generated/LifetimeParam/LifetimeParam.ql index bae165c98f0..bddc4418ba4 100644 --- a/rust/ql/test/extractor-tests/generated/LifetimeParam/LifetimeParam.ql +++ b/rust/ql/test/extractor-tests/generated/LifetimeParam/LifetimeParam.ql @@ -2,19 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - LifetimeParam x, string getNumberOfAttrs__label, int getNumberOfAttrs, string hasLifetime__label, - string hasLifetime, string hasTypeBoundList__label, string hasTypeBoundList -) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasLifetime__label = "hasLifetime:" and - (if x.hasLifetime() then hasLifetime = "yes" else hasLifetime = "no") and - hasTypeBoundList__label = "hasTypeBoundList:" and - if x.hasTypeBoundList() then hasTypeBoundList = "yes" else hasTypeBoundList = "no" -} +query predicate instances(LifetimeParam x) { toBeTested(x) and not x.isUnknown() } query predicate getAttr(LifetimeParam x, int index, Attr getAttr) { toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index) diff --git a/rust/ql/test/extractor-tests/generated/LiteralExpr/LiteralExpr.expected b/rust/ql/test/extractor-tests/generated/LiteralExpr/LiteralExpr.expected index 402e4027459..1cd7c4573ee 100644 --- a/rust/ql/test/extractor-tests/generated/LiteralExpr/LiteralExpr.expected +++ b/rust/ql/test/extractor-tests/generated/LiteralExpr/LiteralExpr.expected @@ -1,12 +1,12 @@ instances -| gen_literal_expr.rs:5:5:5:6 | 42 | getNumberOfAttrs: | 0 | hasTextValue: | yes | -| gen_literal_expr.rs:6:5:6:8 | 42.0 | getNumberOfAttrs: | 0 | hasTextValue: | yes | -| gen_literal_expr.rs:7:5:7:19 | "Hello, world!" | getNumberOfAttrs: | 0 | hasTextValue: | yes | -| gen_literal_expr.rs:8:5:8:20 | b"Hello, world!" | getNumberOfAttrs: | 0 | hasTextValue: | yes | -| gen_literal_expr.rs:9:5:9:7 | 'x' | getNumberOfAttrs: | 0 | hasTextValue: | yes | -| gen_literal_expr.rs:10:5:10:8 | b'x' | getNumberOfAttrs: | 0 | hasTextValue: | yes | -| gen_literal_expr.rs:11:5:11:20 | r"Hello, world!" | getNumberOfAttrs: | 0 | hasTextValue: | yes | -| gen_literal_expr.rs:12:5:12:8 | true | getNumberOfAttrs: | 0 | hasTextValue: | yes | +| gen_literal_expr.rs:5:5:5:6 | 42 | +| gen_literal_expr.rs:6:5:6:8 | 42.0 | +| gen_literal_expr.rs:7:5:7:19 | "Hello, world!" | +| gen_literal_expr.rs:8:5:8:20 | b"Hello, world!" | +| gen_literal_expr.rs:9:5:9:7 | 'x' | +| gen_literal_expr.rs:10:5:10:8 | b'x' | +| gen_literal_expr.rs:11:5:11:20 | r"Hello, world!" | +| gen_literal_expr.rs:12:5:12:8 | true | getAttr getTextValue | gen_literal_expr.rs:5:5:5:6 | 42 | 42 | diff --git a/rust/ql/test/extractor-tests/generated/LiteralExpr/LiteralExpr.ql b/rust/ql/test/extractor-tests/generated/LiteralExpr/LiteralExpr.ql index 1fd80258c3d..0b49e28cff2 100644 --- a/rust/ql/test/extractor-tests/generated/LiteralExpr/LiteralExpr.ql +++ b/rust/ql/test/extractor-tests/generated/LiteralExpr/LiteralExpr.ql @@ -2,17 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - LiteralExpr x, string getNumberOfAttrs__label, int getNumberOfAttrs, string hasTextValue__label, - string hasTextValue -) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasTextValue__label = "hasTextValue:" and - if x.hasTextValue() then hasTextValue = "yes" else hasTextValue = "no" -} +query predicate instances(LiteralExpr x) { toBeTested(x) and not x.isUnknown() } query predicate getAttr(LiteralExpr x, int index, Attr getAttr) { toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index) diff --git a/rust/ql/test/extractor-tests/generated/LiteralPat/LiteralPat.expected b/rust/ql/test/extractor-tests/generated/LiteralPat/LiteralPat.expected index e5995b6603d..104913be1a1 100644 --- a/rust/ql/test/extractor-tests/generated/LiteralPat/LiteralPat.expected +++ b/rust/ql/test/extractor-tests/generated/LiteralPat/LiteralPat.expected @@ -1,4 +1,4 @@ instances -| gen_literal_pat.rs:6:9:6:10 | 42 | hasLiteral: | yes | +| gen_literal_pat.rs:6:9:6:10 | 42 | getLiteral | gen_literal_pat.rs:6:9:6:10 | 42 | gen_literal_pat.rs:6:9:6:10 | 42 | diff --git a/rust/ql/test/extractor-tests/generated/LiteralPat/LiteralPat.ql b/rust/ql/test/extractor-tests/generated/LiteralPat/LiteralPat.ql index 7923514d942..ede49533726 100644 --- a/rust/ql/test/extractor-tests/generated/LiteralPat/LiteralPat.ql +++ b/rust/ql/test/extractor-tests/generated/LiteralPat/LiteralPat.ql @@ -2,12 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances(LiteralPat x, string hasLiteral__label, string hasLiteral) { - toBeTested(x) and - not x.isUnknown() and - hasLiteral__label = "hasLiteral:" and - if x.hasLiteral() then hasLiteral = "yes" else hasLiteral = "no" -} +query predicate instances(LiteralPat x) { toBeTested(x) and not x.isUnknown() } query predicate getLiteral(LiteralPat x, LiteralExpr getLiteral) { toBeTested(x) and not x.isUnknown() and getLiteral = x.getLiteral() diff --git a/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr.expected b/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr.expected index 2266e27c495..970ebd6911b 100644 --- a/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr.expected +++ b/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr.expected @@ -1,7 +1,7 @@ instances -| gen_loop_expr.rs:5:5:7:5 | loop { ... } | hasLabel: | no | hasLoopBody: | yes | getNumberOfAttrs: | 0 | -| gen_loop_expr.rs:8:5:11:5 | 'label: loop { ... } | hasLabel: | yes | hasLoopBody: | yes | getNumberOfAttrs: | 0 | -| gen_loop_expr.rs:13:5:19:5 | loop { ... } | hasLabel: | no | hasLoopBody: | yes | getNumberOfAttrs: | 0 | +| gen_loop_expr.rs:5:5:7:5 | loop { ... } | +| gen_loop_expr.rs:8:5:11:5 | 'label: loop { ... } | +| gen_loop_expr.rs:13:5:19:5 | loop { ... } | getLabel | gen_loop_expr.rs:8:5:11:5 | 'label: loop { ... } | gen_loop_expr.rs:8:5:8:11 | 'label | getLoopBody diff --git a/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr.ql b/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr.ql index a4d08c56bff..c266b1c064e 100644 --- a/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr.ql +++ b/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr.ql @@ -2,19 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - LoopExpr x, string hasLabel__label, string hasLabel, string hasLoopBody__label, - string hasLoopBody, string getNumberOfAttrs__label, int getNumberOfAttrs -) { - toBeTested(x) and - not x.isUnknown() and - hasLabel__label = "hasLabel:" and - (if x.hasLabel() then hasLabel = "yes" else hasLabel = "no") and - hasLoopBody__label = "hasLoopBody:" and - (if x.hasLoopBody() then hasLoopBody = "yes" else hasLoopBody = "no") and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() -} +query predicate instances(LoopExpr x) { toBeTested(x) and not x.isUnknown() } query predicate getLabel(LoopExpr x, Label getLabel) { toBeTested(x) and not x.isUnknown() and getLabel = x.getLabel() diff --git a/rust/ql/test/extractor-tests/generated/MacroBlockExpr/MacroBlockExpr.expected b/rust/ql/test/extractor-tests/generated/MacroBlockExpr/MacroBlockExpr.expected index ddcc6c03f09..67d330d937e 100644 --- a/rust/ql/test/extractor-tests/generated/MacroBlockExpr/MacroBlockExpr.expected +++ b/rust/ql/test/extractor-tests/generated/MacroBlockExpr/MacroBlockExpr.expected @@ -1,5 +1,5 @@ instances -| gen_macro_block_expr.rs:5:14:5:28 | MacroBlockExpr | hasTailExpr: | yes | getNumberOfStatements: | 0 | +| gen_macro_block_expr.rs:5:14:5:28 | MacroBlockExpr | getTailExpr | gen_macro_block_expr.rs:5:14:5:28 | MacroBlockExpr | gen_macro_block_expr.rs:5:14:5:28 | { ... } | getStatement diff --git a/rust/ql/test/extractor-tests/generated/MacroBlockExpr/MacroBlockExpr.ql b/rust/ql/test/extractor-tests/generated/MacroBlockExpr/MacroBlockExpr.ql index 6dfa2128609..82502ad4ec0 100644 --- a/rust/ql/test/extractor-tests/generated/MacroBlockExpr/MacroBlockExpr.ql +++ b/rust/ql/test/extractor-tests/generated/MacroBlockExpr/MacroBlockExpr.ql @@ -2,17 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - MacroBlockExpr x, string hasTailExpr__label, string hasTailExpr, - string getNumberOfStatements__label, int getNumberOfStatements -) { - toBeTested(x) and - not x.isUnknown() and - hasTailExpr__label = "hasTailExpr:" and - (if x.hasTailExpr() then hasTailExpr = "yes" else hasTailExpr = "no") and - getNumberOfStatements__label = "getNumberOfStatements:" and - getNumberOfStatements = x.getNumberOfStatements() -} +query predicate instances(MacroBlockExpr x) { toBeTested(x) and not x.isUnknown() } query predicate getTailExpr(MacroBlockExpr x, Expr getTailExpr) { toBeTested(x) and not x.isUnknown() and getTailExpr = x.getTailExpr() diff --git a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.expected b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.expected index d39e22f331f..0fae1d5e49d 100644 --- a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.expected +++ b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.expected @@ -1,6 +1,6 @@ instances -| gen_macro_call.rs:7:5:7:29 | println!... | hasExtendedCanonicalPath: | no | hasCrateOrigin: | no | hasAttributeMacroExpansion: | no | getNumberOfAttrs: | 0 | hasPath: | yes | hasTokenTree: | yes | hasMacroCallExpansion: | yes | -| gen_macro_call.rs:7:14:7:28 | ...::format_args_nl!... | hasExtendedCanonicalPath: | no | hasCrateOrigin: | no | hasAttributeMacroExpansion: | no | getNumberOfAttrs: | 0 | hasPath: | yes | hasTokenTree: | yes | hasMacroCallExpansion: | yes | +| gen_macro_call.rs:7:5:7:29 | println!... | +| gen_macro_call.rs:7:14:7:28 | ...::format_args_nl!... | getExtendedCanonicalPath getCrateOrigin getAttributeMacroExpansion diff --git a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.ql b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.ql index ca0c5d1d28f..48fddccf341 100644 --- a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.ql +++ b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.ql @@ -2,38 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - MacroCall x, string hasExtendedCanonicalPath__label, string hasExtendedCanonicalPath, - string hasCrateOrigin__label, string hasCrateOrigin, string hasAttributeMacroExpansion__label, - string hasAttributeMacroExpansion, string getNumberOfAttrs__label, int getNumberOfAttrs, - string hasPath__label, string hasPath, string hasTokenTree__label, string hasTokenTree, - string hasMacroCallExpansion__label, string hasMacroCallExpansion -) { - toBeTested(x) and - not x.isUnknown() and - hasExtendedCanonicalPath__label = "hasExtendedCanonicalPath:" and - ( - if x.hasExtendedCanonicalPath() - then hasExtendedCanonicalPath = "yes" - else hasExtendedCanonicalPath = "no" - ) and - hasCrateOrigin__label = "hasCrateOrigin:" and - (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and - hasAttributeMacroExpansion__label = "hasAttributeMacroExpansion:" and - ( - if x.hasAttributeMacroExpansion() - then hasAttributeMacroExpansion = "yes" - else hasAttributeMacroExpansion = "no" - ) and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasPath__label = "hasPath:" and - (if x.hasPath() then hasPath = "yes" else hasPath = "no") and - hasTokenTree__label = "hasTokenTree:" and - (if x.hasTokenTree() then hasTokenTree = "yes" else hasTokenTree = "no") and - hasMacroCallExpansion__label = "hasMacroCallExpansion:" and - if x.hasMacroCallExpansion() then hasMacroCallExpansion = "yes" else hasMacroCallExpansion = "no" -} +query predicate instances(MacroCall x) { toBeTested(x) and not x.isUnknown() } query predicate getExtendedCanonicalPath(MacroCall x, string getExtendedCanonicalPath) { toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath() diff --git a/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef.expected b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef.expected index 44df502e99a..b9b6ddc10cd 100644 --- a/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef.expected +++ b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef.expected @@ -1,5 +1,5 @@ instances -| gen_macro_def.rs:4:5:9:5 | MacroDef | hasExtendedCanonicalPath: | no | hasCrateOrigin: | no | hasAttributeMacroExpansion: | no | hasArgs: | yes | getNumberOfAttrs: | 0 | hasBody: | yes | hasName: | yes | hasVisibility: | yes | +| gen_macro_def.rs:4:5:9:5 | MacroDef | getExtendedCanonicalPath getCrateOrigin getAttributeMacroExpansion diff --git a/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef.ql b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef.ql index cd18500210a..e85173597cb 100644 --- a/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef.ql +++ b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef.ql @@ -2,40 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - MacroDef x, string hasExtendedCanonicalPath__label, string hasExtendedCanonicalPath, - string hasCrateOrigin__label, string hasCrateOrigin, string hasAttributeMacroExpansion__label, - string hasAttributeMacroExpansion, string hasArgs__label, string hasArgs, - string getNumberOfAttrs__label, int getNumberOfAttrs, string hasBody__label, string hasBody, - string hasName__label, string hasName, string hasVisibility__label, string hasVisibility -) { - toBeTested(x) and - not x.isUnknown() and - hasExtendedCanonicalPath__label = "hasExtendedCanonicalPath:" and - ( - if x.hasExtendedCanonicalPath() - then hasExtendedCanonicalPath = "yes" - else hasExtendedCanonicalPath = "no" - ) and - hasCrateOrigin__label = "hasCrateOrigin:" and - (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and - hasAttributeMacroExpansion__label = "hasAttributeMacroExpansion:" and - ( - if x.hasAttributeMacroExpansion() - then hasAttributeMacroExpansion = "yes" - else hasAttributeMacroExpansion = "no" - ) and - hasArgs__label = "hasArgs:" and - (if x.hasArgs() then hasArgs = "yes" else hasArgs = "no") and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasBody__label = "hasBody:" and - (if x.hasBody() then hasBody = "yes" else hasBody = "no") and - hasName__label = "hasName:" and - (if x.hasName() then hasName = "yes" else hasName = "no") and - hasVisibility__label = "hasVisibility:" and - if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no" -} +query predicate instances(MacroDef x) { toBeTested(x) and not x.isUnknown() } query predicate getExtendedCanonicalPath(MacroDef x, string getExtendedCanonicalPath) { toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath() diff --git a/rust/ql/test/extractor-tests/generated/MacroExpr/MacroExpr.expected b/rust/ql/test/extractor-tests/generated/MacroExpr/MacroExpr.expected index 552aa2b6c5c..32cb0efaaef 100644 --- a/rust/ql/test/extractor-tests/generated/MacroExpr/MacroExpr.expected +++ b/rust/ql/test/extractor-tests/generated/MacroExpr/MacroExpr.expected @@ -1,4 +1,4 @@ instances -| gen_macro_expr.rs:7:13:7:25 | MacroExpr | hasMacroCall: | yes | +| gen_macro_expr.rs:7:13:7:25 | MacroExpr | getMacroCall | gen_macro_expr.rs:7:13:7:25 | MacroExpr | gen_macro_expr.rs:7:13:7:25 | vec!... | diff --git a/rust/ql/test/extractor-tests/generated/MacroExpr/MacroExpr.ql b/rust/ql/test/extractor-tests/generated/MacroExpr/MacroExpr.ql index ec98b02d40d..0787ed7392c 100644 --- a/rust/ql/test/extractor-tests/generated/MacroExpr/MacroExpr.ql +++ b/rust/ql/test/extractor-tests/generated/MacroExpr/MacroExpr.ql @@ -2,12 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances(MacroExpr x, string hasMacroCall__label, string hasMacroCall) { - toBeTested(x) and - not x.isUnknown() and - hasMacroCall__label = "hasMacroCall:" and - if x.hasMacroCall() then hasMacroCall = "yes" else hasMacroCall = "no" -} +query predicate instances(MacroExpr x) { toBeTested(x) and not x.isUnknown() } query predicate getMacroCall(MacroExpr x, MacroCall getMacroCall) { toBeTested(x) and not x.isUnknown() and getMacroCall = x.getMacroCall() diff --git a/rust/ql/test/extractor-tests/generated/MacroItems/MacroItems.expected b/rust/ql/test/extractor-tests/generated/MacroItems/MacroItems.expected index 03c22ed5d1d..90daafd5817 100644 --- a/rust/ql/test/extractor-tests/generated/MacroItems/MacroItems.expected +++ b/rust/ql/test/extractor-tests/generated/MacroItems/MacroItems.expected @@ -1,6 +1,6 @@ instances -| gen_macro_items.rs:5:5:5:38 | MacroItems | getNumberOfItems: | 2 | -| gen_macro_items.rs:13:12:13:14 | MacroItems | getNumberOfItems: | 1 | +| gen_macro_items.rs:5:5:5:38 | MacroItems | +| gen_macro_items.rs:13:12:13:14 | MacroItems | getItem | gen_macro_items.rs:5:5:5:38 | MacroItems | 0 | gen_macro_items.rs:5:5:5:38 | use ...::Path | | gen_macro_items.rs:5:5:5:38 | MacroItems | 1 | gen_macro_items.rs:5:5:5:38 | fn get_parent | diff --git a/rust/ql/test/extractor-tests/generated/MacroItems/MacroItems.ql b/rust/ql/test/extractor-tests/generated/MacroItems/MacroItems.ql index e0b156e5f52..3a9cd1c8499 100644 --- a/rust/ql/test/extractor-tests/generated/MacroItems/MacroItems.ql +++ b/rust/ql/test/extractor-tests/generated/MacroItems/MacroItems.ql @@ -2,12 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances(MacroItems x, string getNumberOfItems__label, int getNumberOfItems) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfItems__label = "getNumberOfItems:" and - getNumberOfItems = x.getNumberOfItems() -} +query predicate instances(MacroItems x) { toBeTested(x) and not x.isUnknown() } query predicate getItem(MacroItems x, int index, Item getItem) { toBeTested(x) and not x.isUnknown() and getItem = x.getItem(index) diff --git a/rust/ql/test/extractor-tests/generated/MacroPat/MacroPat.expected b/rust/ql/test/extractor-tests/generated/MacroPat/MacroPat.expected index 8849d48a788..029b7554987 100644 --- a/rust/ql/test/extractor-tests/generated/MacroPat/MacroPat.expected +++ b/rust/ql/test/extractor-tests/generated/MacroPat/MacroPat.expected @@ -1,4 +1,4 @@ instances -| gen_macro_pat.rs:13:9:13:19 | MacroPat | hasMacroCall: | yes | +| gen_macro_pat.rs:13:9:13:19 | MacroPat | getMacroCall | gen_macro_pat.rs:13:9:13:19 | MacroPat | gen_macro_pat.rs:13:9:13:19 | my_macro!... | diff --git a/rust/ql/test/extractor-tests/generated/MacroPat/MacroPat.ql b/rust/ql/test/extractor-tests/generated/MacroPat/MacroPat.ql index 29ee657cf7b..6d9d7ba17fd 100644 --- a/rust/ql/test/extractor-tests/generated/MacroPat/MacroPat.ql +++ b/rust/ql/test/extractor-tests/generated/MacroPat/MacroPat.ql @@ -2,12 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances(MacroPat x, string hasMacroCall__label, string hasMacroCall) { - toBeTested(x) and - not x.isUnknown() and - hasMacroCall__label = "hasMacroCall:" and - if x.hasMacroCall() then hasMacroCall = "yes" else hasMacroCall = "no" -} +query predicate instances(MacroPat x) { toBeTested(x) and not x.isUnknown() } query predicate getMacroCall(MacroPat x, MacroCall getMacroCall) { toBeTested(x) and not x.isUnknown() and getMacroCall = x.getMacroCall() diff --git a/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules.expected b/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules.expected index 02be2612b26..4bfb98220f2 100644 --- a/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules.expected +++ b/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules.expected @@ -1,5 +1,5 @@ instances -| gen_macro_rules.rs:4:5:9:5 | MacroRules | hasExtendedCanonicalPath: | no | hasCrateOrigin: | no | hasAttributeMacroExpansion: | no | getNumberOfAttrs: | 0 | hasName: | yes | hasTokenTree: | yes | hasVisibility: | no | +| gen_macro_rules.rs:4:5:9:5 | MacroRules | getExtendedCanonicalPath getCrateOrigin getAttributeMacroExpansion diff --git a/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules.ql b/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules.ql index 09b4f896913..ef051f77c9e 100644 --- a/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules.ql +++ b/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules.ql @@ -2,38 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - MacroRules x, string hasExtendedCanonicalPath__label, string hasExtendedCanonicalPath, - string hasCrateOrigin__label, string hasCrateOrigin, string hasAttributeMacroExpansion__label, - string hasAttributeMacroExpansion, string getNumberOfAttrs__label, int getNumberOfAttrs, - string hasName__label, string hasName, string hasTokenTree__label, string hasTokenTree, - string hasVisibility__label, string hasVisibility -) { - toBeTested(x) and - not x.isUnknown() and - hasExtendedCanonicalPath__label = "hasExtendedCanonicalPath:" and - ( - if x.hasExtendedCanonicalPath() - then hasExtendedCanonicalPath = "yes" - else hasExtendedCanonicalPath = "no" - ) and - hasCrateOrigin__label = "hasCrateOrigin:" and - (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and - hasAttributeMacroExpansion__label = "hasAttributeMacroExpansion:" and - ( - if x.hasAttributeMacroExpansion() - then hasAttributeMacroExpansion = "yes" - else hasAttributeMacroExpansion = "no" - ) and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasName__label = "hasName:" and - (if x.hasName() then hasName = "yes" else hasName = "no") and - hasTokenTree__label = "hasTokenTree:" and - (if x.hasTokenTree() then hasTokenTree = "yes" else hasTokenTree = "no") and - hasVisibility__label = "hasVisibility:" and - if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no" -} +query predicate instances(MacroRules x) { toBeTested(x) and not x.isUnknown() } query predicate getExtendedCanonicalPath(MacroRules x, string getExtendedCanonicalPath) { toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath() diff --git a/rust/ql/test/extractor-tests/generated/MacroTypeRepr/MacroTypeRepr.expected b/rust/ql/test/extractor-tests/generated/MacroTypeRepr/MacroTypeRepr.expected index afc7a2cd6a4..4047903cc5e 100644 --- a/rust/ql/test/extractor-tests/generated/MacroTypeRepr/MacroTypeRepr.expected +++ b/rust/ql/test/extractor-tests/generated/MacroTypeRepr/MacroTypeRepr.expected @@ -1,4 +1,4 @@ instances -| gen_macro_type_repr.rs:10:14:10:26 | MacroTypeRepr | hasMacroCall: | yes | +| gen_macro_type_repr.rs:10:14:10:26 | MacroTypeRepr | getMacroCall | gen_macro_type_repr.rs:10:14:10:26 | MacroTypeRepr | gen_macro_type_repr.rs:10:14:10:26 | macro_type!... | diff --git a/rust/ql/test/extractor-tests/generated/MacroTypeRepr/MacroTypeRepr.ql b/rust/ql/test/extractor-tests/generated/MacroTypeRepr/MacroTypeRepr.ql index 026653c1709..d946ec6d05d 100644 --- a/rust/ql/test/extractor-tests/generated/MacroTypeRepr/MacroTypeRepr.ql +++ b/rust/ql/test/extractor-tests/generated/MacroTypeRepr/MacroTypeRepr.ql @@ -2,12 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances(MacroTypeRepr x, string hasMacroCall__label, string hasMacroCall) { - toBeTested(x) and - not x.isUnknown() and - hasMacroCall__label = "hasMacroCall:" and - if x.hasMacroCall() then hasMacroCall = "yes" else hasMacroCall = "no" -} +query predicate instances(MacroTypeRepr x) { toBeTested(x) and not x.isUnknown() } query predicate getMacroCall(MacroTypeRepr x, MacroCall getMacroCall) { toBeTested(x) and not x.isUnknown() and getMacroCall = x.getMacroCall() diff --git a/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm.expected b/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm.expected index 469d2098b99..964af263cd7 100644 --- a/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm.expected +++ b/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm.expected @@ -1,8 +1,8 @@ instances -| gen_match_arm.rs:6:9:6:29 | ... => y | getNumberOfAttrs: | 0 | hasExpr: | yes | hasGuard: | no | hasPat: | yes | -| gen_match_arm.rs:7:9:7:26 | ...::None => 0 | getNumberOfAttrs: | 0 | hasExpr: | yes | hasGuard: | no | hasPat: | yes | -| gen_match_arm.rs:10:9:10:35 | ... if ... => ... | getNumberOfAttrs: | 0 | hasExpr: | yes | hasGuard: | yes | hasPat: | yes | -| gen_match_arm.rs:11:9:11:15 | _ => 0 | getNumberOfAttrs: | 0 | hasExpr: | yes | hasGuard: | no | hasPat: | yes | +| gen_match_arm.rs:6:9:6:29 | ... => y | +| gen_match_arm.rs:7:9:7:26 | ...::None => 0 | +| gen_match_arm.rs:10:9:10:35 | ... if ... => ... | +| gen_match_arm.rs:11:9:11:15 | _ => 0 | getAttr getExpr | gen_match_arm.rs:6:9:6:29 | ... => y | gen_match_arm.rs:6:28:6:28 | y | diff --git a/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm.ql b/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm.ql index b2b197d7d64..11450061ab0 100644 --- a/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm.ql +++ b/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm.ql @@ -2,21 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - MatchArm x, string getNumberOfAttrs__label, int getNumberOfAttrs, string hasExpr__label, - string hasExpr, string hasGuard__label, string hasGuard, string hasPat__label, string hasPat -) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasExpr__label = "hasExpr:" and - (if x.hasExpr() then hasExpr = "yes" else hasExpr = "no") and - hasGuard__label = "hasGuard:" and - (if x.hasGuard() then hasGuard = "yes" else hasGuard = "no") and - hasPat__label = "hasPat:" and - if x.hasPat() then hasPat = "yes" else hasPat = "no" -} +query predicate instances(MatchArm x) { toBeTested(x) and not x.isUnknown() } query predicate getAttr(MatchArm x, int index, Attr getAttr) { toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index) diff --git a/rust/ql/test/extractor-tests/generated/MatchArmList/MatchArmList.expected b/rust/ql/test/extractor-tests/generated/MatchArmList/MatchArmList.expected index c3b2d8d0fb0..fec09a4f9ba 100644 --- a/rust/ql/test/extractor-tests/generated/MatchArmList/MatchArmList.expected +++ b/rust/ql/test/extractor-tests/generated/MatchArmList/MatchArmList.expected @@ -1,5 +1,5 @@ instances -| gen_match_arm_list.rs:7:13:11:5 | MatchArmList | getNumberOfArms: | 3 | getNumberOfAttrs: | 0 | +| gen_match_arm_list.rs:7:13:11:5 | MatchArmList | getArm | gen_match_arm_list.rs:7:13:11:5 | MatchArmList | 0 | gen_match_arm_list.rs:8:9:8:19 | 1 => "one" | | gen_match_arm_list.rs:7:13:11:5 | MatchArmList | 1 | gen_match_arm_list.rs:9:9:9:19 | 2 => "two" | diff --git a/rust/ql/test/extractor-tests/generated/MatchArmList/MatchArmList.ql b/rust/ql/test/extractor-tests/generated/MatchArmList/MatchArmList.ql index e255b1bd137..5565aeafc7d 100644 --- a/rust/ql/test/extractor-tests/generated/MatchArmList/MatchArmList.ql +++ b/rust/ql/test/extractor-tests/generated/MatchArmList/MatchArmList.ql @@ -2,17 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - MatchArmList x, string getNumberOfArms__label, int getNumberOfArms, - string getNumberOfAttrs__label, int getNumberOfAttrs -) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfArms__label = "getNumberOfArms:" and - getNumberOfArms = x.getNumberOfArms() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() -} +query predicate instances(MatchArmList x) { toBeTested(x) and not x.isUnknown() } query predicate getArm(MatchArmList x, int index, MatchArm getArm) { toBeTested(x) and not x.isUnknown() and getArm = x.getArm(index) diff --git a/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr.expected b/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr.expected index 10d265e63b1..9648a7aa6c7 100644 --- a/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr.expected +++ b/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr.expected @@ -1,6 +1,6 @@ instances -| gen_match_expr.rs:5:5:8:5 | match x { ... } | getNumberOfAttrs: | 0 | hasScrutinee: | yes | hasMatchArmList: | yes | -| gen_match_expr.rs:9:5:12:5 | match x { ... } | getNumberOfAttrs: | 0 | hasScrutinee: | yes | hasMatchArmList: | yes | +| gen_match_expr.rs:5:5:8:5 | match x { ... } | +| gen_match_expr.rs:9:5:12:5 | match x { ... } | getAttr getScrutinee | gen_match_expr.rs:5:5:8:5 | match x { ... } | gen_match_expr.rs:5:11:5:11 | x | diff --git a/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr.ql b/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr.ql index 9a57f43eda4..c8cc9448d5e 100644 --- a/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr.ql +++ b/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr.ql @@ -2,19 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - MatchExpr x, string getNumberOfAttrs__label, int getNumberOfAttrs, string hasScrutinee__label, - string hasScrutinee, string hasMatchArmList__label, string hasMatchArmList -) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasScrutinee__label = "hasScrutinee:" and - (if x.hasScrutinee() then hasScrutinee = "yes" else hasScrutinee = "no") and - hasMatchArmList__label = "hasMatchArmList:" and - if x.hasMatchArmList() then hasMatchArmList = "yes" else hasMatchArmList = "no" -} +query predicate instances(MatchExpr x) { toBeTested(x) and not x.isUnknown() } query predicate getAttr(MatchExpr x, int index, Attr getAttr) { toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index) diff --git a/rust/ql/test/extractor-tests/generated/MatchGuard/MatchGuard.expected b/rust/ql/test/extractor-tests/generated/MatchGuard/MatchGuard.expected index dc85bdda7a1..bcddfde4c26 100644 --- a/rust/ql/test/extractor-tests/generated/MatchGuard/MatchGuard.expected +++ b/rust/ql/test/extractor-tests/generated/MatchGuard/MatchGuard.expected @@ -1,4 +1,4 @@ instances -| gen_match_guard.rs:8:11:8:18 | MatchGuard | hasCondition: | yes | +| gen_match_guard.rs:8:11:8:18 | MatchGuard | getCondition | gen_match_guard.rs:8:11:8:18 | MatchGuard | gen_match_guard.rs:8:14:8:18 | ... > ... | diff --git a/rust/ql/test/extractor-tests/generated/MatchGuard/MatchGuard.ql b/rust/ql/test/extractor-tests/generated/MatchGuard/MatchGuard.ql index 71038463195..b7051db22d6 100644 --- a/rust/ql/test/extractor-tests/generated/MatchGuard/MatchGuard.ql +++ b/rust/ql/test/extractor-tests/generated/MatchGuard/MatchGuard.ql @@ -2,12 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances(MatchGuard x, string hasCondition__label, string hasCondition) { - toBeTested(x) and - not x.isUnknown() and - hasCondition__label = "hasCondition:" and - if x.hasCondition() then hasCondition = "yes" else hasCondition = "no" -} +query predicate instances(MatchGuard x) { toBeTested(x) and not x.isUnknown() } query predicate getCondition(MatchGuard x, Expr getCondition) { toBeTested(x) and not x.isUnknown() and getCondition = x.getCondition() diff --git a/rust/ql/test/extractor-tests/generated/Meta/Meta.expected b/rust/ql/test/extractor-tests/generated/Meta/Meta.expected index 94a040700ec..92385fa4da9 100644 --- a/rust/ql/test/extractor-tests/generated/Meta/Meta.expected +++ b/rust/ql/test/extractor-tests/generated/Meta/Meta.expected @@ -1,6 +1,6 @@ instances -| gen_meta.rs:7:7:7:46 | Meta | hasExpr: | yes | isUnsafe: | yes | hasPath: | yes | hasTokenTree: | no | -| gen_meta.rs:9:7:9:72 | Meta | hasExpr: | no | isUnsafe: | no | hasPath: | yes | hasTokenTree: | yes | +| gen_meta.rs:7:7:7:46 | Meta | isUnsafe: | yes | +| gen_meta.rs:9:7:9:72 | Meta | isUnsafe: | no | getExpr | gen_meta.rs:7:7:7:46 | Meta | gen_meta.rs:7:27:7:45 | "reason_for_bypass" | getPath diff --git a/rust/ql/test/extractor-tests/generated/Meta/Meta.ql b/rust/ql/test/extractor-tests/generated/Meta/Meta.ql index 158986f1db3..dd054ea7e99 100644 --- a/rust/ql/test/extractor-tests/generated/Meta/Meta.ql +++ b/rust/ql/test/extractor-tests/generated/Meta/Meta.ql @@ -2,20 +2,11 @@ import codeql.rust.elements import TestUtils -query predicate instances( - Meta x, string hasExpr__label, string hasExpr, string isUnsafe__label, string isUnsafe, - string hasPath__label, string hasPath, string hasTokenTree__label, string hasTokenTree -) { +query predicate instances(Meta x, string isUnsafe__label, string isUnsafe) { toBeTested(x) and not x.isUnknown() and - hasExpr__label = "hasExpr:" and - (if x.hasExpr() then hasExpr = "yes" else hasExpr = "no") and isUnsafe__label = "isUnsafe:" and - (if x.isUnsafe() then isUnsafe = "yes" else isUnsafe = "no") and - hasPath__label = "hasPath:" and - (if x.hasPath() then hasPath = "yes" else hasPath = "no") and - hasTokenTree__label = "hasTokenTree:" and - if x.hasTokenTree() then hasTokenTree = "yes" else hasTokenTree = "no" + if x.isUnsafe() then isUnsafe = "yes" else isUnsafe = "no" } query predicate getExpr(Meta x, Expr getExpr) { diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.expected b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.expected index abb0f11e089..61054a3841a 100644 --- a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.expected +++ b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.expected @@ -1,6 +1,6 @@ instances -| gen_method_call_expr.rs:5:5:5:13 | x.foo(...) | hasArgList: | yes | getNumberOfAttrs: | 0 | getNumberOfArgs: | 1 | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasGenericArgList: | no | hasIdentifier: | yes | hasReceiver: | yes | -| gen_method_call_expr.rs:6:5:6:25 | x.foo(...) | hasArgList: | yes | getNumberOfAttrs: | 0 | getNumberOfArgs: | 1 | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasGenericArgList: | yes | hasIdentifier: | yes | hasReceiver: | yes | +| gen_method_call_expr.rs:5:5:5:13 | x.foo(...) | +| gen_method_call_expr.rs:6:5:6:25 | x.foo(...) | getArgList | gen_method_call_expr.rs:5:5:5:13 | x.foo(...) | gen_method_call_expr.rs:5:10:5:13 | ArgList | | gen_method_call_expr.rs:6:5:6:25 | x.foo(...) | gen_method_call_expr.rs:6:22:6:25 | ArgList | diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql index 5d515f99a2b..73ddf8e7d2e 100644 --- a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql +++ b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql @@ -2,36 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - MethodCallExpr x, string hasArgList__label, string hasArgList, string getNumberOfAttrs__label, - int getNumberOfAttrs, string getNumberOfArgs__label, int getNumberOfArgs, - string hasResolvedPath__label, string hasResolvedPath, string hasResolvedCrateOrigin__label, - string hasResolvedCrateOrigin, string hasGenericArgList__label, string hasGenericArgList, - string hasIdentifier__label, string hasIdentifier, string hasReceiver__label, string hasReceiver -) { - toBeTested(x) and - not x.isUnknown() and - hasArgList__label = "hasArgList:" and - (if x.hasArgList() then hasArgList = "yes" else hasArgList = "no") and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - getNumberOfArgs__label = "getNumberOfArgs:" and - getNumberOfArgs = x.getNumberOfArgs() and - hasResolvedPath__label = "hasResolvedPath:" and - (if x.hasResolvedPath() then hasResolvedPath = "yes" else hasResolvedPath = "no") and - hasResolvedCrateOrigin__label = "hasResolvedCrateOrigin:" and - ( - if x.hasResolvedCrateOrigin() - then hasResolvedCrateOrigin = "yes" - else hasResolvedCrateOrigin = "no" - ) and - hasGenericArgList__label = "hasGenericArgList:" and - (if x.hasGenericArgList() then hasGenericArgList = "yes" else hasGenericArgList = "no") and - hasIdentifier__label = "hasIdentifier:" and - (if x.hasIdentifier() then hasIdentifier = "yes" else hasIdentifier = "no") and - hasReceiver__label = "hasReceiver:" and - if x.hasReceiver() then hasReceiver = "yes" else hasReceiver = "no" -} +query predicate instances(MethodCallExpr x) { toBeTested(x) and not x.isUnknown() } query predicate getArgList(MethodCallExpr x, ArgList getArgList) { toBeTested(x) and not x.isUnknown() and getArgList = x.getArgList() diff --git a/rust/ql/test/extractor-tests/generated/Module/Module.expected b/rust/ql/test/extractor-tests/generated/Module/Module.expected index b1d63ea22fa..a742b7145d3 100644 --- a/rust/ql/test/extractor-tests/generated/Module/Module.expected +++ b/rust/ql/test/extractor-tests/generated/Module/Module.expected @@ -1,7 +1,7 @@ instances -| gen_module.rs:3:1:4:8 | mod foo | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | hasAttributeMacroExpansion: | no | getNumberOfAttrs: | 0 | hasItemList: | no | hasName: | yes | hasVisibility: | no | -| gen_module.rs:5:1:7:1 | mod bar | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | hasAttributeMacroExpansion: | no | getNumberOfAttrs: | 0 | hasItemList: | yes | hasName: | yes | hasVisibility: | no | -| lib.rs:1:1:1:15 | mod gen_module | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | hasAttributeMacroExpansion: | no | getNumberOfAttrs: | 0 | hasItemList: | no | hasName: | yes | hasVisibility: | no | +| gen_module.rs:3:1:4:8 | mod foo | +| gen_module.rs:5:1:7:1 | mod bar | +| lib.rs:1:1:1:15 | mod gen_module | getExtendedCanonicalPath | gen_module.rs:3:1:4:8 | mod foo | crate::gen_module::foo | | gen_module.rs:5:1:7:1 | mod bar | crate::gen_module::bar | diff --git a/rust/ql/test/extractor-tests/generated/Module/Module.ql b/rust/ql/test/extractor-tests/generated/Module/Module.ql index 638cba130dd..48a141bbc1f 100644 --- a/rust/ql/test/extractor-tests/generated/Module/Module.ql +++ b/rust/ql/test/extractor-tests/generated/Module/Module.ql @@ -2,38 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - Module x, string hasExtendedCanonicalPath__label, string hasExtendedCanonicalPath, - string hasCrateOrigin__label, string hasCrateOrigin, string hasAttributeMacroExpansion__label, - string hasAttributeMacroExpansion, string getNumberOfAttrs__label, int getNumberOfAttrs, - string hasItemList__label, string hasItemList, string hasName__label, string hasName, - string hasVisibility__label, string hasVisibility -) { - toBeTested(x) and - not x.isUnknown() and - hasExtendedCanonicalPath__label = "hasExtendedCanonicalPath:" and - ( - if x.hasExtendedCanonicalPath() - then hasExtendedCanonicalPath = "yes" - else hasExtendedCanonicalPath = "no" - ) and - hasCrateOrigin__label = "hasCrateOrigin:" and - (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and - hasAttributeMacroExpansion__label = "hasAttributeMacroExpansion:" and - ( - if x.hasAttributeMacroExpansion() - then hasAttributeMacroExpansion = "yes" - else hasAttributeMacroExpansion = "no" - ) and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasItemList__label = "hasItemList:" and - (if x.hasItemList() then hasItemList = "yes" else hasItemList = "no") and - hasName__label = "hasName:" and - (if x.hasName() then hasName = "yes" else hasName = "no") and - hasVisibility__label = "hasVisibility:" and - if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no" -} +query predicate instances(Module x) { toBeTested(x) and not x.isUnknown() } query predicate getExtendedCanonicalPath(Module x, string getExtendedCanonicalPath) { toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath() diff --git a/rust/ql/test/extractor-tests/generated/Name/Name.expected b/rust/ql/test/extractor-tests/generated/Name/Name.expected index d32b6f0e228..2bcd496ef2e 100644 --- a/rust/ql/test/extractor-tests/generated/Name/Name.expected +++ b/rust/ql/test/extractor-tests/generated/Name/Name.expected @@ -1,7 +1,7 @@ instances -| gen_name.rs:3:4:3:12 | test_name | hasText: | yes | -| gen_name.rs:7:9:7:11 | foo | hasText: | yes | -| lib.rs:1:5:1:12 | gen_name | hasText: | yes | +| gen_name.rs:3:4:3:12 | test_name | +| gen_name.rs:7:9:7:11 | foo | +| lib.rs:1:5:1:12 | gen_name | getText | gen_name.rs:3:4:3:12 | test_name | test_name | | gen_name.rs:7:9:7:11 | foo | foo | diff --git a/rust/ql/test/extractor-tests/generated/Name/Name.ql b/rust/ql/test/extractor-tests/generated/Name/Name.ql index 66c4076f98e..141042ac6a8 100644 --- a/rust/ql/test/extractor-tests/generated/Name/Name.ql +++ b/rust/ql/test/extractor-tests/generated/Name/Name.ql @@ -2,12 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances(Name x, string hasText__label, string hasText) { - toBeTested(x) and - not x.isUnknown() and - hasText__label = "hasText:" and - if x.hasText() then hasText = "yes" else hasText = "no" -} +query predicate instances(Name x) { toBeTested(x) and not x.isUnknown() } query predicate getText(Name x, string getText) { toBeTested(x) and not x.isUnknown() and getText = x.getText() diff --git a/rust/ql/test/extractor-tests/generated/NameRef/NameRef.expected b/rust/ql/test/extractor-tests/generated/NameRef/NameRef.expected index acefbd4cf95..a77dc575a77 100644 --- a/rust/ql/test/extractor-tests/generated/NameRef/NameRef.expected +++ b/rust/ql/test/extractor-tests/generated/NameRef/NameRef.expected @@ -1,4 +1,4 @@ instances -| gen_name_ref.rs:7:7:7:9 | foo | hasText: | yes | +| gen_name_ref.rs:7:7:7:9 | foo | getText | gen_name_ref.rs:7:7:7:9 | foo | foo | diff --git a/rust/ql/test/extractor-tests/generated/NameRef/NameRef.ql b/rust/ql/test/extractor-tests/generated/NameRef/NameRef.ql index 77dc3cc6802..00af6f1dbcf 100644 --- a/rust/ql/test/extractor-tests/generated/NameRef/NameRef.ql +++ b/rust/ql/test/extractor-tests/generated/NameRef/NameRef.ql @@ -2,12 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances(NameRef x, string hasText__label, string hasText) { - toBeTested(x) and - not x.isUnknown() and - hasText__label = "hasText:" and - if x.hasText() then hasText = "yes" else hasText = "no" -} +query predicate instances(NameRef x) { toBeTested(x) and not x.isUnknown() } query predicate getText(NameRef x, string getText) { toBeTested(x) and not x.isUnknown() and getText = x.getText() diff --git a/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.expected b/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.expected index 0c32955b483..eb8b19babfe 100644 --- a/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.expected +++ b/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.expected @@ -1,5 +1,5 @@ instances -| gen_offset_of_expr.rs:5:5:5:38 | OffsetOfExpr | getNumberOfAttrs: | 0 | getNumberOfFields: | 1 | hasTypeRepr: | yes | +| gen_offset_of_expr.rs:5:5:5:38 | OffsetOfExpr | getAttr getField | gen_offset_of_expr.rs:5:5:5:38 | OffsetOfExpr | 0 | gen_offset_of_expr.rs:5:33:5:37 | field | diff --git a/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.ql b/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.ql index f9c837932bb..64208e34bbf 100644 --- a/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.ql +++ b/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.ql @@ -2,20 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - OffsetOfExpr x, string getNumberOfAttrs__label, int getNumberOfAttrs, - string getNumberOfFields__label, int getNumberOfFields, string hasTypeRepr__label, - string hasTypeRepr -) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - getNumberOfFields__label = "getNumberOfFields:" and - getNumberOfFields = x.getNumberOfFields() and - hasTypeRepr__label = "hasTypeRepr:" and - if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no" -} +query predicate instances(OffsetOfExpr x) { toBeTested(x) and not x.isUnknown() } query predicate getAttr(OffsetOfExpr x, int index, Attr getAttr) { toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index) diff --git a/rust/ql/test/extractor-tests/generated/OrPat/OrPat.expected b/rust/ql/test/extractor-tests/generated/OrPat/OrPat.expected index a077d8de689..8dcc1baa8d5 100644 --- a/rust/ql/test/extractor-tests/generated/OrPat/OrPat.expected +++ b/rust/ql/test/extractor-tests/generated/OrPat/OrPat.expected @@ -1,5 +1,5 @@ instances -| gen_or_pat.rs:6:9:6:38 | ... \| ...::None | getNumberOfPats: | 2 | +| gen_or_pat.rs:6:9:6:38 | ... \| ...::None | getPat | gen_or_pat.rs:6:9:6:38 | ... \| ...::None | 0 | gen_or_pat.rs:6:9:6:23 | ...::Some(...) | | gen_or_pat.rs:6:9:6:38 | ... \| ...::None | 1 | gen_or_pat.rs:6:27:6:38 | ...::None | diff --git a/rust/ql/test/extractor-tests/generated/OrPat/OrPat.ql b/rust/ql/test/extractor-tests/generated/OrPat/OrPat.ql index 2487f6f2365..0c60f19278f 100644 --- a/rust/ql/test/extractor-tests/generated/OrPat/OrPat.ql +++ b/rust/ql/test/extractor-tests/generated/OrPat/OrPat.ql @@ -2,12 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances(OrPat x, string getNumberOfPats__label, int getNumberOfPats) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfPats__label = "getNumberOfPats:" and - getNumberOfPats = x.getNumberOfPats() -} +query predicate instances(OrPat x) { toBeTested(x) and not x.isUnknown() } query predicate getPat(OrPat x, int index, Pat getPat) { toBeTested(x) and not x.isUnknown() and getPat = x.getPat(index) diff --git a/rust/ql/test/extractor-tests/generated/Param/Param.expected b/rust/ql/test/extractor-tests/generated/Param/Param.expected index 304467f0b76..929e72c51fb 100644 --- a/rust/ql/test/extractor-tests/generated/Param/Param.expected +++ b/rust/ql/test/extractor-tests/generated/Param/Param.expected @@ -1,5 +1,5 @@ instances -| gen_param.rs:5:12:5:15 | ...: T | getNumberOfAttrs: | 0 | hasTypeRepr: | yes | hasPat: | yes | +| gen_param.rs:5:12:5:15 | ...: T | getAttr getTypeRepr | gen_param.rs:5:12:5:15 | ...: T | gen_param.rs:5:15:5:15 | T | diff --git a/rust/ql/test/extractor-tests/generated/Param/Param.ql b/rust/ql/test/extractor-tests/generated/Param/Param.ql index ba1d62c59d1..ff1a261ef04 100644 --- a/rust/ql/test/extractor-tests/generated/Param/Param.ql +++ b/rust/ql/test/extractor-tests/generated/Param/Param.ql @@ -2,19 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - Param x, string getNumberOfAttrs__label, int getNumberOfAttrs, string hasTypeRepr__label, - string hasTypeRepr, string hasPat__label, string hasPat -) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasTypeRepr__label = "hasTypeRepr:" and - (if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no") and - hasPat__label = "hasPat:" and - if x.hasPat() then hasPat = "yes" else hasPat = "no" -} +query predicate instances(Param x) { toBeTested(x) and not x.isUnknown() } query predicate getAttr(Param x, int index, Attr getAttr) { toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index) diff --git a/rust/ql/test/extractor-tests/generated/ParamList/ParamList.expected b/rust/ql/test/extractor-tests/generated/ParamList/ParamList.expected index 57db5f779fa..5b95cf48ca8 100644 --- a/rust/ql/test/extractor-tests/generated/ParamList/ParamList.expected +++ b/rust/ql/test/extractor-tests/generated/ParamList/ParamList.expected @@ -1,6 +1,6 @@ instances -| gen_param_list.rs:3:19:3:20 | ParamList | getNumberOfParams: | 0 | hasSelfParam: | no | -| gen_param_list.rs:7:11:7:26 | ParamList | getNumberOfParams: | 2 | hasSelfParam: | no | +| gen_param_list.rs:3:19:3:20 | ParamList | +| gen_param_list.rs:7:11:7:26 | ParamList | getParam | gen_param_list.rs:7:11:7:26 | ParamList | 0 | gen_param_list.rs:7:12:7:17 | ...: i32 | | gen_param_list.rs:7:11:7:26 | ParamList | 1 | gen_param_list.rs:7:20:7:25 | ...: i32 | diff --git a/rust/ql/test/extractor-tests/generated/ParamList/ParamList.ql b/rust/ql/test/extractor-tests/generated/ParamList/ParamList.ql index d60469a20fb..36af8b9eafa 100644 --- a/rust/ql/test/extractor-tests/generated/ParamList/ParamList.ql +++ b/rust/ql/test/extractor-tests/generated/ParamList/ParamList.ql @@ -2,17 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - ParamList x, string getNumberOfParams__label, int getNumberOfParams, string hasSelfParam__label, - string hasSelfParam -) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfParams__label = "getNumberOfParams:" and - getNumberOfParams = x.getNumberOfParams() and - hasSelfParam__label = "hasSelfParam:" and - if x.hasSelfParam() then hasSelfParam = "yes" else hasSelfParam = "no" -} +query predicate instances(ParamList x) { toBeTested(x) and not x.isUnknown() } query predicate getParam(ParamList x, int index, Param getParam) { toBeTested(x) and not x.isUnknown() and getParam = x.getParam(index) diff --git a/rust/ql/test/extractor-tests/generated/ParenExpr/ParenExpr.expected b/rust/ql/test/extractor-tests/generated/ParenExpr/ParenExpr.expected index b279ca134ad..57a89a35cde 100644 --- a/rust/ql/test/extractor-tests/generated/ParenExpr/ParenExpr.expected +++ b/rust/ql/test/extractor-tests/generated/ParenExpr/ParenExpr.expected @@ -1,5 +1,5 @@ instances -| gen_paren_expr.rs:7:5:7:11 | (...) | getNumberOfAttrs: | 0 | hasExpr: | yes | +| gen_paren_expr.rs:7:5:7:11 | (...) | getAttr getExpr | gen_paren_expr.rs:7:5:7:11 | (...) | gen_paren_expr.rs:7:6:7:10 | ... + ... | diff --git a/rust/ql/test/extractor-tests/generated/ParenExpr/ParenExpr.ql b/rust/ql/test/extractor-tests/generated/ParenExpr/ParenExpr.ql index df5520d210c..1074fc3cd00 100644 --- a/rust/ql/test/extractor-tests/generated/ParenExpr/ParenExpr.ql +++ b/rust/ql/test/extractor-tests/generated/ParenExpr/ParenExpr.ql @@ -2,17 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - ParenExpr x, string getNumberOfAttrs__label, int getNumberOfAttrs, string hasExpr__label, - string hasExpr -) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasExpr__label = "hasExpr:" and - if x.hasExpr() then hasExpr = "yes" else hasExpr = "no" -} +query predicate instances(ParenExpr x) { toBeTested(x) and not x.isUnknown() } query predicate getAttr(ParenExpr x, int index, Attr getAttr) { toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index) diff --git a/rust/ql/test/extractor-tests/generated/ParenPat/ParenPat.expected b/rust/ql/test/extractor-tests/generated/ParenPat/ParenPat.expected index e0b1631be04..2e26da6da78 100644 --- a/rust/ql/test/extractor-tests/generated/ParenPat/ParenPat.expected +++ b/rust/ql/test/extractor-tests/generated/ParenPat/ParenPat.expected @@ -1,4 +1,4 @@ instances -| gen_paren_pat.rs:7:9:7:11 | (...) | hasPat: | yes | +| gen_paren_pat.rs:7:9:7:11 | (...) | getPat | gen_paren_pat.rs:7:9:7:11 | (...) | gen_paren_pat.rs:7:10:7:10 | x | diff --git a/rust/ql/test/extractor-tests/generated/ParenPat/ParenPat.ql b/rust/ql/test/extractor-tests/generated/ParenPat/ParenPat.ql index 7e235b04873..18b7c74b94b 100644 --- a/rust/ql/test/extractor-tests/generated/ParenPat/ParenPat.ql +++ b/rust/ql/test/extractor-tests/generated/ParenPat/ParenPat.ql @@ -2,12 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances(ParenPat x, string hasPat__label, string hasPat) { - toBeTested(x) and - not x.isUnknown() and - hasPat__label = "hasPat:" and - if x.hasPat() then hasPat = "yes" else hasPat = "no" -} +query predicate instances(ParenPat x) { toBeTested(x) and not x.isUnknown() } query predicate getPat(ParenPat x, Pat getPat) { toBeTested(x) and not x.isUnknown() and getPat = x.getPat() diff --git a/rust/ql/test/extractor-tests/generated/ParenTypeRepr/ParenTypeRepr.expected b/rust/ql/test/extractor-tests/generated/ParenTypeRepr/ParenTypeRepr.expected index 98d26b50c12..1e77f93912f 100644 --- a/rust/ql/test/extractor-tests/generated/ParenTypeRepr/ParenTypeRepr.expected +++ b/rust/ql/test/extractor-tests/generated/ParenTypeRepr/ParenTypeRepr.expected @@ -1,4 +1,4 @@ instances -| gen_paren_type_repr.rs:7:12:7:16 | (i32) | hasTypeRepr: | yes | +| gen_paren_type_repr.rs:7:12:7:16 | (i32) | getTypeRepr | gen_paren_type_repr.rs:7:12:7:16 | (i32) | gen_paren_type_repr.rs:7:13:7:15 | i32 | diff --git a/rust/ql/test/extractor-tests/generated/ParenTypeRepr/ParenTypeRepr.ql b/rust/ql/test/extractor-tests/generated/ParenTypeRepr/ParenTypeRepr.ql index 92f1d241d20..8df81166aa5 100644 --- a/rust/ql/test/extractor-tests/generated/ParenTypeRepr/ParenTypeRepr.ql +++ b/rust/ql/test/extractor-tests/generated/ParenTypeRepr/ParenTypeRepr.ql @@ -2,12 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances(ParenTypeRepr x, string hasTypeRepr__label, string hasTypeRepr) { - toBeTested(x) and - not x.isUnknown() and - hasTypeRepr__label = "hasTypeRepr:" and - if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no" -} +query predicate instances(ParenTypeRepr x) { toBeTested(x) and not x.isUnknown() } query predicate getTypeRepr(ParenTypeRepr x, TypeRepr getTypeRepr) { toBeTested(x) and not x.isUnknown() and getTypeRepr = x.getTypeRepr() diff --git a/rust/ql/test/extractor-tests/generated/ParenthesizedArgList/ParenthesizedArgList.expected b/rust/ql/test/extractor-tests/generated/ParenthesizedArgList/ParenthesizedArgList.expected index cb6c4c651bb..b787bde1ae2 100644 --- a/rust/ql/test/extractor-tests/generated/ParenthesizedArgList/ParenthesizedArgList.expected +++ b/rust/ql/test/extractor-tests/generated/ParenthesizedArgList/ParenthesizedArgList.expected @@ -1,5 +1,5 @@ instances -| gen_parenthesized_arg_list.rs:9:14:9:26 | ParenthesizedArgList | getNumberOfTypeArgs: | 2 | +| gen_parenthesized_arg_list.rs:9:14:9:26 | ParenthesizedArgList | getTypeArg | gen_parenthesized_arg_list.rs:9:14:9:26 | ParenthesizedArgList | 0 | gen_parenthesized_arg_list.rs:9:15:9:17 | TypeArg | | gen_parenthesized_arg_list.rs:9:14:9:26 | ParenthesizedArgList | 1 | gen_parenthesized_arg_list.rs:9:20:9:25 | TypeArg | diff --git a/rust/ql/test/extractor-tests/generated/ParenthesizedArgList/ParenthesizedArgList.ql b/rust/ql/test/extractor-tests/generated/ParenthesizedArgList/ParenthesizedArgList.ql index 72a7ac182ef..b35858d3ad0 100644 --- a/rust/ql/test/extractor-tests/generated/ParenthesizedArgList/ParenthesizedArgList.ql +++ b/rust/ql/test/extractor-tests/generated/ParenthesizedArgList/ParenthesizedArgList.ql @@ -2,14 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - ParenthesizedArgList x, string getNumberOfTypeArgs__label, int getNumberOfTypeArgs -) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfTypeArgs__label = "getNumberOfTypeArgs:" and - getNumberOfTypeArgs = x.getNumberOfTypeArgs() -} +query predicate instances(ParenthesizedArgList x) { toBeTested(x) and not x.isUnknown() } query predicate getTypeArg(ParenthesizedArgList x, int index, TypeArg getTypeArg) { toBeTested(x) and not x.isUnknown() and getTypeArg = x.getTypeArg(index) diff --git a/rust/ql/test/extractor-tests/generated/Path/Path.expected b/rust/ql/test/extractor-tests/generated/Path/Path.expected index c0a0e4b5515..e188cc32fec 100644 --- a/rust/ql/test/extractor-tests/generated/Path/Path.expected +++ b/rust/ql/test/extractor-tests/generated/Path/Path.expected @@ -1,29 +1,29 @@ instances -| gen_path.rs:5:9:5:18 | some_crate | hasQualifier: | no | hasSegment: | yes | -| gen_path.rs:5:9:5:31 | ...::some_module | hasQualifier: | yes | hasSegment: | yes | -| gen_path.rs:5:9:5:42 | ...::some_item | hasQualifier: | yes | hasSegment: | yes | -| gen_path.rs:6:5:6:7 | foo | hasQualifier: | no | hasSegment: | yes | -| gen_path.rs:6:5:6:12 | ...::bar | hasQualifier: | yes | hasSegment: | yes | -| gen_path_expr.rs:5:13:5:20 | variable | hasQualifier: | no | hasSegment: | yes | -| gen_path_expr.rs:6:13:6:15 | foo | hasQualifier: | no | hasSegment: | yes | -| gen_path_expr.rs:6:13:6:20 | ...::bar | hasQualifier: | yes | hasSegment: | yes | -| gen_path_expr.rs:7:13:7:15 | <...> | hasQualifier: | no | hasSegment: | yes | -| gen_path_expr.rs:7:13:7:20 | ...::foo | hasQualifier: | yes | hasSegment: | yes | -| gen_path_expr.rs:7:14:7:14 | T | hasQualifier: | no | hasSegment: | yes | -| gen_path_expr.rs:8:13:8:31 | <...> | hasQualifier: | no | hasSegment: | yes | -| gen_path_expr.rs:8:13:8:36 | ...::foo | hasQualifier: | yes | hasSegment: | yes | -| gen_path_expr.rs:8:14:8:21 | TypeRepr | hasQualifier: | no | hasSegment: | yes | -| gen_path_expr.rs:8:26:8:30 | Trait | hasQualifier: | no | hasSegment: | yes | -| gen_path_pat.rs:5:11:5:11 | x | hasQualifier: | no | hasSegment: | yes | -| gen_path_pat.rs:6:9:6:11 | Foo | hasQualifier: | no | hasSegment: | yes | -| gen_path_pat.rs:6:9:6:16 | ...::Bar | hasQualifier: | yes | hasSegment: | yes | -| gen_path_type_repr.rs:5:14:5:16 | std | hasQualifier: | no | hasSegment: | yes | -| gen_path_type_repr.rs:5:14:5:29 | ...::collections | hasQualifier: | yes | hasSegment: | yes | -| gen_path_type_repr.rs:5:14:5:48 | ...::HashMap::<...> | hasQualifier: | yes | hasSegment: | yes | -| gen_path_type_repr.rs:5:40:5:42 | i32 | hasQualifier: | no | hasSegment: | yes | -| gen_path_type_repr.rs:5:45:5:47 | i32 | hasQualifier: | no | hasSegment: | yes | -| gen_path_type_repr.rs:6:14:6:14 | X | hasQualifier: | no | hasSegment: | yes | -| gen_path_type_repr.rs:6:14:6:20 | ...::Item | hasQualifier: | yes | hasSegment: | yes | +| gen_path.rs:5:9:5:18 | some_crate | +| gen_path.rs:5:9:5:31 | ...::some_module | +| gen_path.rs:5:9:5:42 | ...::some_item | +| gen_path.rs:6:5:6:7 | foo | +| gen_path.rs:6:5:6:12 | ...::bar | +| gen_path_expr.rs:5:13:5:20 | variable | +| gen_path_expr.rs:6:13:6:15 | foo | +| gen_path_expr.rs:6:13:6:20 | ...::bar | +| gen_path_expr.rs:7:13:7:15 | <...> | +| gen_path_expr.rs:7:13:7:20 | ...::foo | +| gen_path_expr.rs:7:14:7:14 | T | +| gen_path_expr.rs:8:13:8:31 | <...> | +| gen_path_expr.rs:8:13:8:36 | ...::foo | +| gen_path_expr.rs:8:14:8:21 | TypeRepr | +| gen_path_expr.rs:8:26:8:30 | Trait | +| gen_path_pat.rs:5:11:5:11 | x | +| gen_path_pat.rs:6:9:6:11 | Foo | +| gen_path_pat.rs:6:9:6:16 | ...::Bar | +| gen_path_type_repr.rs:5:14:5:16 | std | +| gen_path_type_repr.rs:5:14:5:29 | ...::collections | +| gen_path_type_repr.rs:5:14:5:48 | ...::HashMap::<...> | +| gen_path_type_repr.rs:5:40:5:42 | i32 | +| gen_path_type_repr.rs:5:45:5:47 | i32 | +| gen_path_type_repr.rs:6:14:6:14 | X | +| gen_path_type_repr.rs:6:14:6:20 | ...::Item | getQualifier | gen_path.rs:5:9:5:31 | ...::some_module | gen_path.rs:5:9:5:18 | some_crate | | gen_path.rs:5:9:5:42 | ...::some_item | gen_path.rs:5:9:5:31 | ...::some_module | diff --git a/rust/ql/test/extractor-tests/generated/Path/Path.ql b/rust/ql/test/extractor-tests/generated/Path/Path.ql index 10440b7f626..183fcbb24a6 100644 --- a/rust/ql/test/extractor-tests/generated/Path/Path.ql +++ b/rust/ql/test/extractor-tests/generated/Path/Path.ql @@ -2,17 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - Path x, string hasQualifier__label, string hasQualifier, string hasSegment__label, - string hasSegment -) { - toBeTested(x) and - not x.isUnknown() and - hasQualifier__label = "hasQualifier:" and - (if x.hasQualifier() then hasQualifier = "yes" else hasQualifier = "no") and - hasSegment__label = "hasSegment:" and - if x.hasSegment() then hasSegment = "yes" else hasSegment = "no" -} +query predicate instances(Path x) { toBeTested(x) and not x.isUnknown() } query predicate getQualifier(Path x, Path getQualifier) { toBeTested(x) and not x.isUnknown() and getQualifier = x.getQualifier() diff --git a/rust/ql/test/extractor-tests/generated/Path/PathExpr.expected b/rust/ql/test/extractor-tests/generated/Path/PathExpr.expected index 5befb7ad87f..5a2df7ee29f 100644 --- a/rust/ql/test/extractor-tests/generated/Path/PathExpr.expected +++ b/rust/ql/test/extractor-tests/generated/Path/PathExpr.expected @@ -1,10 +1,10 @@ instances -| gen_path.rs:6:5:6:12 | ...::bar | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasPath: | yes | getNumberOfAttrs: | 0 | -| gen_path_expr.rs:5:13:5:20 | variable | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasPath: | yes | getNumberOfAttrs: | 0 | -| gen_path_expr.rs:6:13:6:20 | ...::bar | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasPath: | yes | getNumberOfAttrs: | 0 | -| gen_path_expr.rs:7:13:7:20 | ...::foo | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasPath: | yes | getNumberOfAttrs: | 0 | -| gen_path_expr.rs:8:13:8:36 | ...::foo | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasPath: | yes | getNumberOfAttrs: | 0 | -| gen_path_pat.rs:5:11:5:11 | x | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasPath: | yes | getNumberOfAttrs: | 0 | +| gen_path.rs:6:5:6:12 | ...::bar | +| gen_path_expr.rs:5:13:5:20 | variable | +| gen_path_expr.rs:6:13:6:20 | ...::bar | +| gen_path_expr.rs:7:13:7:20 | ...::foo | +| gen_path_expr.rs:8:13:8:36 | ...::foo | +| gen_path_pat.rs:5:11:5:11 | x | getResolvedPath getResolvedCrateOrigin getPath diff --git a/rust/ql/test/extractor-tests/generated/Path/PathExpr.ql b/rust/ql/test/extractor-tests/generated/Path/PathExpr.ql index df7d4e6b054..70bff600ace 100644 --- a/rust/ql/test/extractor-tests/generated/Path/PathExpr.ql +++ b/rust/ql/test/extractor-tests/generated/Path/PathExpr.ql @@ -2,26 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - PathExpr x, string hasResolvedPath__label, string hasResolvedPath, - string hasResolvedCrateOrigin__label, string hasResolvedCrateOrigin, string hasPath__label, - string hasPath, string getNumberOfAttrs__label, int getNumberOfAttrs -) { - toBeTested(x) and - not x.isUnknown() and - hasResolvedPath__label = "hasResolvedPath:" and - (if x.hasResolvedPath() then hasResolvedPath = "yes" else hasResolvedPath = "no") and - hasResolvedCrateOrigin__label = "hasResolvedCrateOrigin:" and - ( - if x.hasResolvedCrateOrigin() - then hasResolvedCrateOrigin = "yes" - else hasResolvedCrateOrigin = "no" - ) and - hasPath__label = "hasPath:" and - (if x.hasPath() then hasPath = "yes" else hasPath = "no") and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() -} +query predicate instances(PathExpr x) { toBeTested(x) and not x.isUnknown() } query predicate getResolvedPath(PathExpr x, string getResolvedPath) { toBeTested(x) and not x.isUnknown() and getResolvedPath = x.getResolvedPath() diff --git a/rust/ql/test/extractor-tests/generated/Path/PathPat.expected b/rust/ql/test/extractor-tests/generated/Path/PathPat.expected index 44b0c407ce7..9bcce903558 100644 --- a/rust/ql/test/extractor-tests/generated/Path/PathPat.expected +++ b/rust/ql/test/extractor-tests/generated/Path/PathPat.expected @@ -1,5 +1,5 @@ instances -| gen_path_pat.rs:6:9:6:16 | ...::Bar | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasPath: | yes | +| gen_path_pat.rs:6:9:6:16 | ...::Bar | getResolvedPath getResolvedCrateOrigin getPath diff --git a/rust/ql/test/extractor-tests/generated/Path/PathPat.ql b/rust/ql/test/extractor-tests/generated/Path/PathPat.ql index babe2238d2d..9c5a874cabf 100644 --- a/rust/ql/test/extractor-tests/generated/Path/PathPat.ql +++ b/rust/ql/test/extractor-tests/generated/Path/PathPat.ql @@ -2,24 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - PathPat x, string hasResolvedPath__label, string hasResolvedPath, - string hasResolvedCrateOrigin__label, string hasResolvedCrateOrigin, string hasPath__label, - string hasPath -) { - toBeTested(x) and - not x.isUnknown() and - hasResolvedPath__label = "hasResolvedPath:" and - (if x.hasResolvedPath() then hasResolvedPath = "yes" else hasResolvedPath = "no") and - hasResolvedCrateOrigin__label = "hasResolvedCrateOrigin:" and - ( - if x.hasResolvedCrateOrigin() - then hasResolvedCrateOrigin = "yes" - else hasResolvedCrateOrigin = "no" - ) and - hasPath__label = "hasPath:" and - if x.hasPath() then hasPath = "yes" else hasPath = "no" -} +query predicate instances(PathPat x) { toBeTested(x) and not x.isUnknown() } query predicate getResolvedPath(PathPat x, string getResolvedPath) { toBeTested(x) and not x.isUnknown() and getResolvedPath = x.getResolvedPath() diff --git a/rust/ql/test/extractor-tests/generated/Path/PathSegment.expected b/rust/ql/test/extractor-tests/generated/Path/PathSegment.expected index 28347072ffe..cf9e4501366 100644 --- a/rust/ql/test/extractor-tests/generated/Path/PathSegment.expected +++ b/rust/ql/test/extractor-tests/generated/Path/PathSegment.expected @@ -1,29 +1,29 @@ instances -| gen_path.rs:5:9:5:18 | some_crate | hasGenericArgList: | no | hasIdentifier: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no | -| gen_path.rs:5:21:5:31 | some_module | hasGenericArgList: | no | hasIdentifier: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no | -| gen_path.rs:5:34:5:42 | some_item | hasGenericArgList: | no | hasIdentifier: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no | -| gen_path.rs:6:5:6:7 | foo | hasGenericArgList: | no | hasIdentifier: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no | -| gen_path.rs:6:10:6:12 | bar | hasGenericArgList: | no | hasIdentifier: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no | -| gen_path_expr.rs:5:13:5:20 | variable | hasGenericArgList: | no | hasIdentifier: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no | -| gen_path_expr.rs:6:13:6:15 | foo | hasGenericArgList: | no | hasIdentifier: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no | -| gen_path_expr.rs:6:18:6:20 | bar | hasGenericArgList: | no | hasIdentifier: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no | -| gen_path_expr.rs:7:13:7:15 | <...> | hasGenericArgList: | no | hasIdentifier: | no | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | yes | hasTraitTypeRepr: | no | -| gen_path_expr.rs:7:14:7:14 | T | hasGenericArgList: | no | hasIdentifier: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no | -| gen_path_expr.rs:7:18:7:20 | foo | hasGenericArgList: | no | hasIdentifier: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no | -| gen_path_expr.rs:8:13:8:31 | <...> | hasGenericArgList: | no | hasIdentifier: | no | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | yes | hasTraitTypeRepr: | yes | -| gen_path_expr.rs:8:14:8:21 | TypeRepr | hasGenericArgList: | no | hasIdentifier: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no | -| gen_path_expr.rs:8:26:8:30 | Trait | hasGenericArgList: | no | hasIdentifier: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no | -| gen_path_expr.rs:8:34:8:36 | foo | hasGenericArgList: | no | hasIdentifier: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no | -| gen_path_pat.rs:5:11:5:11 | x | hasGenericArgList: | no | hasIdentifier: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no | -| gen_path_pat.rs:6:9:6:11 | Foo | hasGenericArgList: | no | hasIdentifier: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no | -| gen_path_pat.rs:6:14:6:16 | Bar | hasGenericArgList: | no | hasIdentifier: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no | -| gen_path_type_repr.rs:5:14:5:16 | std | hasGenericArgList: | no | hasIdentifier: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no | -| gen_path_type_repr.rs:5:19:5:29 | collections | hasGenericArgList: | no | hasIdentifier: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no | -| gen_path_type_repr.rs:5:32:5:48 | HashMap::<...> | hasGenericArgList: | yes | hasIdentifier: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no | -| gen_path_type_repr.rs:5:40:5:42 | i32 | hasGenericArgList: | no | hasIdentifier: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no | -| gen_path_type_repr.rs:5:45:5:47 | i32 | hasGenericArgList: | no | hasIdentifier: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no | -| gen_path_type_repr.rs:6:14:6:14 | X | hasGenericArgList: | no | hasIdentifier: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no | -| gen_path_type_repr.rs:6:17:6:20 | Item | hasGenericArgList: | no | hasIdentifier: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no | +| gen_path.rs:5:9:5:18 | some_crate | +| gen_path.rs:5:21:5:31 | some_module | +| gen_path.rs:5:34:5:42 | some_item | +| gen_path.rs:6:5:6:7 | foo | +| gen_path.rs:6:10:6:12 | bar | +| gen_path_expr.rs:5:13:5:20 | variable | +| gen_path_expr.rs:6:13:6:15 | foo | +| gen_path_expr.rs:6:18:6:20 | bar | +| gen_path_expr.rs:7:13:7:15 | <...> | +| gen_path_expr.rs:7:14:7:14 | T | +| gen_path_expr.rs:7:18:7:20 | foo | +| gen_path_expr.rs:8:13:8:31 | <...> | +| gen_path_expr.rs:8:14:8:21 | TypeRepr | +| gen_path_expr.rs:8:26:8:30 | Trait | +| gen_path_expr.rs:8:34:8:36 | foo | +| gen_path_pat.rs:5:11:5:11 | x | +| gen_path_pat.rs:6:9:6:11 | Foo | +| gen_path_pat.rs:6:14:6:16 | Bar | +| gen_path_type_repr.rs:5:14:5:16 | std | +| gen_path_type_repr.rs:5:19:5:29 | collections | +| gen_path_type_repr.rs:5:32:5:48 | HashMap::<...> | +| gen_path_type_repr.rs:5:40:5:42 | i32 | +| gen_path_type_repr.rs:5:45:5:47 | i32 | +| gen_path_type_repr.rs:6:14:6:14 | X | +| gen_path_type_repr.rs:6:17:6:20 | Item | getGenericArgList | gen_path_type_repr.rs:5:32:5:48 | HashMap::<...> | gen_path_type_repr.rs:5:39:5:48 | <...> | getIdentifier diff --git a/rust/ql/test/extractor-tests/generated/Path/PathSegment.ql b/rust/ql/test/extractor-tests/generated/Path/PathSegment.ql index bdaf115d135..2e0800706f0 100644 --- a/rust/ql/test/extractor-tests/generated/Path/PathSegment.ql +++ b/rust/ql/test/extractor-tests/generated/Path/PathSegment.ql @@ -2,34 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - PathSegment x, string hasGenericArgList__label, string hasGenericArgList, - string hasIdentifier__label, string hasIdentifier, string hasParenthesizedArgList__label, - string hasParenthesizedArgList, string hasRetType__label, string hasRetType, - string hasReturnTypeSyntax__label, string hasReturnTypeSyntax, string hasTypeRepr__label, - string hasTypeRepr, string hasTraitTypeRepr__label, string hasTraitTypeRepr -) { - toBeTested(x) and - not x.isUnknown() and - hasGenericArgList__label = "hasGenericArgList:" and - (if x.hasGenericArgList() then hasGenericArgList = "yes" else hasGenericArgList = "no") and - hasIdentifier__label = "hasIdentifier:" and - (if x.hasIdentifier() then hasIdentifier = "yes" else hasIdentifier = "no") and - hasParenthesizedArgList__label = "hasParenthesizedArgList:" and - ( - if x.hasParenthesizedArgList() - then hasParenthesizedArgList = "yes" - else hasParenthesizedArgList = "no" - ) and - hasRetType__label = "hasRetType:" and - (if x.hasRetType() then hasRetType = "yes" else hasRetType = "no") and - hasReturnTypeSyntax__label = "hasReturnTypeSyntax:" and - (if x.hasReturnTypeSyntax() then hasReturnTypeSyntax = "yes" else hasReturnTypeSyntax = "no") and - hasTypeRepr__label = "hasTypeRepr:" and - (if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no") and - hasTraitTypeRepr__label = "hasTraitTypeRepr:" and - if x.hasTraitTypeRepr() then hasTraitTypeRepr = "yes" else hasTraitTypeRepr = "no" -} +query predicate instances(PathSegment x) { toBeTested(x) and not x.isUnknown() } query predicate getGenericArgList(PathSegment x, GenericArgList getGenericArgList) { toBeTested(x) and not x.isUnknown() and getGenericArgList = x.getGenericArgList() diff --git a/rust/ql/test/extractor-tests/generated/Path/PathTypeRepr.expected b/rust/ql/test/extractor-tests/generated/Path/PathTypeRepr.expected index 1877b675dcd..841a1e6eb77 100644 --- a/rust/ql/test/extractor-tests/generated/Path/PathTypeRepr.expected +++ b/rust/ql/test/extractor-tests/generated/Path/PathTypeRepr.expected @@ -1,11 +1,11 @@ instances -| gen_path_expr.rs:7:14:7:14 | T | hasPath: | yes | -| gen_path_expr.rs:8:14:8:21 | TypeRepr | hasPath: | yes | -| gen_path_expr.rs:8:26:8:30 | Trait | hasPath: | yes | -| gen_path_type_repr.rs:5:14:5:48 | ...::HashMap::<...> | hasPath: | yes | -| gen_path_type_repr.rs:5:40:5:42 | i32 | hasPath: | yes | -| gen_path_type_repr.rs:5:45:5:47 | i32 | hasPath: | yes | -| gen_path_type_repr.rs:6:14:6:20 | ...::Item | hasPath: | yes | +| gen_path_expr.rs:7:14:7:14 | T | +| gen_path_expr.rs:8:14:8:21 | TypeRepr | +| gen_path_expr.rs:8:26:8:30 | Trait | +| gen_path_type_repr.rs:5:14:5:48 | ...::HashMap::<...> | +| gen_path_type_repr.rs:5:40:5:42 | i32 | +| gen_path_type_repr.rs:5:45:5:47 | i32 | +| gen_path_type_repr.rs:6:14:6:20 | ...::Item | getPath | gen_path_expr.rs:7:14:7:14 | T | gen_path_expr.rs:7:14:7:14 | T | | gen_path_expr.rs:8:14:8:21 | TypeRepr | gen_path_expr.rs:8:14:8:21 | TypeRepr | diff --git a/rust/ql/test/extractor-tests/generated/Path/PathTypeRepr.ql b/rust/ql/test/extractor-tests/generated/Path/PathTypeRepr.ql index cb641af4078..5ec18fd220a 100644 --- a/rust/ql/test/extractor-tests/generated/Path/PathTypeRepr.ql +++ b/rust/ql/test/extractor-tests/generated/Path/PathTypeRepr.ql @@ -2,12 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances(PathTypeRepr x, string hasPath__label, string hasPath) { - toBeTested(x) and - not x.isUnknown() and - hasPath__label = "hasPath:" and - if x.hasPath() then hasPath = "yes" else hasPath = "no" -} +query predicate instances(PathTypeRepr x) { toBeTested(x) and not x.isUnknown() } query predicate getPath(PathTypeRepr x, Path getPath) { toBeTested(x) and not x.isUnknown() and getPath = x.getPath() diff --git a/rust/ql/test/extractor-tests/generated/PrefixExpr/PrefixExpr.expected b/rust/ql/test/extractor-tests/generated/PrefixExpr/PrefixExpr.expected index 9a7bf83a06e..056a1a6dd5d 100644 --- a/rust/ql/test/extractor-tests/generated/PrefixExpr/PrefixExpr.expected +++ b/rust/ql/test/extractor-tests/generated/PrefixExpr/PrefixExpr.expected @@ -1,7 +1,7 @@ instances -| gen_prefix_expr.rs:5:13:5:15 | - ... | getNumberOfAttrs: | 0 | hasExpr: | yes | hasOperatorName: | yes | -| gen_prefix_expr.rs:6:13:6:17 | ! ... | getNumberOfAttrs: | 0 | hasExpr: | yes | hasOperatorName: | yes | -| gen_prefix_expr.rs:7:13:7:16 | * ... | getNumberOfAttrs: | 0 | hasExpr: | yes | hasOperatorName: | yes | +| gen_prefix_expr.rs:5:13:5:15 | - ... | +| gen_prefix_expr.rs:6:13:6:17 | ! ... | +| gen_prefix_expr.rs:7:13:7:16 | * ... | getAttr getExpr | gen_prefix_expr.rs:5:13:5:15 | - ... | gen_prefix_expr.rs:5:14:5:15 | 42 | diff --git a/rust/ql/test/extractor-tests/generated/PrefixExpr/PrefixExpr.ql b/rust/ql/test/extractor-tests/generated/PrefixExpr/PrefixExpr.ql index b263291ff6e..0765d6e07d9 100644 --- a/rust/ql/test/extractor-tests/generated/PrefixExpr/PrefixExpr.ql +++ b/rust/ql/test/extractor-tests/generated/PrefixExpr/PrefixExpr.ql @@ -2,19 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - PrefixExpr x, string getNumberOfAttrs__label, int getNumberOfAttrs, string hasExpr__label, - string hasExpr, string hasOperatorName__label, string hasOperatorName -) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasExpr__label = "hasExpr:" and - (if x.hasExpr() then hasExpr = "yes" else hasExpr = "no") and - hasOperatorName__label = "hasOperatorName:" and - if x.hasOperatorName() then hasOperatorName = "yes" else hasOperatorName = "no" -} +query predicate instances(PrefixExpr x) { toBeTested(x) and not x.isUnknown() } query predicate getAttr(PrefixExpr x, int index, Attr getAttr) { toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index) diff --git a/rust/ql/test/extractor-tests/generated/PtrTypeRepr/PtrTypeRepr.expected b/rust/ql/test/extractor-tests/generated/PtrTypeRepr/PtrTypeRepr.expected index f66639667e1..6414c8ce04a 100644 --- a/rust/ql/test/extractor-tests/generated/PtrTypeRepr/PtrTypeRepr.expected +++ b/rust/ql/test/extractor-tests/generated/PtrTypeRepr/PtrTypeRepr.expected @@ -1,6 +1,6 @@ instances -| gen_ptr_type_repr.rs:7:12:7:21 | PtrTypeRepr | isConst: | yes | isMut: | no | hasTypeRepr: | yes | -| gen_ptr_type_repr.rs:8:12:8:19 | PtrTypeRepr | isConst: | no | isMut: | yes | hasTypeRepr: | yes | +| gen_ptr_type_repr.rs:7:12:7:21 | PtrTypeRepr | isConst: | yes | isMut: | no | +| gen_ptr_type_repr.rs:8:12:8:19 | PtrTypeRepr | isConst: | no | isMut: | yes | getTypeRepr | gen_ptr_type_repr.rs:7:12:7:21 | PtrTypeRepr | gen_ptr_type_repr.rs:7:19:7:21 | i32 | | gen_ptr_type_repr.rs:8:12:8:19 | PtrTypeRepr | gen_ptr_type_repr.rs:8:17:8:19 | i32 | diff --git a/rust/ql/test/extractor-tests/generated/PtrTypeRepr/PtrTypeRepr.ql b/rust/ql/test/extractor-tests/generated/PtrTypeRepr/PtrTypeRepr.ql index 6220e06fc0d..d2a41eb9e59 100644 --- a/rust/ql/test/extractor-tests/generated/PtrTypeRepr/PtrTypeRepr.ql +++ b/rust/ql/test/extractor-tests/generated/PtrTypeRepr/PtrTypeRepr.ql @@ -3,17 +3,14 @@ import codeql.rust.elements import TestUtils query predicate instances( - PtrTypeRepr x, string isConst__label, string isConst, string isMut__label, string isMut, - string hasTypeRepr__label, string hasTypeRepr + PtrTypeRepr x, string isConst__label, string isConst, string isMut__label, string isMut ) { toBeTested(x) and not x.isUnknown() and isConst__label = "isConst:" and (if x.isConst() then isConst = "yes" else isConst = "no") and isMut__label = "isMut:" and - (if x.isMut() then isMut = "yes" else isMut = "no") and - hasTypeRepr__label = "hasTypeRepr:" and - if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no" + if x.isMut() then isMut = "yes" else isMut = "no" } query predicate getTypeRepr(PtrTypeRepr x, TypeRepr getTypeRepr) { diff --git a/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr.expected b/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr.expected index 25ce7a4fe32..a79ce67401a 100644 --- a/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr.expected +++ b/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr.expected @@ -1,10 +1,10 @@ instances -| gen_range_expr.rs:5:13:5:18 | 1..=10 | getNumberOfAttrs: | 0 | hasEnd: | yes | hasOperatorName: | yes | hasStart: | yes | -| gen_range_expr.rs:6:13:6:17 | 1..10 | getNumberOfAttrs: | 0 | hasEnd: | yes | hasOperatorName: | yes | hasStart: | yes | -| gen_range_expr.rs:7:13:7:16 | 10.. | getNumberOfAttrs: | 0 | hasEnd: | no | hasOperatorName: | yes | hasStart: | yes | -| gen_range_expr.rs:8:13:8:16 | ..10 | getNumberOfAttrs: | 0 | hasEnd: | yes | hasOperatorName: | yes | hasStart: | no | -| gen_range_expr.rs:9:13:9:17 | ..=10 | getNumberOfAttrs: | 0 | hasEnd: | yes | hasOperatorName: | yes | hasStart: | no | -| gen_range_expr.rs:10:13:10:14 | .. | getNumberOfAttrs: | 0 | hasEnd: | no | hasOperatorName: | yes | hasStart: | no | +| gen_range_expr.rs:5:13:5:18 | 1..=10 | +| gen_range_expr.rs:6:13:6:17 | 1..10 | +| gen_range_expr.rs:7:13:7:16 | 10.. | +| gen_range_expr.rs:8:13:8:16 | ..10 | +| gen_range_expr.rs:9:13:9:17 | ..=10 | +| gen_range_expr.rs:10:13:10:14 | .. | getAttr getEnd | gen_range_expr.rs:5:13:5:18 | 1..=10 | gen_range_expr.rs:5:17:5:18 | 10 | diff --git a/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr.ql b/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr.ql index cd6baaf169d..69a699f14be 100644 --- a/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr.ql +++ b/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr.ql @@ -2,22 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - RangeExpr x, string getNumberOfAttrs__label, int getNumberOfAttrs, string hasEnd__label, - string hasEnd, string hasOperatorName__label, string hasOperatorName, string hasStart__label, - string hasStart -) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasEnd__label = "hasEnd:" and - (if x.hasEnd() then hasEnd = "yes" else hasEnd = "no") and - hasOperatorName__label = "hasOperatorName:" and - (if x.hasOperatorName() then hasOperatorName = "yes" else hasOperatorName = "no") and - hasStart__label = "hasStart:" and - if x.hasStart() then hasStart = "yes" else hasStart = "no" -} +query predicate instances(RangeExpr x) { toBeTested(x) and not x.isUnknown() } query predicate getAttr(RangeExpr x, int index, Attr getAttr) { toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index) diff --git a/rust/ql/test/extractor-tests/generated/RangePat/RangePat.expected b/rust/ql/test/extractor-tests/generated/RangePat/RangePat.expected index 6cbb8331bfe..969ccf754df 100644 --- a/rust/ql/test/extractor-tests/generated/RangePat/RangePat.expected +++ b/rust/ql/test/extractor-tests/generated/RangePat/RangePat.expected @@ -1,7 +1,7 @@ instances -| gen_range_pat.rs:6:9:6:12 | RangePat | hasEnd: | yes | hasOperatorName: | yes | hasStart: | no | -| gen_range_pat.rs:7:9:7:15 | RangePat | hasEnd: | yes | hasOperatorName: | yes | hasStart: | yes | -| gen_range_pat.rs:8:9:8:12 | RangePat | hasEnd: | no | hasOperatorName: | yes | hasStart: | yes | +| gen_range_pat.rs:6:9:6:12 | RangePat | +| gen_range_pat.rs:7:9:7:15 | RangePat | +| gen_range_pat.rs:8:9:8:12 | RangePat | getEnd | gen_range_pat.rs:6:9:6:12 | RangePat | gen_range_pat.rs:6:11:6:12 | 15 | | gen_range_pat.rs:7:9:7:15 | RangePat | gen_range_pat.rs:7:14:7:15 | 25 | diff --git a/rust/ql/test/extractor-tests/generated/RangePat/RangePat.ql b/rust/ql/test/extractor-tests/generated/RangePat/RangePat.ql index feb5488d4ab..19070c77f26 100644 --- a/rust/ql/test/extractor-tests/generated/RangePat/RangePat.ql +++ b/rust/ql/test/extractor-tests/generated/RangePat/RangePat.ql @@ -2,19 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - RangePat x, string hasEnd__label, string hasEnd, string hasOperatorName__label, - string hasOperatorName, string hasStart__label, string hasStart -) { - toBeTested(x) and - not x.isUnknown() and - hasEnd__label = "hasEnd:" and - (if x.hasEnd() then hasEnd = "yes" else hasEnd = "no") and - hasOperatorName__label = "hasOperatorName:" and - (if x.hasOperatorName() then hasOperatorName = "yes" else hasOperatorName = "no") and - hasStart__label = "hasStart:" and - if x.hasStart() then hasStart = "yes" else hasStart = "no" -} +query predicate instances(RangePat x) { toBeTested(x) and not x.isUnknown() } query predicate getEnd(RangePat x, Pat getEnd) { toBeTested(x) and not x.isUnknown() and getEnd = x.getEnd() diff --git a/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr.expected b/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr.expected index 31d723fb1f4..031daf88888 100644 --- a/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr.expected +++ b/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr.expected @@ -1,8 +1,8 @@ instances -| gen_ref_expr.rs:5:25:5:28 | &foo | getNumberOfAttrs: | 0 | hasExpr: | yes | isConst: | no | isMut: | no | isRaw: | no | -| gen_ref_expr.rs:6:23:6:30 | &mut foo | getNumberOfAttrs: | 0 | hasExpr: | yes | isConst: | no | isMut: | yes | isRaw: | no | -| gen_ref_expr.rs:7:35:7:48 | &raw const foo | getNumberOfAttrs: | 0 | hasExpr: | yes | isConst: | yes | isMut: | no | isRaw: | yes | -| gen_ref_expr.rs:8:33:8:44 | &raw mut foo | getNumberOfAttrs: | 0 | hasExpr: | yes | isConst: | no | isMut: | yes | isRaw: | yes | +| gen_ref_expr.rs:5:25:5:28 | &foo | isConst: | no | isMut: | no | isRaw: | no | +| gen_ref_expr.rs:6:23:6:30 | &mut foo | isConst: | no | isMut: | yes | isRaw: | no | +| gen_ref_expr.rs:7:35:7:48 | &raw const foo | isConst: | yes | isMut: | no | isRaw: | yes | +| gen_ref_expr.rs:8:33:8:44 | &raw mut foo | isConst: | no | isMut: | yes | isRaw: | yes | getAttr getExpr | gen_ref_expr.rs:5:25:5:28 | &foo | gen_ref_expr.rs:5:26:5:28 | foo | diff --git a/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr.ql b/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr.ql index 5d7b325e202..a9ae1f9ae8d 100644 --- a/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr.ql +++ b/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr.ql @@ -3,16 +3,11 @@ import codeql.rust.elements import TestUtils query predicate instances( - RefExpr x, string getNumberOfAttrs__label, int getNumberOfAttrs, string hasExpr__label, - string hasExpr, string isConst__label, string isConst, string isMut__label, string isMut, + RefExpr x, string isConst__label, string isConst, string isMut__label, string isMut, string isRaw__label, string isRaw ) { toBeTested(x) and not x.isUnknown() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasExpr__label = "hasExpr:" and - (if x.hasExpr() then hasExpr = "yes" else hasExpr = "no") and isConst__label = "isConst:" and (if x.isConst() then isConst = "yes" else isConst = "no") and isMut__label = "isMut:" and diff --git a/rust/ql/test/extractor-tests/generated/RefPat/RefPat.expected b/rust/ql/test/extractor-tests/generated/RefPat/RefPat.expected index 3bbcbc2fed7..0babab322d3 100644 --- a/rust/ql/test/extractor-tests/generated/RefPat/RefPat.expected +++ b/rust/ql/test/extractor-tests/generated/RefPat/RefPat.expected @@ -1,6 +1,6 @@ instances -| gen_ref_pat.rs:6:9:6:28 | &mut ... | isMut: | yes | hasPat: | yes | -| gen_ref_pat.rs:7:9:7:21 | &...::None | isMut: | no | hasPat: | yes | +| gen_ref_pat.rs:6:9:6:28 | &mut ... | isMut: | yes | +| gen_ref_pat.rs:7:9:7:21 | &...::None | isMut: | no | getPat | gen_ref_pat.rs:6:9:6:28 | &mut ... | gen_ref_pat.rs:6:14:6:28 | ...::Some(...) | | gen_ref_pat.rs:7:9:7:21 | &...::None | gen_ref_pat.rs:7:10:7:21 | ...::None | diff --git a/rust/ql/test/extractor-tests/generated/RefPat/RefPat.ql b/rust/ql/test/extractor-tests/generated/RefPat/RefPat.ql index c6b6afa5854..3e8ec464569 100644 --- a/rust/ql/test/extractor-tests/generated/RefPat/RefPat.ql +++ b/rust/ql/test/extractor-tests/generated/RefPat/RefPat.ql @@ -2,15 +2,11 @@ import codeql.rust.elements import TestUtils -query predicate instances( - RefPat x, string isMut__label, string isMut, string hasPat__label, string hasPat -) { +query predicate instances(RefPat x, string isMut__label, string isMut) { toBeTested(x) and not x.isUnknown() and isMut__label = "isMut:" and - (if x.isMut() then isMut = "yes" else isMut = "no") and - hasPat__label = "hasPat:" and - if x.hasPat() then hasPat = "yes" else hasPat = "no" + if x.isMut() then isMut = "yes" else isMut = "no" } query predicate getPat(RefPat x, Pat getPat) { diff --git a/rust/ql/test/extractor-tests/generated/RefTypeRepr/RefTypeRepr.expected b/rust/ql/test/extractor-tests/generated/RefTypeRepr/RefTypeRepr.expected index 30f641c5dc7..d48b8b7b998 100644 --- a/rust/ql/test/extractor-tests/generated/RefTypeRepr/RefTypeRepr.expected +++ b/rust/ql/test/extractor-tests/generated/RefTypeRepr/RefTypeRepr.expected @@ -1,6 +1,6 @@ instances -| gen_ref_type_repr.rs:7:12:7:15 | RefTypeRepr | isMut: | no | hasLifetime: | no | hasTypeRepr: | yes | -| gen_ref_type_repr.rs:8:12:8:19 | RefTypeRepr | isMut: | yes | hasLifetime: | no | hasTypeRepr: | yes | +| gen_ref_type_repr.rs:7:12:7:15 | RefTypeRepr | isMut: | no | +| gen_ref_type_repr.rs:8:12:8:19 | RefTypeRepr | isMut: | yes | getLifetime getTypeRepr | gen_ref_type_repr.rs:7:12:7:15 | RefTypeRepr | gen_ref_type_repr.rs:7:13:7:15 | i32 | diff --git a/rust/ql/test/extractor-tests/generated/RefTypeRepr/RefTypeRepr.ql b/rust/ql/test/extractor-tests/generated/RefTypeRepr/RefTypeRepr.ql index 61918497373..a414e9a3e66 100644 --- a/rust/ql/test/extractor-tests/generated/RefTypeRepr/RefTypeRepr.ql +++ b/rust/ql/test/extractor-tests/generated/RefTypeRepr/RefTypeRepr.ql @@ -2,18 +2,11 @@ import codeql.rust.elements import TestUtils -query predicate instances( - RefTypeRepr x, string isMut__label, string isMut, string hasLifetime__label, string hasLifetime, - string hasTypeRepr__label, string hasTypeRepr -) { +query predicate instances(RefTypeRepr x, string isMut__label, string isMut) { toBeTested(x) and not x.isUnknown() and isMut__label = "isMut:" and - (if x.isMut() then isMut = "yes" else isMut = "no") and - hasLifetime__label = "hasLifetime:" and - (if x.hasLifetime() then hasLifetime = "yes" else hasLifetime = "no") and - hasTypeRepr__label = "hasTypeRepr:" and - if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no" + if x.isMut() then isMut = "yes" else isMut = "no" } query predicate getLifetime(RefTypeRepr x, Lifetime getLifetime) { diff --git a/rust/ql/test/extractor-tests/generated/Rename/Rename.expected b/rust/ql/test/extractor-tests/generated/Rename/Rename.expected index a4131b35c0e..73137c57c98 100644 --- a/rust/ql/test/extractor-tests/generated/Rename/Rename.expected +++ b/rust/ql/test/extractor-tests/generated/Rename/Rename.expected @@ -1,4 +1,4 @@ instances -| gen_rename.rs:7:13:7:18 | Rename | hasName: | yes | +| gen_rename.rs:7:13:7:18 | Rename | getName | gen_rename.rs:7:13:7:18 | Rename | gen_rename.rs:7:16:7:18 | bar | diff --git a/rust/ql/test/extractor-tests/generated/Rename/Rename.ql b/rust/ql/test/extractor-tests/generated/Rename/Rename.ql index 5875619c2ab..170b5e8bd7b 100644 --- a/rust/ql/test/extractor-tests/generated/Rename/Rename.ql +++ b/rust/ql/test/extractor-tests/generated/Rename/Rename.ql @@ -2,12 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances(Rename x, string hasName__label, string hasName) { - toBeTested(x) and - not x.isUnknown() and - hasName__label = "hasName:" and - if x.hasName() then hasName = "yes" else hasName = "no" -} +query predicate instances(Rename x) { toBeTested(x) and not x.isUnknown() } query predicate getName(Rename x, Name getName) { toBeTested(x) and not x.isUnknown() and getName = x.getName() diff --git a/rust/ql/test/extractor-tests/generated/RestPat/RestPat.expected b/rust/ql/test/extractor-tests/generated/RestPat/RestPat.expected index 8dfb600e638..6fd34b7cf23 100644 --- a/rust/ql/test/extractor-tests/generated/RestPat/RestPat.expected +++ b/rust/ql/test/extractor-tests/generated/RestPat/RestPat.expected @@ -1,3 +1,3 @@ instances -| gen_rest_pat.rs:7:13:7:14 | .. | getNumberOfAttrs: | 0 | +| gen_rest_pat.rs:7:13:7:14 | .. | getAttr diff --git a/rust/ql/test/extractor-tests/generated/RestPat/RestPat.ql b/rust/ql/test/extractor-tests/generated/RestPat/RestPat.ql index dbf8f55b0ed..3754d7fd2f2 100644 --- a/rust/ql/test/extractor-tests/generated/RestPat/RestPat.ql +++ b/rust/ql/test/extractor-tests/generated/RestPat/RestPat.ql @@ -2,12 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances(RestPat x, string getNumberOfAttrs__label, int getNumberOfAttrs) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() -} +query predicate instances(RestPat x) { toBeTested(x) and not x.isUnknown() } query predicate getAttr(RestPat x, int index, Attr getAttr) { toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index) diff --git a/rust/ql/test/extractor-tests/generated/RetTypeRepr/RetTypeRepr.expected b/rust/ql/test/extractor-tests/generated/RetTypeRepr/RetTypeRepr.expected index 0729c6815bb..5b661298194 100644 --- a/rust/ql/test/extractor-tests/generated/RetTypeRepr/RetTypeRepr.expected +++ b/rust/ql/test/extractor-tests/generated/RetTypeRepr/RetTypeRepr.expected @@ -1,6 +1,6 @@ instances -| gen_ret_type_repr.rs:3:25:3:29 | RetTypeRepr | hasTypeRepr: | yes | -| gen_ret_type_repr.rs:7:14:7:19 | RetTypeRepr | hasTypeRepr: | yes | +| gen_ret_type_repr.rs:3:25:3:29 | RetTypeRepr | +| gen_ret_type_repr.rs:7:14:7:19 | RetTypeRepr | getTypeRepr | gen_ret_type_repr.rs:3:25:3:29 | RetTypeRepr | gen_ret_type_repr.rs:3:28:3:29 | TupleTypeRepr | | gen_ret_type_repr.rs:7:14:7:19 | RetTypeRepr | gen_ret_type_repr.rs:7:17:7:19 | i32 | diff --git a/rust/ql/test/extractor-tests/generated/RetTypeRepr/RetTypeRepr.ql b/rust/ql/test/extractor-tests/generated/RetTypeRepr/RetTypeRepr.ql index c892ab67a45..b92b05897e8 100644 --- a/rust/ql/test/extractor-tests/generated/RetTypeRepr/RetTypeRepr.ql +++ b/rust/ql/test/extractor-tests/generated/RetTypeRepr/RetTypeRepr.ql @@ -2,12 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances(RetTypeRepr x, string hasTypeRepr__label, string hasTypeRepr) { - toBeTested(x) and - not x.isUnknown() and - hasTypeRepr__label = "hasTypeRepr:" and - if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no" -} +query predicate instances(RetTypeRepr x) { toBeTested(x) and not x.isUnknown() } query predicate getTypeRepr(RetTypeRepr x, TypeRepr getTypeRepr) { toBeTested(x) and not x.isUnknown() and getTypeRepr = x.getTypeRepr() diff --git a/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr.expected b/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr.expected index 7a36d488d40..e978eca2e7c 100644 --- a/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr.expected +++ b/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr.expected @@ -1,6 +1,6 @@ instances -| gen_return_expr.rs:5:5:5:13 | return 42 | getNumberOfAttrs: | 0 | hasExpr: | yes | -| gen_return_expr.rs:8:5:8:10 | return | getNumberOfAttrs: | 0 | hasExpr: | no | +| gen_return_expr.rs:5:5:5:13 | return 42 | +| gen_return_expr.rs:8:5:8:10 | return | getAttr getExpr | gen_return_expr.rs:5:5:5:13 | return 42 | gen_return_expr.rs:5:12:5:13 | 42 | diff --git a/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr.ql b/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr.ql index b15b1483d67..11eeed2222c 100644 --- a/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr.ql +++ b/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr.ql @@ -2,17 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - ReturnExpr x, string getNumberOfAttrs__label, int getNumberOfAttrs, string hasExpr__label, - string hasExpr -) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasExpr__label = "hasExpr:" and - if x.hasExpr() then hasExpr = "yes" else hasExpr = "no" -} +query predicate instances(ReturnExpr x) { toBeTested(x) and not x.isUnknown() } query predicate getAttr(ReturnExpr x, int index, Attr getAttr) { toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index) diff --git a/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam.expected b/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam.expected index 373ea50f5ec..faa10f8e912 100644 --- a/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam.expected +++ b/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam.expected @@ -1,9 +1,9 @@ instances -| gen_self_param.rs:6:10:6:14 | SelfParam | getNumberOfAttrs: | 0 | hasTypeRepr: | no | isRef: | yes | isMut: | no | hasLifetime: | no | hasName: | yes | -| gen_self_param.rs:7:10:7:18 | SelfParam | getNumberOfAttrs: | 0 | hasTypeRepr: | no | isRef: | yes | isMut: | yes | hasLifetime: | no | hasName: | yes | -| gen_self_param.rs:8:12:8:15 | SelfParam | getNumberOfAttrs: | 0 | hasTypeRepr: | no | isRef: | no | isMut: | no | hasLifetime: | no | hasName: | yes | -| gen_self_param.rs:9:11:9:18 | SelfParam | getNumberOfAttrs: | 0 | hasTypeRepr: | no | isRef: | no | isMut: | yes | hasLifetime: | no | hasName: | yes | -| gen_self_param.rs:10:15:10:22 | SelfParam | getNumberOfAttrs: | 0 | hasTypeRepr: | no | isRef: | yes | isMut: | no | hasLifetime: | yes | hasName: | yes | +| gen_self_param.rs:6:10:6:14 | SelfParam | isRef: | yes | isMut: | no | +| gen_self_param.rs:7:10:7:18 | SelfParam | isRef: | yes | isMut: | yes | +| gen_self_param.rs:8:12:8:15 | SelfParam | isRef: | no | isMut: | no | +| gen_self_param.rs:9:11:9:18 | SelfParam | isRef: | no | isMut: | yes | +| gen_self_param.rs:10:15:10:22 | SelfParam | isRef: | yes | isMut: | no | getAttr getTypeRepr getLifetime diff --git a/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam.ql b/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam.ql index e785b0b8ba8..07dd03a406f 100644 --- a/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam.ql +++ b/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam.ql @@ -3,24 +3,14 @@ import codeql.rust.elements import TestUtils query predicate instances( - SelfParam x, string getNumberOfAttrs__label, int getNumberOfAttrs, string hasTypeRepr__label, - string hasTypeRepr, string isRef__label, string isRef, string isMut__label, string isMut, - string hasLifetime__label, string hasLifetime, string hasName__label, string hasName + SelfParam x, string isRef__label, string isRef, string isMut__label, string isMut ) { toBeTested(x) and not x.isUnknown() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasTypeRepr__label = "hasTypeRepr:" and - (if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no") and isRef__label = "isRef:" and (if x.isRef() then isRef = "yes" else isRef = "no") and isMut__label = "isMut:" and - (if x.isMut() then isMut = "yes" else isMut = "no") and - hasLifetime__label = "hasLifetime:" and - (if x.hasLifetime() then hasLifetime = "yes" else hasLifetime = "no") and - hasName__label = "hasName:" and - if x.hasName() then hasName = "yes" else hasName = "no" + if x.isMut() then isMut = "yes" else isMut = "no" } query predicate getAttr(SelfParam x, int index, Attr getAttr) { diff --git a/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat.expected b/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat.expected index dbdb09c2693..0594cf27e55 100644 --- a/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat.expected +++ b/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat.expected @@ -1,7 +1,7 @@ instances -| gen_slice_pat.rs:6:9:6:23 | SlicePat | getNumberOfPats: | 5 | -| gen_slice_pat.rs:7:9:7:18 | SlicePat | getNumberOfPats: | 3 | -| gen_slice_pat.rs:8:9:8:24 | SlicePat | getNumberOfPats: | 5 | +| gen_slice_pat.rs:6:9:6:23 | SlicePat | +| gen_slice_pat.rs:7:9:7:18 | SlicePat | +| gen_slice_pat.rs:8:9:8:24 | SlicePat | getPat | gen_slice_pat.rs:6:9:6:23 | SlicePat | 0 | gen_slice_pat.rs:6:10:6:10 | 1 | | gen_slice_pat.rs:6:9:6:23 | SlicePat | 1 | gen_slice_pat.rs:6:13:6:13 | 2 | diff --git a/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat.ql b/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat.ql index 0013b1df2b4..b4b0e943036 100644 --- a/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat.ql +++ b/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat.ql @@ -2,12 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances(SlicePat x, string getNumberOfPats__label, int getNumberOfPats) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfPats__label = "getNumberOfPats:" and - getNumberOfPats = x.getNumberOfPats() -} +query predicate instances(SlicePat x) { toBeTested(x) and not x.isUnknown() } query predicate getPat(SlicePat x, int index, Pat getPat) { toBeTested(x) and not x.isUnknown() and getPat = x.getPat(index) diff --git a/rust/ql/test/extractor-tests/generated/SliceTypeRepr/SliceTypeRepr.expected b/rust/ql/test/extractor-tests/generated/SliceTypeRepr/SliceTypeRepr.expected index b87a8caad8c..20b1883e4d3 100644 --- a/rust/ql/test/extractor-tests/generated/SliceTypeRepr/SliceTypeRepr.expected +++ b/rust/ql/test/extractor-tests/generated/SliceTypeRepr/SliceTypeRepr.expected @@ -1,4 +1,4 @@ instances -| gen_slice_type_repr.rs:7:13:7:17 | SliceTypeRepr | hasTypeRepr: | yes | +| gen_slice_type_repr.rs:7:13:7:17 | SliceTypeRepr | getTypeRepr | gen_slice_type_repr.rs:7:13:7:17 | SliceTypeRepr | gen_slice_type_repr.rs:7:14:7:16 | i32 | diff --git a/rust/ql/test/extractor-tests/generated/SliceTypeRepr/SliceTypeRepr.ql b/rust/ql/test/extractor-tests/generated/SliceTypeRepr/SliceTypeRepr.ql index d43ab3185f9..b32b4edf6d3 100644 --- a/rust/ql/test/extractor-tests/generated/SliceTypeRepr/SliceTypeRepr.ql +++ b/rust/ql/test/extractor-tests/generated/SliceTypeRepr/SliceTypeRepr.ql @@ -2,12 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances(SliceTypeRepr x, string hasTypeRepr__label, string hasTypeRepr) { - toBeTested(x) and - not x.isUnknown() and - hasTypeRepr__label = "hasTypeRepr:" and - if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no" -} +query predicate instances(SliceTypeRepr x) { toBeTested(x) and not x.isUnknown() } query predicate getTypeRepr(SliceTypeRepr x, TypeRepr getTypeRepr) { toBeTested(x) and not x.isUnknown() and getTypeRepr = x.getTypeRepr() diff --git a/rust/ql/test/extractor-tests/generated/SourceFile/SourceFile.expected b/rust/ql/test/extractor-tests/generated/SourceFile/SourceFile.expected index e6b44060e33..e308c26daa8 100644 --- a/rust/ql/test/extractor-tests/generated/SourceFile/SourceFile.expected +++ b/rust/ql/test/extractor-tests/generated/SourceFile/SourceFile.expected @@ -1,6 +1,6 @@ instances -| gen_source_file.rs:1:1:9:2 | SourceFile | getNumberOfAttrs: | 0 | getNumberOfItems: | 1 | -| lib.rs:1:1:1:20 | SourceFile | getNumberOfAttrs: | 0 | getNumberOfItems: | 1 | +| gen_source_file.rs:1:1:9:2 | SourceFile | +| lib.rs:1:1:1:20 | SourceFile | getAttr getItem | gen_source_file.rs:1:1:9:2 | SourceFile | 0 | gen_source_file.rs:3:1:9:1 | fn test_source_file | diff --git a/rust/ql/test/extractor-tests/generated/SourceFile/SourceFile.ql b/rust/ql/test/extractor-tests/generated/SourceFile/SourceFile.ql index 2c1d76f6330..257752e706e 100644 --- a/rust/ql/test/extractor-tests/generated/SourceFile/SourceFile.ql +++ b/rust/ql/test/extractor-tests/generated/SourceFile/SourceFile.ql @@ -2,17 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - SourceFile x, string getNumberOfAttrs__label, int getNumberOfAttrs, - string getNumberOfItems__label, int getNumberOfItems -) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - getNumberOfItems__label = "getNumberOfItems:" and - getNumberOfItems = x.getNumberOfItems() -} +query predicate instances(SourceFile x) { toBeTested(x) and not x.isUnknown() } query predicate getAttr(SourceFile x, int index, Attr getAttr) { toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index) diff --git a/rust/ql/test/extractor-tests/generated/Static/Static.expected b/rust/ql/test/extractor-tests/generated/Static/Static.expected index bb95e6994f0..ee87d07a2c1 100644 --- a/rust/ql/test/extractor-tests/generated/Static/Static.expected +++ b/rust/ql/test/extractor-tests/generated/Static/Static.expected @@ -1,5 +1,5 @@ instances -| gen_static.rs:4:5:7:23 | Static | hasExtendedCanonicalPath: | no | hasCrateOrigin: | no | hasAttributeMacroExpansion: | no | getNumberOfAttrs: | 0 | hasBody: | yes | isMut: | no | isStatic: | yes | isUnsafe: | no | hasName: | yes | hasTypeRepr: | yes | hasVisibility: | no | +| gen_static.rs:4:5:7:23 | Static | isMut: | no | isStatic: | yes | isUnsafe: | no | getExtendedCanonicalPath getCrateOrigin getAttributeMacroExpansion diff --git a/rust/ql/test/extractor-tests/generated/Static/Static.ql b/rust/ql/test/extractor-tests/generated/Static/Static.ql index 67e70e864ea..58ade5f044f 100644 --- a/rust/ql/test/extractor-tests/generated/Static/Static.ql +++ b/rust/ql/test/extractor-tests/generated/Static/Static.ql @@ -3,45 +3,17 @@ import codeql.rust.elements import TestUtils query predicate instances( - Static x, string hasExtendedCanonicalPath__label, string hasExtendedCanonicalPath, - string hasCrateOrigin__label, string hasCrateOrigin, string hasAttributeMacroExpansion__label, - string hasAttributeMacroExpansion, string getNumberOfAttrs__label, int getNumberOfAttrs, - string hasBody__label, string hasBody, string isMut__label, string isMut, string isStatic__label, - string isStatic, string isUnsafe__label, string isUnsafe, string hasName__label, string hasName, - string hasTypeRepr__label, string hasTypeRepr, string hasVisibility__label, string hasVisibility + Static x, string isMut__label, string isMut, string isStatic__label, string isStatic, + string isUnsafe__label, string isUnsafe ) { toBeTested(x) and not x.isUnknown() and - hasExtendedCanonicalPath__label = "hasExtendedCanonicalPath:" and - ( - if x.hasExtendedCanonicalPath() - then hasExtendedCanonicalPath = "yes" - else hasExtendedCanonicalPath = "no" - ) and - hasCrateOrigin__label = "hasCrateOrigin:" and - (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and - hasAttributeMacroExpansion__label = "hasAttributeMacroExpansion:" and - ( - if x.hasAttributeMacroExpansion() - then hasAttributeMacroExpansion = "yes" - else hasAttributeMacroExpansion = "no" - ) and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasBody__label = "hasBody:" and - (if x.hasBody() then hasBody = "yes" else hasBody = "no") and isMut__label = "isMut:" and (if x.isMut() then isMut = "yes" else isMut = "no") and isStatic__label = "isStatic:" and (if x.isStatic() then isStatic = "yes" else isStatic = "no") and isUnsafe__label = "isUnsafe:" and - (if x.isUnsafe() then isUnsafe = "yes" else isUnsafe = "no") and - hasName__label = "hasName:" and - (if x.hasName() then hasName = "yes" else hasName = "no") and - hasTypeRepr__label = "hasTypeRepr:" and - (if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no") and - hasVisibility__label = "hasVisibility:" and - if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no" + if x.isUnsafe() then isUnsafe = "yes" else isUnsafe = "no" } query predicate getExtendedCanonicalPath(Static x, string getExtendedCanonicalPath) { diff --git a/rust/ql/test/extractor-tests/generated/StmtList/StmtList.expected b/rust/ql/test/extractor-tests/generated/StmtList/StmtList.expected index 6511305ed81..02f322734ca 100644 --- a/rust/ql/test/extractor-tests/generated/StmtList/StmtList.expected +++ b/rust/ql/test/extractor-tests/generated/StmtList/StmtList.expected @@ -1,6 +1,6 @@ instances -| gen_stmt_list.rs:3:27:12:1 | StmtList | getNumberOfAttrs: | 0 | getNumberOfStatements: | 0 | hasTailExpr: | yes | -| gen_stmt_list.rs:7:5:10:5 | StmtList | getNumberOfAttrs: | 0 | getNumberOfStatements: | 2 | hasTailExpr: | no | +| gen_stmt_list.rs:3:27:12:1 | StmtList | +| gen_stmt_list.rs:7:5:10:5 | StmtList | getAttr getStatement | gen_stmt_list.rs:7:5:10:5 | StmtList | 0 | gen_stmt_list.rs:8:9:8:18 | let ... = 1 | diff --git a/rust/ql/test/extractor-tests/generated/StmtList/StmtList.ql b/rust/ql/test/extractor-tests/generated/StmtList/StmtList.ql index a9717e52fe4..1dcc1ce6db1 100644 --- a/rust/ql/test/extractor-tests/generated/StmtList/StmtList.ql +++ b/rust/ql/test/extractor-tests/generated/StmtList/StmtList.ql @@ -2,20 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - StmtList x, string getNumberOfAttrs__label, int getNumberOfAttrs, - string getNumberOfStatements__label, int getNumberOfStatements, string hasTailExpr__label, - string hasTailExpr -) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - getNumberOfStatements__label = "getNumberOfStatements:" and - getNumberOfStatements = x.getNumberOfStatements() and - hasTailExpr__label = "hasTailExpr:" and - if x.hasTailExpr() then hasTailExpr = "yes" else hasTailExpr = "no" -} +query predicate instances(StmtList x) { toBeTested(x) and not x.isUnknown() } query predicate getAttr(StmtList x, int index, Attr getAttr) { toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index) diff --git a/rust/ql/test/extractor-tests/generated/Struct/Struct.expected b/rust/ql/test/extractor-tests/generated/Struct/Struct.expected index 1432ab9864f..ad34c13babe 100644 --- a/rust/ql/test/extractor-tests/generated/Struct/Struct.expected +++ b/rust/ql/test/extractor-tests/generated/Struct/Struct.expected @@ -1,5 +1,5 @@ instances -| gen_struct.rs:4:5:8:5 | struct Point | hasExtendedCanonicalPath: | no | hasCrateOrigin: | no | hasAttributeMacroExpansion: | no | getNumberOfDeriveMacroExpansions: | 0 | getNumberOfAttrs: | 0 | hasFieldList: | yes | hasGenericParamList: | no | hasName: | yes | hasVisibility: | no | hasWhereClause: | no | +| gen_struct.rs:4:5:8:5 | struct Point | getExtendedCanonicalPath getCrateOrigin getAttributeMacroExpansion diff --git a/rust/ql/test/extractor-tests/generated/Struct/Struct.ql b/rust/ql/test/extractor-tests/generated/Struct/Struct.ql index aa0faaab091..185c1125f5c 100644 --- a/rust/ql/test/extractor-tests/generated/Struct/Struct.ql +++ b/rust/ql/test/extractor-tests/generated/Struct/Struct.ql @@ -2,46 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - Struct x, string hasExtendedCanonicalPath__label, string hasExtendedCanonicalPath, - string hasCrateOrigin__label, string hasCrateOrigin, string hasAttributeMacroExpansion__label, - string hasAttributeMacroExpansion, string getNumberOfDeriveMacroExpansions__label, - int getNumberOfDeriveMacroExpansions, string getNumberOfAttrs__label, int getNumberOfAttrs, - string hasFieldList__label, string hasFieldList, string hasGenericParamList__label, - string hasGenericParamList, string hasName__label, string hasName, string hasVisibility__label, - string hasVisibility, string hasWhereClause__label, string hasWhereClause -) { - toBeTested(x) and - not x.isUnknown() and - hasExtendedCanonicalPath__label = "hasExtendedCanonicalPath:" and - ( - if x.hasExtendedCanonicalPath() - then hasExtendedCanonicalPath = "yes" - else hasExtendedCanonicalPath = "no" - ) and - hasCrateOrigin__label = "hasCrateOrigin:" and - (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and - hasAttributeMacroExpansion__label = "hasAttributeMacroExpansion:" and - ( - if x.hasAttributeMacroExpansion() - then hasAttributeMacroExpansion = "yes" - else hasAttributeMacroExpansion = "no" - ) and - getNumberOfDeriveMacroExpansions__label = "getNumberOfDeriveMacroExpansions:" and - getNumberOfDeriveMacroExpansions = x.getNumberOfDeriveMacroExpansions() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasFieldList__label = "hasFieldList:" and - (if x.hasFieldList() then hasFieldList = "yes" else hasFieldList = "no") and - hasGenericParamList__label = "hasGenericParamList:" and - (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and - hasName__label = "hasName:" and - (if x.hasName() then hasName = "yes" else hasName = "no") and - hasVisibility__label = "hasVisibility:" and - (if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no") and - hasWhereClause__label = "hasWhereClause:" and - if x.hasWhereClause() then hasWhereClause = "yes" else hasWhereClause = "no" -} +query predicate instances(Struct x) { toBeTested(x) and not x.isUnknown() } query predicate getExtendedCanonicalPath(Struct x, string getExtendedCanonicalPath) { toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath() diff --git a/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr.expected b/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr.expected index 1a7d410b7a9..477aa732ece 100644 --- a/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr.expected +++ b/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr.expected @@ -1,8 +1,8 @@ instances -| gen_struct_expr.rs:5:17:5:34 | Foo {...} | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasPath: | yes | hasStructExprFieldList: | yes | -| gen_struct_expr.rs:6:18:6:38 | Foo {...} | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasPath: | yes | hasStructExprFieldList: | yes | -| gen_struct_expr.rs:7:5:7:22 | Foo {...} | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasPath: | yes | hasStructExprFieldList: | yes | -| gen_struct_expr.rs:8:5:8:14 | Foo {...} | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasPath: | yes | hasStructExprFieldList: | yes | +| gen_struct_expr.rs:5:17:5:34 | Foo {...} | +| gen_struct_expr.rs:6:18:6:38 | Foo {...} | +| gen_struct_expr.rs:7:5:7:22 | Foo {...} | +| gen_struct_expr.rs:8:5:8:14 | Foo {...} | getResolvedPath getResolvedCrateOrigin getPath diff --git a/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr.ql b/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr.ql index 4d9bf5d6a8e..4a71efa31ee 100644 --- a/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr.ql +++ b/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr.ql @@ -2,28 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - StructExpr x, string hasResolvedPath__label, string hasResolvedPath, - string hasResolvedCrateOrigin__label, string hasResolvedCrateOrigin, string hasPath__label, - string hasPath, string hasStructExprFieldList__label, string hasStructExprFieldList -) { - toBeTested(x) and - not x.isUnknown() and - hasResolvedPath__label = "hasResolvedPath:" and - (if x.hasResolvedPath() then hasResolvedPath = "yes" else hasResolvedPath = "no") and - hasResolvedCrateOrigin__label = "hasResolvedCrateOrigin:" and - ( - if x.hasResolvedCrateOrigin() - then hasResolvedCrateOrigin = "yes" - else hasResolvedCrateOrigin = "no" - ) and - hasPath__label = "hasPath:" and - (if x.hasPath() then hasPath = "yes" else hasPath = "no") and - hasStructExprFieldList__label = "hasStructExprFieldList:" and - if x.hasStructExprFieldList() - then hasStructExprFieldList = "yes" - else hasStructExprFieldList = "no" -} +query predicate instances(StructExpr x) { toBeTested(x) and not x.isUnknown() } query predicate getResolvedPath(StructExpr x, string getResolvedPath) { toBeTested(x) and not x.isUnknown() and getResolvedPath = x.getResolvedPath() diff --git a/rust/ql/test/extractor-tests/generated/StructExprField/StructExprField.expected b/rust/ql/test/extractor-tests/generated/StructExprField/StructExprField.expected index 84a6fd60682..3e275eb6a24 100644 --- a/rust/ql/test/extractor-tests/generated/StructExprField/StructExprField.expected +++ b/rust/ql/test/extractor-tests/generated/StructExprField/StructExprField.expected @@ -1,6 +1,6 @@ instances -| gen_struct_expr_field.rs:5:11:5:14 | a: 1 | getNumberOfAttrs: | 0 | hasExpr: | yes | hasIdentifier: | yes | -| gen_struct_expr_field.rs:5:17:5:20 | b: 2 | getNumberOfAttrs: | 0 | hasExpr: | yes | hasIdentifier: | yes | +| gen_struct_expr_field.rs:5:11:5:14 | a: 1 | +| gen_struct_expr_field.rs:5:17:5:20 | b: 2 | getAttr getExpr | gen_struct_expr_field.rs:5:11:5:14 | a: 1 | gen_struct_expr_field.rs:5:14:5:14 | 1 | diff --git a/rust/ql/test/extractor-tests/generated/StructExprField/StructExprField.ql b/rust/ql/test/extractor-tests/generated/StructExprField/StructExprField.ql index a8142d07dc7..4b4703c8828 100644 --- a/rust/ql/test/extractor-tests/generated/StructExprField/StructExprField.ql +++ b/rust/ql/test/extractor-tests/generated/StructExprField/StructExprField.ql @@ -2,19 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - StructExprField x, string getNumberOfAttrs__label, int getNumberOfAttrs, string hasExpr__label, - string hasExpr, string hasIdentifier__label, string hasIdentifier -) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasExpr__label = "hasExpr:" and - (if x.hasExpr() then hasExpr = "yes" else hasExpr = "no") and - hasIdentifier__label = "hasIdentifier:" and - if x.hasIdentifier() then hasIdentifier = "yes" else hasIdentifier = "no" -} +query predicate instances(StructExprField x) { toBeTested(x) and not x.isUnknown() } query predicate getAttr(StructExprField x, int index, Attr getAttr) { toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index) diff --git a/rust/ql/test/extractor-tests/generated/StructExprFieldList/StructExprFieldList.expected b/rust/ql/test/extractor-tests/generated/StructExprFieldList/StructExprFieldList.expected index b81d8eac119..188a3690d83 100644 --- a/rust/ql/test/extractor-tests/generated/StructExprFieldList/StructExprFieldList.expected +++ b/rust/ql/test/extractor-tests/generated/StructExprFieldList/StructExprFieldList.expected @@ -1,5 +1,5 @@ instances -| gen_struct_expr_field_list.rs:7:9:7:22 | StructExprFieldList | getNumberOfAttrs: | 0 | getNumberOfFields: | 2 | hasSpread: | no | +| gen_struct_expr_field_list.rs:7:9:7:22 | StructExprFieldList | getAttr getField | gen_struct_expr_field_list.rs:7:9:7:22 | StructExprFieldList | 0 | gen_struct_expr_field_list.rs:7:11:7:14 | a: 1 | diff --git a/rust/ql/test/extractor-tests/generated/StructExprFieldList/StructExprFieldList.ql b/rust/ql/test/extractor-tests/generated/StructExprFieldList/StructExprFieldList.ql index 4ce42a59421..dfa2ea4c324 100644 --- a/rust/ql/test/extractor-tests/generated/StructExprFieldList/StructExprFieldList.ql +++ b/rust/ql/test/extractor-tests/generated/StructExprFieldList/StructExprFieldList.ql @@ -2,19 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - StructExprFieldList x, string getNumberOfAttrs__label, int getNumberOfAttrs, - string getNumberOfFields__label, int getNumberOfFields, string hasSpread__label, string hasSpread -) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - getNumberOfFields__label = "getNumberOfFields:" and - getNumberOfFields = x.getNumberOfFields() and - hasSpread__label = "hasSpread:" and - if x.hasSpread() then hasSpread = "yes" else hasSpread = "no" -} +query predicate instances(StructExprFieldList x) { toBeTested(x) and not x.isUnknown() } query predicate getAttr(StructExprFieldList x, int index, Attr getAttr) { toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index) diff --git a/rust/ql/test/extractor-tests/generated/StructField/StructField.expected b/rust/ql/test/extractor-tests/generated/StructField/StructField.expected index 1423f2e71d6..3b5d0d7b71c 100644 --- a/rust/ql/test/extractor-tests/generated/StructField/StructField.expected +++ b/rust/ql/test/extractor-tests/generated/StructField/StructField.expected @@ -1,5 +1,5 @@ instances -| gen_struct_field.rs:7:16:7:21 | StructField | getNumberOfAttrs: | 0 | hasDefault: | no | isUnsafe: | no | hasName: | yes | hasTypeRepr: | yes | hasVisibility: | no | +| gen_struct_field.rs:7:16:7:21 | StructField | isUnsafe: | no | getAttr getDefault getName diff --git a/rust/ql/test/extractor-tests/generated/StructField/StructField.ql b/rust/ql/test/extractor-tests/generated/StructField/StructField.ql index 455dc16438b..773f282e36b 100644 --- a/rust/ql/test/extractor-tests/generated/StructField/StructField.ql +++ b/rust/ql/test/extractor-tests/generated/StructField/StructField.ql @@ -2,25 +2,11 @@ import codeql.rust.elements import TestUtils -query predicate instances( - StructField x, string getNumberOfAttrs__label, int getNumberOfAttrs, string hasDefault__label, - string hasDefault, string isUnsafe__label, string isUnsafe, string hasName__label, string hasName, - string hasTypeRepr__label, string hasTypeRepr, string hasVisibility__label, string hasVisibility -) { +query predicate instances(StructField x, string isUnsafe__label, string isUnsafe) { toBeTested(x) and not x.isUnknown() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasDefault__label = "hasDefault:" and - (if x.hasDefault() then hasDefault = "yes" else hasDefault = "no") and isUnsafe__label = "isUnsafe:" and - (if x.isUnsafe() then isUnsafe = "yes" else isUnsafe = "no") and - hasName__label = "hasName:" and - (if x.hasName() then hasName = "yes" else hasName = "no") and - hasTypeRepr__label = "hasTypeRepr:" and - (if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no") and - hasVisibility__label = "hasVisibility:" and - if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no" + if x.isUnsafe() then isUnsafe = "yes" else isUnsafe = "no" } query predicate getAttr(StructField x, int index, Attr getAttr) { diff --git a/rust/ql/test/extractor-tests/generated/StructFieldList/StructFieldList.expected b/rust/ql/test/extractor-tests/generated/StructFieldList/StructFieldList.expected index 6d100043abd..847bfd3c937 100644 --- a/rust/ql/test/extractor-tests/generated/StructFieldList/StructFieldList.expected +++ b/rust/ql/test/extractor-tests/generated/StructFieldList/StructFieldList.expected @@ -1,5 +1,5 @@ instances -| gen_struct_field_list.rs:7:14:7:31 | StructFieldList | getNumberOfFields: | 2 | +| gen_struct_field_list.rs:7:14:7:31 | StructFieldList | getField | gen_struct_field_list.rs:7:14:7:31 | StructFieldList | 0 | gen_struct_field_list.rs:7:16:7:21 | StructField | | gen_struct_field_list.rs:7:14:7:31 | StructFieldList | 1 | gen_struct_field_list.rs:7:24:7:29 | StructField | diff --git a/rust/ql/test/extractor-tests/generated/StructFieldList/StructFieldList.ql b/rust/ql/test/extractor-tests/generated/StructFieldList/StructFieldList.ql index 81f5991e669..f8afe271d81 100644 --- a/rust/ql/test/extractor-tests/generated/StructFieldList/StructFieldList.ql +++ b/rust/ql/test/extractor-tests/generated/StructFieldList/StructFieldList.ql @@ -2,12 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances(StructFieldList x, string getNumberOfFields__label, int getNumberOfFields) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfFields__label = "getNumberOfFields:" and - getNumberOfFields = x.getNumberOfFields() -} +query predicate instances(StructFieldList x) { toBeTested(x) and not x.isUnknown() } query predicate getField(StructFieldList x, int index, StructField getField) { toBeTested(x) and not x.isUnknown() and getField = x.getField(index) diff --git a/rust/ql/test/extractor-tests/generated/StructPat/StructPat.expected b/rust/ql/test/extractor-tests/generated/StructPat/StructPat.expected index e95115ae69a..894e52fb196 100644 --- a/rust/ql/test/extractor-tests/generated/StructPat/StructPat.expected +++ b/rust/ql/test/extractor-tests/generated/StructPat/StructPat.expected @@ -1,6 +1,6 @@ instances -| gen_struct_pat.rs:6:9:6:26 | Foo {...} | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasPath: | yes | hasStructPatFieldList: | yes | -| gen_struct_pat.rs:7:9:7:18 | Foo {...} | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasPath: | yes | hasStructPatFieldList: | yes | +| gen_struct_pat.rs:6:9:6:26 | Foo {...} | +| gen_struct_pat.rs:7:9:7:18 | Foo {...} | getResolvedPath getResolvedCrateOrigin getPath diff --git a/rust/ql/test/extractor-tests/generated/StructPat/StructPat.ql b/rust/ql/test/extractor-tests/generated/StructPat/StructPat.ql index 82f0034da47..4aad29aede9 100644 --- a/rust/ql/test/extractor-tests/generated/StructPat/StructPat.ql +++ b/rust/ql/test/extractor-tests/generated/StructPat/StructPat.ql @@ -2,26 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - StructPat x, string hasResolvedPath__label, string hasResolvedPath, - string hasResolvedCrateOrigin__label, string hasResolvedCrateOrigin, string hasPath__label, - string hasPath, string hasStructPatFieldList__label, string hasStructPatFieldList -) { - toBeTested(x) and - not x.isUnknown() and - hasResolvedPath__label = "hasResolvedPath:" and - (if x.hasResolvedPath() then hasResolvedPath = "yes" else hasResolvedPath = "no") and - hasResolvedCrateOrigin__label = "hasResolvedCrateOrigin:" and - ( - if x.hasResolvedCrateOrigin() - then hasResolvedCrateOrigin = "yes" - else hasResolvedCrateOrigin = "no" - ) and - hasPath__label = "hasPath:" and - (if x.hasPath() then hasPath = "yes" else hasPath = "no") and - hasStructPatFieldList__label = "hasStructPatFieldList:" and - if x.hasStructPatFieldList() then hasStructPatFieldList = "yes" else hasStructPatFieldList = "no" -} +query predicate instances(StructPat x) { toBeTested(x) and not x.isUnknown() } query predicate getResolvedPath(StructPat x, string getResolvedPath) { toBeTested(x) and not x.isUnknown() and getResolvedPath = x.getResolvedPath() diff --git a/rust/ql/test/extractor-tests/generated/StructPatField/StructPatField.expected b/rust/ql/test/extractor-tests/generated/StructPatField/StructPatField.expected index a8c40fcb68f..c2efa2bda82 100644 --- a/rust/ql/test/extractor-tests/generated/StructPatField/StructPatField.expected +++ b/rust/ql/test/extractor-tests/generated/StructPatField/StructPatField.expected @@ -1,6 +1,6 @@ instances -| gen_struct_pat_field.rs:5:15:5:18 | a: 1 | getNumberOfAttrs: | 0 | hasIdentifier: | yes | hasPat: | yes | -| gen_struct_pat_field.rs:5:21:5:24 | b: 2 | getNumberOfAttrs: | 0 | hasIdentifier: | yes | hasPat: | yes | +| gen_struct_pat_field.rs:5:15:5:18 | a: 1 | +| gen_struct_pat_field.rs:5:21:5:24 | b: 2 | getAttr getIdentifier | gen_struct_pat_field.rs:5:15:5:18 | a: 1 | gen_struct_pat_field.rs:5:15:5:15 | a | diff --git a/rust/ql/test/extractor-tests/generated/StructPatField/StructPatField.ql b/rust/ql/test/extractor-tests/generated/StructPatField/StructPatField.ql index 67eb1d7c99d..4b3c605590d 100644 --- a/rust/ql/test/extractor-tests/generated/StructPatField/StructPatField.ql +++ b/rust/ql/test/extractor-tests/generated/StructPatField/StructPatField.ql @@ -2,19 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - StructPatField x, string getNumberOfAttrs__label, int getNumberOfAttrs, - string hasIdentifier__label, string hasIdentifier, string hasPat__label, string hasPat -) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasIdentifier__label = "hasIdentifier:" and - (if x.hasIdentifier() then hasIdentifier = "yes" else hasIdentifier = "no") and - hasPat__label = "hasPat:" and - if x.hasPat() then hasPat = "yes" else hasPat = "no" -} +query predicate instances(StructPatField x) { toBeTested(x) and not x.isUnknown() } query predicate getAttr(StructPatField x, int index, Attr getAttr) { toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index) diff --git a/rust/ql/test/extractor-tests/generated/StructPatFieldList/StructPatFieldList.expected b/rust/ql/test/extractor-tests/generated/StructPatFieldList/StructPatFieldList.expected index 54c067a025b..a40c54bd30a 100644 --- a/rust/ql/test/extractor-tests/generated/StructPatFieldList/StructPatFieldList.expected +++ b/rust/ql/test/extractor-tests/generated/StructPatFieldList/StructPatFieldList.expected @@ -1,5 +1,5 @@ instances -| gen_struct_pat_field_list.rs:7:13:7:20 | StructPatFieldList | getNumberOfFields: | 2 | hasRestPat: | no | +| gen_struct_pat_field_list.rs:7:13:7:20 | StructPatFieldList | getField | gen_struct_pat_field_list.rs:7:13:7:20 | StructPatFieldList | 0 | gen_struct_pat_field_list.rs:7:15:7:15 | ... | | gen_struct_pat_field_list.rs:7:13:7:20 | StructPatFieldList | 1 | gen_struct_pat_field_list.rs:7:18:7:18 | ... | diff --git a/rust/ql/test/extractor-tests/generated/StructPatFieldList/StructPatFieldList.ql b/rust/ql/test/extractor-tests/generated/StructPatFieldList/StructPatFieldList.ql index f0e4c5f2185..2d9433fdb80 100644 --- a/rust/ql/test/extractor-tests/generated/StructPatFieldList/StructPatFieldList.ql +++ b/rust/ql/test/extractor-tests/generated/StructPatFieldList/StructPatFieldList.ql @@ -2,17 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - StructPatFieldList x, string getNumberOfFields__label, int getNumberOfFields, - string hasRestPat__label, string hasRestPat -) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfFields__label = "getNumberOfFields:" and - getNumberOfFields = x.getNumberOfFields() and - hasRestPat__label = "hasRestPat:" and - if x.hasRestPat() then hasRestPat = "yes" else hasRestPat = "no" -} +query predicate instances(StructPatFieldList x) { toBeTested(x) and not x.isUnknown() } query predicate getField(StructPatFieldList x, int index, StructPatField getField) { toBeTested(x) and not x.isUnknown() and getField = x.getField(index) diff --git a/rust/ql/test/extractor-tests/generated/Trait/AssocItemList.expected b/rust/ql/test/extractor-tests/generated/Trait/AssocItemList.expected index 07cfc7acf83..526d4057b3c 100644 --- a/rust/ql/test/extractor-tests/generated/Trait/AssocItemList.expected +++ b/rust/ql/test/extractor-tests/generated/Trait/AssocItemList.expected @@ -1,6 +1,6 @@ instances -| gen_trait.rs:4:20:8:1 | AssocItemList | getNumberOfAssocItems: | 3 | getNumberOfAttrs: | 0 | -| gen_trait.rs:10:56:10:57 | AssocItemList | getNumberOfAssocItems: | 0 | getNumberOfAttrs: | 0 | +| gen_trait.rs:4:20:8:1 | AssocItemList | +| gen_trait.rs:10:56:10:57 | AssocItemList | getAssocItem | gen_trait.rs:4:20:8:1 | AssocItemList | 0 | gen_trait.rs:5:3:5:18 | type Frobinator | | gen_trait.rs:4:20:8:1 | AssocItemList | 1 | gen_trait.rs:6:3:6:20 | type Result | diff --git a/rust/ql/test/extractor-tests/generated/Trait/AssocItemList.ql b/rust/ql/test/extractor-tests/generated/Trait/AssocItemList.ql index c0e5ffde800..bbef174971f 100644 --- a/rust/ql/test/extractor-tests/generated/Trait/AssocItemList.ql +++ b/rust/ql/test/extractor-tests/generated/Trait/AssocItemList.ql @@ -2,17 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - AssocItemList x, string getNumberOfAssocItems__label, int getNumberOfAssocItems, - string getNumberOfAttrs__label, int getNumberOfAttrs -) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfAssocItems__label = "getNumberOfAssocItems:" and - getNumberOfAssocItems = x.getNumberOfAssocItems() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() -} +query predicate instances(AssocItemList x) { toBeTested(x) and not x.isUnknown() } query predicate getAssocItem(AssocItemList x, int index, AssocItem getAssocItem) { toBeTested(x) and not x.isUnknown() and getAssocItem = x.getAssocItem(index) diff --git a/rust/ql/test/extractor-tests/generated/Trait/Trait.expected b/rust/ql/test/extractor-tests/generated/Trait/Trait.expected index c7ed1fef545..ff60871f40b 100644 --- a/rust/ql/test/extractor-tests/generated/Trait/Trait.expected +++ b/rust/ql/test/extractor-tests/generated/Trait/Trait.expected @@ -1,6 +1,6 @@ instances -| gen_trait.rs:3:1:8:1 | trait Frobinizable | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | hasAttributeMacroExpansion: | no | hasAssocItemList: | yes | getNumberOfAttrs: | 0 | hasGenericParamList: | no | isAuto: | no | isUnsafe: | no | hasName: | yes | hasTypeBoundList: | no | hasVisibility: | no | hasWhereClause: | no | -| gen_trait.rs:10:1:10:57 | trait Foo | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | hasAttributeMacroExpansion: | no | hasAssocItemList: | yes | getNumberOfAttrs: | 0 | hasGenericParamList: | yes | isAuto: | no | isUnsafe: | no | hasName: | yes | hasTypeBoundList: | no | hasVisibility: | yes | hasWhereClause: | yes | +| gen_trait.rs:3:1:8:1 | trait Frobinizable | isAuto: | no | isUnsafe: | no | +| gen_trait.rs:10:1:10:57 | trait Foo | isAuto: | no | isUnsafe: | no | getExtendedCanonicalPath | gen_trait.rs:3:1:8:1 | trait Frobinizable | crate::gen_trait::Frobinizable | | gen_trait.rs:10:1:10:57 | trait Foo | crate::gen_trait::Foo | diff --git a/rust/ql/test/extractor-tests/generated/Trait/Trait.ql b/rust/ql/test/extractor-tests/generated/Trait/Trait.ql index 9079f66cfc0..35725fcd526 100644 --- a/rust/ql/test/extractor-tests/generated/Trait/Trait.ql +++ b/rust/ql/test/extractor-tests/generated/Trait/Trait.ql @@ -3,49 +3,14 @@ import codeql.rust.elements import TestUtils query predicate instances( - Trait x, string hasExtendedCanonicalPath__label, string hasExtendedCanonicalPath, - string hasCrateOrigin__label, string hasCrateOrigin, string hasAttributeMacroExpansion__label, - string hasAttributeMacroExpansion, string hasAssocItemList__label, string hasAssocItemList, - string getNumberOfAttrs__label, int getNumberOfAttrs, string hasGenericParamList__label, - string hasGenericParamList, string isAuto__label, string isAuto, string isUnsafe__label, - string isUnsafe, string hasName__label, string hasName, string hasTypeBoundList__label, - string hasTypeBoundList, string hasVisibility__label, string hasVisibility, - string hasWhereClause__label, string hasWhereClause + Trait x, string isAuto__label, string isAuto, string isUnsafe__label, string isUnsafe ) { toBeTested(x) and not x.isUnknown() and - hasExtendedCanonicalPath__label = "hasExtendedCanonicalPath:" and - ( - if x.hasExtendedCanonicalPath() - then hasExtendedCanonicalPath = "yes" - else hasExtendedCanonicalPath = "no" - ) and - hasCrateOrigin__label = "hasCrateOrigin:" and - (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and - hasAttributeMacroExpansion__label = "hasAttributeMacroExpansion:" and - ( - if x.hasAttributeMacroExpansion() - then hasAttributeMacroExpansion = "yes" - else hasAttributeMacroExpansion = "no" - ) and - hasAssocItemList__label = "hasAssocItemList:" and - (if x.hasAssocItemList() then hasAssocItemList = "yes" else hasAssocItemList = "no") and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasGenericParamList__label = "hasGenericParamList:" and - (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and isAuto__label = "isAuto:" and (if x.isAuto() then isAuto = "yes" else isAuto = "no") and isUnsafe__label = "isUnsafe:" and - (if x.isUnsafe() then isUnsafe = "yes" else isUnsafe = "no") and - hasName__label = "hasName:" and - (if x.hasName() then hasName = "yes" else hasName = "no") and - hasTypeBoundList__label = "hasTypeBoundList:" and - (if x.hasTypeBoundList() then hasTypeBoundList = "yes" else hasTypeBoundList = "no") and - hasVisibility__label = "hasVisibility:" and - (if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no") and - hasWhereClause__label = "hasWhereClause:" and - if x.hasWhereClause() then hasWhereClause = "yes" else hasWhereClause = "no" + if x.isUnsafe() then isUnsafe = "yes" else isUnsafe = "no" } query predicate getExtendedCanonicalPath(Trait x, string getExtendedCanonicalPath) { diff --git a/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias.expected b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias.expected index 62b759298c8..f8fc1628036 100644 --- a/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias.expected +++ b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias.expected @@ -1,5 +1,5 @@ instances -| gen_trait_alias.rs:7:5:7:26 | TraitAlias | hasExtendedCanonicalPath: | no | hasCrateOrigin: | no | hasAttributeMacroExpansion: | no | getNumberOfAttrs: | 0 | hasGenericParamList: | no | hasName: | yes | hasTypeBoundList: | yes | hasVisibility: | no | hasWhereClause: | no | +| gen_trait_alias.rs:7:5:7:26 | TraitAlias | getExtendedCanonicalPath getCrateOrigin getAttributeMacroExpansion diff --git a/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias.ql b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias.ql index 5a6d695ae6e..2d65541f50c 100644 --- a/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias.ql +++ b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias.ql @@ -2,44 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - TraitAlias x, string hasExtendedCanonicalPath__label, string hasExtendedCanonicalPath, - string hasCrateOrigin__label, string hasCrateOrigin, string hasAttributeMacroExpansion__label, - string hasAttributeMacroExpansion, string getNumberOfAttrs__label, int getNumberOfAttrs, - string hasGenericParamList__label, string hasGenericParamList, string hasName__label, - string hasName, string hasTypeBoundList__label, string hasTypeBoundList, - string hasVisibility__label, string hasVisibility, string hasWhereClause__label, - string hasWhereClause -) { - toBeTested(x) and - not x.isUnknown() and - hasExtendedCanonicalPath__label = "hasExtendedCanonicalPath:" and - ( - if x.hasExtendedCanonicalPath() - then hasExtendedCanonicalPath = "yes" - else hasExtendedCanonicalPath = "no" - ) and - hasCrateOrigin__label = "hasCrateOrigin:" and - (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and - hasAttributeMacroExpansion__label = "hasAttributeMacroExpansion:" and - ( - if x.hasAttributeMacroExpansion() - then hasAttributeMacroExpansion = "yes" - else hasAttributeMacroExpansion = "no" - ) and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasGenericParamList__label = "hasGenericParamList:" and - (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and - hasName__label = "hasName:" and - (if x.hasName() then hasName = "yes" else hasName = "no") and - hasTypeBoundList__label = "hasTypeBoundList:" and - (if x.hasTypeBoundList() then hasTypeBoundList = "yes" else hasTypeBoundList = "no") and - hasVisibility__label = "hasVisibility:" and - (if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no") and - hasWhereClause__label = "hasWhereClause:" and - if x.hasWhereClause() then hasWhereClause = "yes" else hasWhereClause = "no" -} +query predicate instances(TraitAlias x) { toBeTested(x) and not x.isUnknown() } query predicate getExtendedCanonicalPath(TraitAlias x, string getExtendedCanonicalPath) { toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath() diff --git a/rust/ql/test/extractor-tests/generated/TryExpr/TryExpr.expected b/rust/ql/test/extractor-tests/generated/TryExpr/TryExpr.expected index 1a81eb0f477..7bfee39ff2a 100644 --- a/rust/ql/test/extractor-tests/generated/TryExpr/TryExpr.expected +++ b/rust/ql/test/extractor-tests/generated/TryExpr/TryExpr.expected @@ -1,5 +1,5 @@ instances -| gen_try_expr.rs:7:13:7:18 | TryExpr | getNumberOfAttrs: | 0 | hasExpr: | yes | +| gen_try_expr.rs:7:13:7:18 | TryExpr | getAttr getExpr | gen_try_expr.rs:7:13:7:18 | TryExpr | gen_try_expr.rs:7:13:7:17 | foo(...) | diff --git a/rust/ql/test/extractor-tests/generated/TryExpr/TryExpr.ql b/rust/ql/test/extractor-tests/generated/TryExpr/TryExpr.ql index 6f22b28067c..fc42bca14a9 100644 --- a/rust/ql/test/extractor-tests/generated/TryExpr/TryExpr.ql +++ b/rust/ql/test/extractor-tests/generated/TryExpr/TryExpr.ql @@ -2,17 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - TryExpr x, string getNumberOfAttrs__label, int getNumberOfAttrs, string hasExpr__label, - string hasExpr -) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasExpr__label = "hasExpr:" and - if x.hasExpr() then hasExpr = "yes" else hasExpr = "no" -} +query predicate instances(TryExpr x) { toBeTested(x) and not x.isUnknown() } query predicate getAttr(TryExpr x, int index, Attr getAttr) { toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index) diff --git a/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr.expected b/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr.expected index c78dbfcbcbd..3a35afd6630 100644 --- a/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr.expected +++ b/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr.expected @@ -1,6 +1,6 @@ instances -| gen_tuple_expr.rs:5:5:5:14 | TupleExpr | getNumberOfAttrs: | 0 | getNumberOfFields: | 2 | -| gen_tuple_expr.rs:6:5:6:14 | TupleExpr | getNumberOfAttrs: | 0 | getNumberOfFields: | 2 | +| gen_tuple_expr.rs:5:5:5:14 | TupleExpr | +| gen_tuple_expr.rs:6:5:6:14 | TupleExpr | getAttr getField | gen_tuple_expr.rs:5:5:5:14 | TupleExpr | 0 | gen_tuple_expr.rs:5:6:5:6 | 1 | diff --git a/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr.ql b/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr.ql index d3d04608a5f..0b49fca4cee 100644 --- a/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr.ql +++ b/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr.ql @@ -2,17 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - TupleExpr x, string getNumberOfAttrs__label, int getNumberOfAttrs, - string getNumberOfFields__label, int getNumberOfFields -) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - getNumberOfFields__label = "getNumberOfFields:" and - getNumberOfFields = x.getNumberOfFields() -} +query predicate instances(TupleExpr x) { toBeTested(x) and not x.isUnknown() } query predicate getAttr(TupleExpr x, int index, Attr getAttr) { toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index) diff --git a/rust/ql/test/extractor-tests/generated/TupleField/TupleField.expected b/rust/ql/test/extractor-tests/generated/TupleField/TupleField.expected index 86985a0ceb1..6c653a9c37f 100644 --- a/rust/ql/test/extractor-tests/generated/TupleField/TupleField.expected +++ b/rust/ql/test/extractor-tests/generated/TupleField/TupleField.expected @@ -1,6 +1,6 @@ instances -| gen_tuple_field.rs:7:14:7:16 | TupleField | getNumberOfAttrs: | 0 | hasTypeRepr: | yes | hasVisibility: | no | -| gen_tuple_field.rs:7:19:7:24 | TupleField | getNumberOfAttrs: | 0 | hasTypeRepr: | yes | hasVisibility: | no | +| gen_tuple_field.rs:7:14:7:16 | TupleField | +| gen_tuple_field.rs:7:19:7:24 | TupleField | getAttr getTypeRepr | gen_tuple_field.rs:7:14:7:16 | TupleField | gen_tuple_field.rs:7:14:7:16 | i32 | diff --git a/rust/ql/test/extractor-tests/generated/TupleField/TupleField.ql b/rust/ql/test/extractor-tests/generated/TupleField/TupleField.ql index 52720718de5..01c15ace3dd 100644 --- a/rust/ql/test/extractor-tests/generated/TupleField/TupleField.ql +++ b/rust/ql/test/extractor-tests/generated/TupleField/TupleField.ql @@ -2,19 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - TupleField x, string getNumberOfAttrs__label, int getNumberOfAttrs, string hasTypeRepr__label, - string hasTypeRepr, string hasVisibility__label, string hasVisibility -) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasTypeRepr__label = "hasTypeRepr:" and - (if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no") and - hasVisibility__label = "hasVisibility:" and - if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no" -} +query predicate instances(TupleField x) { toBeTested(x) and not x.isUnknown() } query predicate getAttr(TupleField x, int index, Attr getAttr) { toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index) diff --git a/rust/ql/test/extractor-tests/generated/TupleFieldList/TupleFieldList.expected b/rust/ql/test/extractor-tests/generated/TupleFieldList/TupleFieldList.expected index 59c97d1032d..48940b31c34 100644 --- a/rust/ql/test/extractor-tests/generated/TupleFieldList/TupleFieldList.expected +++ b/rust/ql/test/extractor-tests/generated/TupleFieldList/TupleFieldList.expected @@ -1,5 +1,5 @@ instances -| gen_tuple_field_list.rs:7:13:7:25 | TupleFieldList | getNumberOfFields: | 2 | +| gen_tuple_field_list.rs:7:13:7:25 | TupleFieldList | getField | gen_tuple_field_list.rs:7:13:7:25 | TupleFieldList | 0 | gen_tuple_field_list.rs:7:14:7:16 | TupleField | | gen_tuple_field_list.rs:7:13:7:25 | TupleFieldList | 1 | gen_tuple_field_list.rs:7:19:7:24 | TupleField | diff --git a/rust/ql/test/extractor-tests/generated/TupleFieldList/TupleFieldList.ql b/rust/ql/test/extractor-tests/generated/TupleFieldList/TupleFieldList.ql index 1edeb8b3060..90b61236db3 100644 --- a/rust/ql/test/extractor-tests/generated/TupleFieldList/TupleFieldList.ql +++ b/rust/ql/test/extractor-tests/generated/TupleFieldList/TupleFieldList.ql @@ -2,12 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances(TupleFieldList x, string getNumberOfFields__label, int getNumberOfFields) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfFields__label = "getNumberOfFields:" and - getNumberOfFields = x.getNumberOfFields() -} +query predicate instances(TupleFieldList x) { toBeTested(x) and not x.isUnknown() } query predicate getField(TupleFieldList x, int index, TupleField getField) { toBeTested(x) and not x.isUnknown() and getField = x.getField(index) diff --git a/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat.expected b/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat.expected index 3d4877a21b7..8e769296d5f 100644 --- a/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat.expected +++ b/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat.expected @@ -1,6 +1,6 @@ instances -| gen_tuple_pat.rs:5:9:5:14 | TuplePat | getNumberOfFields: | 2 | -| gen_tuple_pat.rs:6:9:6:22 | TuplePat | getNumberOfFields: | 4 | +| gen_tuple_pat.rs:5:9:5:14 | TuplePat | +| gen_tuple_pat.rs:6:9:6:22 | TuplePat | getField | gen_tuple_pat.rs:5:9:5:14 | TuplePat | 0 | gen_tuple_pat.rs:5:10:5:10 | x | | gen_tuple_pat.rs:5:9:5:14 | TuplePat | 1 | gen_tuple_pat.rs:5:13:5:13 | y | diff --git a/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat.ql b/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat.ql index 514e7aed8b2..1692fe6758c 100644 --- a/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat.ql +++ b/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat.ql @@ -2,12 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances(TuplePat x, string getNumberOfFields__label, int getNumberOfFields) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfFields__label = "getNumberOfFields:" and - getNumberOfFields = x.getNumberOfFields() -} +query predicate instances(TuplePat x) { toBeTested(x) and not x.isUnknown() } query predicate getField(TuplePat x, int index, Pat getField) { toBeTested(x) and not x.isUnknown() and getField = x.getField(index) diff --git a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat.expected b/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat.expected index 1c703883b79..c5ce2e2640a 100644 --- a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat.expected +++ b/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat.expected @@ -1,7 +1,7 @@ instances -| gen_tuple_struct_pat.rs:6:9:6:27 | Tuple(...) | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasPath: | yes | getNumberOfFields: | 4 | -| gen_tuple_struct_pat.rs:7:9:7:20 | Tuple(...) | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasPath: | yes | getNumberOfFields: | 2 | -| gen_tuple_struct_pat.rs:8:9:8:17 | Tuple(...) | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasPath: | yes | getNumberOfFields: | 1 | +| gen_tuple_struct_pat.rs:6:9:6:27 | Tuple(...) | +| gen_tuple_struct_pat.rs:7:9:7:20 | Tuple(...) | +| gen_tuple_struct_pat.rs:8:9:8:17 | Tuple(...) | getResolvedPath getResolvedCrateOrigin getPath diff --git a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat.ql b/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat.ql index dafac11e38f..408c892ea3c 100644 --- a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat.ql +++ b/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat.ql @@ -2,26 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - TupleStructPat x, string hasResolvedPath__label, string hasResolvedPath, - string hasResolvedCrateOrigin__label, string hasResolvedCrateOrigin, string hasPath__label, - string hasPath, string getNumberOfFields__label, int getNumberOfFields -) { - toBeTested(x) and - not x.isUnknown() and - hasResolvedPath__label = "hasResolvedPath:" and - (if x.hasResolvedPath() then hasResolvedPath = "yes" else hasResolvedPath = "no") and - hasResolvedCrateOrigin__label = "hasResolvedCrateOrigin:" and - ( - if x.hasResolvedCrateOrigin() - then hasResolvedCrateOrigin = "yes" - else hasResolvedCrateOrigin = "no" - ) and - hasPath__label = "hasPath:" and - (if x.hasPath() then hasPath = "yes" else hasPath = "no") and - getNumberOfFields__label = "getNumberOfFields:" and - getNumberOfFields = x.getNumberOfFields() -} +query predicate instances(TupleStructPat x) { toBeTested(x) and not x.isUnknown() } query predicate getResolvedPath(TupleStructPat x, string getResolvedPath) { toBeTested(x) and not x.isUnknown() and getResolvedPath = x.getResolvedPath() diff --git a/rust/ql/test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr.expected b/rust/ql/test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr.expected index 17dfb6a02f6..1682ee89d08 100644 --- a/rust/ql/test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr.expected +++ b/rust/ql/test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr.expected @@ -1,6 +1,6 @@ instances -| gen_tuple_type_repr.rs:3:30:3:31 | TupleTypeRepr | getNumberOfFields: | 0 | -| gen_tuple_type_repr.rs:7:12:7:24 | TupleTypeRepr | getNumberOfFields: | 2 | +| gen_tuple_type_repr.rs:3:30:3:31 | TupleTypeRepr | +| gen_tuple_type_repr.rs:7:12:7:24 | TupleTypeRepr | getField | gen_tuple_type_repr.rs:7:12:7:24 | TupleTypeRepr | 0 | gen_tuple_type_repr.rs:7:13:7:15 | i32 | | gen_tuple_type_repr.rs:7:12:7:24 | TupleTypeRepr | 1 | gen_tuple_type_repr.rs:7:18:7:23 | String | diff --git a/rust/ql/test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr.ql b/rust/ql/test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr.ql index d8e508fa30a..6e0cbbe65fe 100644 --- a/rust/ql/test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr.ql +++ b/rust/ql/test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr.ql @@ -2,12 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances(TupleTypeRepr x, string getNumberOfFields__label, int getNumberOfFields) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfFields__label = "getNumberOfFields:" and - getNumberOfFields = x.getNumberOfFields() -} +query predicate instances(TupleTypeRepr x) { toBeTested(x) and not x.isUnknown() } query predicate getField(TupleTypeRepr x, int index, TypeRepr getField) { toBeTested(x) and not x.isUnknown() and getField = x.getField(index) diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.expected b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.expected index cc59e1cb15c..b9b58485752 100644 --- a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.expected +++ b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.expected @@ -1,6 +1,6 @@ instances -| gen_type_alias.rs:4:5:5:26 | type Point | hasExtendedCanonicalPath: | no | hasCrateOrigin: | no | hasAttributeMacroExpansion: | no | getNumberOfAttrs: | 0 | hasGenericParamList: | no | isDefault: | no | hasName: | yes | hasTypeRepr: | yes | hasTypeBoundList: | no | hasVisibility: | no | hasWhereClause: | no | -| gen_type_alias.rs:8:9:8:20 | type Output | hasExtendedCanonicalPath: | no | hasCrateOrigin: | no | hasAttributeMacroExpansion: | no | getNumberOfAttrs: | 0 | hasGenericParamList: | no | isDefault: | no | hasName: | yes | hasTypeRepr: | no | hasTypeBoundList: | no | hasVisibility: | no | hasWhereClause: | no | +| gen_type_alias.rs:4:5:5:26 | type Point | isDefault: | no | +| gen_type_alias.rs:8:9:8:20 | type Output | isDefault: | no | getExtendedCanonicalPath getCrateOrigin getAttributeMacroExpansion diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.ql b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.ql index 0cfc0006d9b..014bd119d33 100644 --- a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.ql +++ b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.ql @@ -2,48 +2,11 @@ import codeql.rust.elements import TestUtils -query predicate instances( - TypeAlias x, string hasExtendedCanonicalPath__label, string hasExtendedCanonicalPath, - string hasCrateOrigin__label, string hasCrateOrigin, string hasAttributeMacroExpansion__label, - string hasAttributeMacroExpansion, string getNumberOfAttrs__label, int getNumberOfAttrs, - string hasGenericParamList__label, string hasGenericParamList, string isDefault__label, - string isDefault, string hasName__label, string hasName, string hasTypeRepr__label, - string hasTypeRepr, string hasTypeBoundList__label, string hasTypeBoundList, - string hasVisibility__label, string hasVisibility, string hasWhereClause__label, - string hasWhereClause -) { +query predicate instances(TypeAlias x, string isDefault__label, string isDefault) { toBeTested(x) and not x.isUnknown() and - hasExtendedCanonicalPath__label = "hasExtendedCanonicalPath:" and - ( - if x.hasExtendedCanonicalPath() - then hasExtendedCanonicalPath = "yes" - else hasExtendedCanonicalPath = "no" - ) and - hasCrateOrigin__label = "hasCrateOrigin:" and - (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and - hasAttributeMacroExpansion__label = "hasAttributeMacroExpansion:" and - ( - if x.hasAttributeMacroExpansion() - then hasAttributeMacroExpansion = "yes" - else hasAttributeMacroExpansion = "no" - ) and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasGenericParamList__label = "hasGenericParamList:" and - (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and isDefault__label = "isDefault:" and - (if x.isDefault() then isDefault = "yes" else isDefault = "no") and - hasName__label = "hasName:" and - (if x.hasName() then hasName = "yes" else hasName = "no") and - hasTypeRepr__label = "hasTypeRepr:" and - (if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no") and - hasTypeBoundList__label = "hasTypeBoundList:" and - (if x.hasTypeBoundList() then hasTypeBoundList = "yes" else hasTypeBoundList = "no") and - hasVisibility__label = "hasVisibility:" and - (if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no") and - hasWhereClause__label = "hasWhereClause:" and - if x.hasWhereClause() then hasWhereClause = "yes" else hasWhereClause = "no" + if x.isDefault() then isDefault = "yes" else isDefault = "no" } query predicate getExtendedCanonicalPath(TypeAlias x, string getExtendedCanonicalPath) { diff --git a/rust/ql/test/extractor-tests/generated/TypeArg/TypeArg.expected b/rust/ql/test/extractor-tests/generated/TypeArg/TypeArg.expected index c38de158720..e628c7daee7 100644 --- a/rust/ql/test/extractor-tests/generated/TypeArg/TypeArg.expected +++ b/rust/ql/test/extractor-tests/generated/TypeArg/TypeArg.expected @@ -1,4 +1,4 @@ instances -| gen_type_arg.rs:7:11:7:13 | TypeArg | hasTypeRepr: | yes | +| gen_type_arg.rs:7:11:7:13 | TypeArg | getTypeRepr | gen_type_arg.rs:7:11:7:13 | TypeArg | gen_type_arg.rs:7:11:7:13 | u32 | diff --git a/rust/ql/test/extractor-tests/generated/TypeArg/TypeArg.ql b/rust/ql/test/extractor-tests/generated/TypeArg/TypeArg.ql index dffd1c7e8d6..57178cd8502 100644 --- a/rust/ql/test/extractor-tests/generated/TypeArg/TypeArg.ql +++ b/rust/ql/test/extractor-tests/generated/TypeArg/TypeArg.ql @@ -2,12 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances(TypeArg x, string hasTypeRepr__label, string hasTypeRepr) { - toBeTested(x) and - not x.isUnknown() and - hasTypeRepr__label = "hasTypeRepr:" and - if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no" -} +query predicate instances(TypeArg x) { toBeTested(x) and not x.isUnknown() } query predicate getTypeRepr(TypeArg x, TypeRepr getTypeRepr) { toBeTested(x) and not x.isUnknown() and getTypeRepr = x.getTypeRepr() diff --git a/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound.expected b/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound.expected index 76122292da0..e0ed9fcdd6c 100644 --- a/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound.expected +++ b/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound.expected @@ -1,5 +1,5 @@ instances -| gen_type_bound.rs:7:15:7:19 | TypeBound | isAsync: | no | isConst: | no | hasLifetime: | no | hasTypeRepr: | yes | hasUseBoundGenericArgs: | no | +| gen_type_bound.rs:7:15:7:19 | TypeBound | isAsync: | no | isConst: | no | getLifetime getTypeRepr | gen_type_bound.rs:7:15:7:19 | TypeBound | gen_type_bound.rs:7:15:7:19 | Debug | diff --git a/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound.ql b/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound.ql index e14a26d735c..e4b2b6127dc 100644 --- a/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound.ql +++ b/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound.ql @@ -3,24 +3,14 @@ import codeql.rust.elements import TestUtils query predicate instances( - TypeBound x, string isAsync__label, string isAsync, string isConst__label, string isConst, - string hasLifetime__label, string hasLifetime, string hasTypeRepr__label, string hasTypeRepr, - string hasUseBoundGenericArgs__label, string hasUseBoundGenericArgs + TypeBound x, string isAsync__label, string isAsync, string isConst__label, string isConst ) { toBeTested(x) and not x.isUnknown() and isAsync__label = "isAsync:" and (if x.isAsync() then isAsync = "yes" else isAsync = "no") and isConst__label = "isConst:" and - (if x.isConst() then isConst = "yes" else isConst = "no") and - hasLifetime__label = "hasLifetime:" and - (if x.hasLifetime() then hasLifetime = "yes" else hasLifetime = "no") and - hasTypeRepr__label = "hasTypeRepr:" and - (if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no") and - hasUseBoundGenericArgs__label = "hasUseBoundGenericArgs:" and - if x.hasUseBoundGenericArgs() - then hasUseBoundGenericArgs = "yes" - else hasUseBoundGenericArgs = "no" + if x.isConst() then isConst = "yes" else isConst = "no" } query predicate getLifetime(TypeBound x, Lifetime getLifetime) { diff --git a/rust/ql/test/extractor-tests/generated/TypeBoundList/TypeBoundList.expected b/rust/ql/test/extractor-tests/generated/TypeBoundList/TypeBoundList.expected index a842c9926e5..e195424d097 100644 --- a/rust/ql/test/extractor-tests/generated/TypeBoundList/TypeBoundList.expected +++ b/rust/ql/test/extractor-tests/generated/TypeBoundList/TypeBoundList.expected @@ -1,5 +1,5 @@ instances -| gen_type_bound_list.rs:7:15:7:27 | TypeBoundList | getNumberOfBounds: | 2 | +| gen_type_bound_list.rs:7:15:7:27 | TypeBoundList | getBound | gen_type_bound_list.rs:7:15:7:27 | TypeBoundList | 0 | gen_type_bound_list.rs:7:15:7:19 | TypeBound | | gen_type_bound_list.rs:7:15:7:27 | TypeBoundList | 1 | gen_type_bound_list.rs:7:23:7:27 | TypeBound | diff --git a/rust/ql/test/extractor-tests/generated/TypeBoundList/TypeBoundList.ql b/rust/ql/test/extractor-tests/generated/TypeBoundList/TypeBoundList.ql index 99900b675ba..8af2507e772 100644 --- a/rust/ql/test/extractor-tests/generated/TypeBoundList/TypeBoundList.ql +++ b/rust/ql/test/extractor-tests/generated/TypeBoundList/TypeBoundList.ql @@ -2,12 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances(TypeBoundList x, string getNumberOfBounds__label, int getNumberOfBounds) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfBounds__label = "getNumberOfBounds:" and - getNumberOfBounds = x.getNumberOfBounds() -} +query predicate instances(TypeBoundList x) { toBeTested(x) and not x.isUnknown() } query predicate getBound(TypeBoundList x, int index, TypeBound getBound) { toBeTested(x) and not x.isUnknown() and getBound = x.getBound(index) diff --git a/rust/ql/test/extractor-tests/generated/TypeParam/TypeParam.expected b/rust/ql/test/extractor-tests/generated/TypeParam/TypeParam.expected index 6d42fbae86a..c856ca9c69e 100644 --- a/rust/ql/test/extractor-tests/generated/TypeParam/TypeParam.expected +++ b/rust/ql/test/extractor-tests/generated/TypeParam/TypeParam.expected @@ -1,5 +1,5 @@ instances -| gen_type_param.rs:7:12:7:12 | T | getNumberOfAttrs: | 0 | hasDefaultType: | no | hasName: | yes | hasTypeBoundList: | no | +| gen_type_param.rs:7:12:7:12 | T | getAttr getDefaultType getName diff --git a/rust/ql/test/extractor-tests/generated/TypeParam/TypeParam.ql b/rust/ql/test/extractor-tests/generated/TypeParam/TypeParam.ql index 31c20f55813..61f38aab835 100644 --- a/rust/ql/test/extractor-tests/generated/TypeParam/TypeParam.ql +++ b/rust/ql/test/extractor-tests/generated/TypeParam/TypeParam.ql @@ -2,22 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - TypeParam x, string getNumberOfAttrs__label, int getNumberOfAttrs, string hasDefaultType__label, - string hasDefaultType, string hasName__label, string hasName, string hasTypeBoundList__label, - string hasTypeBoundList -) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasDefaultType__label = "hasDefaultType:" and - (if x.hasDefaultType() then hasDefaultType = "yes" else hasDefaultType = "no") and - hasName__label = "hasName:" and - (if x.hasName() then hasName = "yes" else hasName = "no") and - hasTypeBoundList__label = "hasTypeBoundList:" and - if x.hasTypeBoundList() then hasTypeBoundList = "yes" else hasTypeBoundList = "no" -} +query predicate instances(TypeParam x) { toBeTested(x) and not x.isUnknown() } query predicate getAttr(TypeParam x, int index, Attr getAttr) { toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index) diff --git a/rust/ql/test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr.expected b/rust/ql/test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr.expected index 5c4feab55f8..b4ff46aa5d0 100644 --- a/rust/ql/test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr.expected +++ b/rust/ql/test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr.expected @@ -1,3 +1,3 @@ instances -| gen_underscore_expr.rs:5:5:5:5 | _ | getNumberOfAttrs: | 0 | +| gen_underscore_expr.rs:5:5:5:5 | _ | getAttr diff --git a/rust/ql/test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr.ql b/rust/ql/test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr.ql index 58f09bb43f4..13324f21bf2 100644 --- a/rust/ql/test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr.ql +++ b/rust/ql/test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr.ql @@ -2,12 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances(UnderscoreExpr x, string getNumberOfAttrs__label, int getNumberOfAttrs) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() -} +query predicate instances(UnderscoreExpr x) { toBeTested(x) and not x.isUnknown() } query predicate getAttr(UnderscoreExpr x, int index, Attr getAttr) { toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index) diff --git a/rust/ql/test/extractor-tests/generated/Union/Union.expected b/rust/ql/test/extractor-tests/generated/Union/Union.expected index 9cad6b80520..110643aeac9 100644 --- a/rust/ql/test/extractor-tests/generated/Union/Union.expected +++ b/rust/ql/test/extractor-tests/generated/Union/Union.expected @@ -1,5 +1,5 @@ instances -| gen_union.rs:4:5:7:32 | union U | hasExtendedCanonicalPath: | no | hasCrateOrigin: | no | hasAttributeMacroExpansion: | no | getNumberOfDeriveMacroExpansions: | 0 | getNumberOfAttrs: | 0 | hasGenericParamList: | no | hasName: | yes | hasStructFieldList: | yes | hasVisibility: | no | hasWhereClause: | no | +| gen_union.rs:4:5:7:32 | union U | getExtendedCanonicalPath getCrateOrigin getAttributeMacroExpansion diff --git a/rust/ql/test/extractor-tests/generated/Union/Union.ql b/rust/ql/test/extractor-tests/generated/Union/Union.ql index a944a937360..147a8fca09e 100644 --- a/rust/ql/test/extractor-tests/generated/Union/Union.ql +++ b/rust/ql/test/extractor-tests/generated/Union/Union.ql @@ -2,47 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - Union x, string hasExtendedCanonicalPath__label, string hasExtendedCanonicalPath, - string hasCrateOrigin__label, string hasCrateOrigin, string hasAttributeMacroExpansion__label, - string hasAttributeMacroExpansion, string getNumberOfDeriveMacroExpansions__label, - int getNumberOfDeriveMacroExpansions, string getNumberOfAttrs__label, int getNumberOfAttrs, - string hasGenericParamList__label, string hasGenericParamList, string hasName__label, - string hasName, string hasStructFieldList__label, string hasStructFieldList, - string hasVisibility__label, string hasVisibility, string hasWhereClause__label, - string hasWhereClause -) { - toBeTested(x) and - not x.isUnknown() and - hasExtendedCanonicalPath__label = "hasExtendedCanonicalPath:" and - ( - if x.hasExtendedCanonicalPath() - then hasExtendedCanonicalPath = "yes" - else hasExtendedCanonicalPath = "no" - ) and - hasCrateOrigin__label = "hasCrateOrigin:" and - (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and - hasAttributeMacroExpansion__label = "hasAttributeMacroExpansion:" and - ( - if x.hasAttributeMacroExpansion() - then hasAttributeMacroExpansion = "yes" - else hasAttributeMacroExpansion = "no" - ) and - getNumberOfDeriveMacroExpansions__label = "getNumberOfDeriveMacroExpansions:" and - getNumberOfDeriveMacroExpansions = x.getNumberOfDeriveMacroExpansions() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasGenericParamList__label = "hasGenericParamList:" and - (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and - hasName__label = "hasName:" and - (if x.hasName() then hasName = "yes" else hasName = "no") and - hasStructFieldList__label = "hasStructFieldList:" and - (if x.hasStructFieldList() then hasStructFieldList = "yes" else hasStructFieldList = "no") and - hasVisibility__label = "hasVisibility:" and - (if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no") and - hasWhereClause__label = "hasWhereClause:" and - if x.hasWhereClause() then hasWhereClause = "yes" else hasWhereClause = "no" -} +query predicate instances(Union x) { toBeTested(x) and not x.isUnknown() } query predicate getExtendedCanonicalPath(Union x, string getExtendedCanonicalPath) { toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath() diff --git a/rust/ql/test/extractor-tests/generated/Use/Use.expected b/rust/ql/test/extractor-tests/generated/Use/Use.expected index 6aa50c92f01..23057c691dc 100644 --- a/rust/ql/test/extractor-tests/generated/Use/Use.expected +++ b/rust/ql/test/extractor-tests/generated/Use/Use.expected @@ -1,5 +1,5 @@ instances -| gen_use.rs:4:5:5:34 | use ...::HashMap | hasExtendedCanonicalPath: | no | hasCrateOrigin: | no | hasAttributeMacroExpansion: | no | getNumberOfAttrs: | 0 | hasUseTree: | yes | hasVisibility: | no | +| gen_use.rs:4:5:5:34 | use ...::HashMap | getExtendedCanonicalPath getCrateOrigin getAttributeMacroExpansion diff --git a/rust/ql/test/extractor-tests/generated/Use/Use.ql b/rust/ql/test/extractor-tests/generated/Use/Use.ql index 097c0ef76e5..bfce3bcc89c 100644 --- a/rust/ql/test/extractor-tests/generated/Use/Use.ql +++ b/rust/ql/test/extractor-tests/generated/Use/Use.ql @@ -2,35 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - Use x, string hasExtendedCanonicalPath__label, string hasExtendedCanonicalPath, - string hasCrateOrigin__label, string hasCrateOrigin, string hasAttributeMacroExpansion__label, - string hasAttributeMacroExpansion, string getNumberOfAttrs__label, int getNumberOfAttrs, - string hasUseTree__label, string hasUseTree, string hasVisibility__label, string hasVisibility -) { - toBeTested(x) and - not x.isUnknown() and - hasExtendedCanonicalPath__label = "hasExtendedCanonicalPath:" and - ( - if x.hasExtendedCanonicalPath() - then hasExtendedCanonicalPath = "yes" - else hasExtendedCanonicalPath = "no" - ) and - hasCrateOrigin__label = "hasCrateOrigin:" and - (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and - hasAttributeMacroExpansion__label = "hasAttributeMacroExpansion:" and - ( - if x.hasAttributeMacroExpansion() - then hasAttributeMacroExpansion = "yes" - else hasAttributeMacroExpansion = "no" - ) and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasUseTree__label = "hasUseTree:" and - (if x.hasUseTree() then hasUseTree = "yes" else hasUseTree = "no") and - hasVisibility__label = "hasVisibility:" and - if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no" -} +query predicate instances(Use x) { toBeTested(x) and not x.isUnknown() } query predicate getExtendedCanonicalPath(Use x, string getExtendedCanonicalPath) { toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath() diff --git a/rust/ql/test/extractor-tests/generated/UseBoundGenericArgs/UseBoundGenericArgs.expected b/rust/ql/test/extractor-tests/generated/UseBoundGenericArgs/UseBoundGenericArgs.expected index a7df429d1de..6bd467ca708 100644 --- a/rust/ql/test/extractor-tests/generated/UseBoundGenericArgs/UseBoundGenericArgs.expected +++ b/rust/ql/test/extractor-tests/generated/UseBoundGenericArgs/UseBoundGenericArgs.expected @@ -1,5 +1,5 @@ instances -| gen_use_bound_generic_args.rs:7:62:7:71 | UseBoundGenericArgs | getNumberOfUseBoundGenericArgs: | 3 | +| gen_use_bound_generic_args.rs:7:62:7:71 | UseBoundGenericArgs | getUseBoundGenericArg | gen_use_bound_generic_args.rs:7:62:7:71 | UseBoundGenericArgs | 0 | gen_use_bound_generic_args.rs:7:63:7:64 | 'a | | gen_use_bound_generic_args.rs:7:62:7:71 | UseBoundGenericArgs | 1 | gen_use_bound_generic_args.rs:7:67:7:67 | T | diff --git a/rust/ql/test/extractor-tests/generated/UseBoundGenericArgs/UseBoundGenericArgs.ql b/rust/ql/test/extractor-tests/generated/UseBoundGenericArgs/UseBoundGenericArgs.ql index 7179177aeb1..7147be569b9 100644 --- a/rust/ql/test/extractor-tests/generated/UseBoundGenericArgs/UseBoundGenericArgs.ql +++ b/rust/ql/test/extractor-tests/generated/UseBoundGenericArgs/UseBoundGenericArgs.ql @@ -2,15 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - UseBoundGenericArgs x, string getNumberOfUseBoundGenericArgs__label, - int getNumberOfUseBoundGenericArgs -) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfUseBoundGenericArgs__label = "getNumberOfUseBoundGenericArgs:" and - getNumberOfUseBoundGenericArgs = x.getNumberOfUseBoundGenericArgs() -} +query predicate instances(UseBoundGenericArgs x) { toBeTested(x) and not x.isUnknown() } query predicate getUseBoundGenericArg( UseBoundGenericArgs x, int index, UseBoundGenericArg getUseBoundGenericArg diff --git a/rust/ql/test/extractor-tests/generated/UseTree/UseTree.expected b/rust/ql/test/extractor-tests/generated/UseTree/UseTree.expected index 480e15b3ae1..5e59c0c9f83 100644 --- a/rust/ql/test/extractor-tests/generated/UseTree/UseTree.expected +++ b/rust/ql/test/extractor-tests/generated/UseTree/UseTree.expected @@ -1,11 +1,11 @@ instances -| gen_use_tree.rs:5:9:5:33 | ...::HashMap | isGlob: | no | hasPath: | yes | hasRename: | no | hasUseTreeList: | no | -| gen_use_tree.rs:6:9:6:27 | ...::collections::* | isGlob: | yes | hasPath: | yes | hasRename: | no | hasUseTreeList: | no | -| gen_use_tree.rs:7:9:7:46 | ...::HashMap as MyHashMap | isGlob: | no | hasPath: | yes | hasRename: | yes | hasUseTreeList: | no | -| gen_use_tree.rs:8:9:8:50 | ...::collections::{...} | isGlob: | no | hasPath: | yes | hasRename: | no | hasUseTreeList: | yes | -| gen_use_tree.rs:8:28:8:31 | self | isGlob: | no | hasPath: | yes | hasRename: | no | hasUseTreeList: | no | -| gen_use_tree.rs:8:34:8:40 | HashMap | isGlob: | no | hasPath: | yes | hasRename: | no | hasUseTreeList: | no | -| gen_use_tree.rs:8:43:8:49 | HashSet | isGlob: | no | hasPath: | yes | hasRename: | no | hasUseTreeList: | no | +| gen_use_tree.rs:5:9:5:33 | ...::HashMap | isGlob: | no | +| gen_use_tree.rs:6:9:6:27 | ...::collections::* | isGlob: | yes | +| gen_use_tree.rs:7:9:7:46 | ...::HashMap as MyHashMap | isGlob: | no | +| gen_use_tree.rs:8:9:8:50 | ...::collections::{...} | isGlob: | no | +| gen_use_tree.rs:8:28:8:31 | self | isGlob: | no | +| gen_use_tree.rs:8:34:8:40 | HashMap | isGlob: | no | +| gen_use_tree.rs:8:43:8:49 | HashSet | isGlob: | no | getPath | gen_use_tree.rs:5:9:5:33 | ...::HashMap | gen_use_tree.rs:5:9:5:33 | ...::HashMap | | gen_use_tree.rs:6:9:6:27 | ...::collections::* | gen_use_tree.rs:6:9:6:24 | ...::collections | diff --git a/rust/ql/test/extractor-tests/generated/UseTree/UseTree.ql b/rust/ql/test/extractor-tests/generated/UseTree/UseTree.ql index d7ed0484402..5f4c010c7e4 100644 --- a/rust/ql/test/extractor-tests/generated/UseTree/UseTree.ql +++ b/rust/ql/test/extractor-tests/generated/UseTree/UseTree.ql @@ -2,20 +2,11 @@ import codeql.rust.elements import TestUtils -query predicate instances( - UseTree x, string isGlob__label, string isGlob, string hasPath__label, string hasPath, - string hasRename__label, string hasRename, string hasUseTreeList__label, string hasUseTreeList -) { +query predicate instances(UseTree x, string isGlob__label, string isGlob) { toBeTested(x) and not x.isUnknown() and isGlob__label = "isGlob:" and - (if x.isGlob() then isGlob = "yes" else isGlob = "no") and - hasPath__label = "hasPath:" and - (if x.hasPath() then hasPath = "yes" else hasPath = "no") and - hasRename__label = "hasRename:" and - (if x.hasRename() then hasRename = "yes" else hasRename = "no") and - hasUseTreeList__label = "hasUseTreeList:" and - if x.hasUseTreeList() then hasUseTreeList = "yes" else hasUseTreeList = "no" + if x.isGlob() then isGlob = "yes" else isGlob = "no" } query predicate getPath(UseTree x, Path getPath) { diff --git a/rust/ql/test/extractor-tests/generated/UseTreeList/UseTreeList.expected b/rust/ql/test/extractor-tests/generated/UseTreeList/UseTreeList.expected index 65ebdac21c2..451bd9daf4a 100644 --- a/rust/ql/test/extractor-tests/generated/UseTreeList/UseTreeList.expected +++ b/rust/ql/test/extractor-tests/generated/UseTreeList/UseTreeList.expected @@ -1,5 +1,5 @@ instances -| gen_use_tree_list.rs:7:14:7:21 | UseTreeList | getNumberOfUseTrees: | 2 | +| gen_use_tree_list.rs:7:14:7:21 | UseTreeList | getUseTree | gen_use_tree_list.rs:7:14:7:21 | UseTreeList | 0 | gen_use_tree_list.rs:7:15:7:16 | fs | | gen_use_tree_list.rs:7:14:7:21 | UseTreeList | 1 | gen_use_tree_list.rs:7:19:7:20 | io | diff --git a/rust/ql/test/extractor-tests/generated/UseTreeList/UseTreeList.ql b/rust/ql/test/extractor-tests/generated/UseTreeList/UseTreeList.ql index 9f2dac1fc16..5e0058df86d 100644 --- a/rust/ql/test/extractor-tests/generated/UseTreeList/UseTreeList.ql +++ b/rust/ql/test/extractor-tests/generated/UseTreeList/UseTreeList.ql @@ -2,12 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances(UseTreeList x, string getNumberOfUseTrees__label, int getNumberOfUseTrees) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfUseTrees__label = "getNumberOfUseTrees:" and - getNumberOfUseTrees = x.getNumberOfUseTrees() -} +query predicate instances(UseTreeList x) { toBeTested(x) and not x.isUnknown() } query predicate getUseTree(UseTreeList x, int index, UseTree getUseTree) { toBeTested(x) and not x.isUnknown() and getUseTree = x.getUseTree(index) diff --git a/rust/ql/test/extractor-tests/generated/Variant/Variant.expected b/rust/ql/test/extractor-tests/generated/Variant/Variant.expected index a7c1184b925..ad970afe530 100644 --- a/rust/ql/test/extractor-tests/generated/Variant/Variant.expected +++ b/rust/ql/test/extractor-tests/generated/Variant/Variant.expected @@ -1,7 +1,7 @@ instances -| gen_variant.rs:7:14:7:14 | A | hasExtendedCanonicalPath: | no | hasCrateOrigin: | no | getNumberOfAttrs: | 0 | hasDiscriminant: | no | hasFieldList: | no | hasName: | yes | hasVisibility: | no | -| gen_variant.rs:7:17:7:22 | B | hasExtendedCanonicalPath: | no | hasCrateOrigin: | no | getNumberOfAttrs: | 0 | hasDiscriminant: | no | hasFieldList: | yes | hasName: | yes | hasVisibility: | no | -| gen_variant.rs:7:25:7:36 | C | hasExtendedCanonicalPath: | no | hasCrateOrigin: | no | getNumberOfAttrs: | 0 | hasDiscriminant: | no | hasFieldList: | yes | hasName: | yes | hasVisibility: | no | +| gen_variant.rs:7:14:7:14 | A | +| gen_variant.rs:7:17:7:22 | B | +| gen_variant.rs:7:25:7:36 | C | getExtendedCanonicalPath getCrateOrigin getAttr diff --git a/rust/ql/test/extractor-tests/generated/Variant/Variant.ql b/rust/ql/test/extractor-tests/generated/Variant/Variant.ql index ccd2f09881c..088f610637a 100644 --- a/rust/ql/test/extractor-tests/generated/Variant/Variant.ql +++ b/rust/ql/test/extractor-tests/generated/Variant/Variant.ql @@ -2,34 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - Variant x, string hasExtendedCanonicalPath__label, string hasExtendedCanonicalPath, - string hasCrateOrigin__label, string hasCrateOrigin, string getNumberOfAttrs__label, - int getNumberOfAttrs, string hasDiscriminant__label, string hasDiscriminant, - string hasFieldList__label, string hasFieldList, string hasName__label, string hasName, - string hasVisibility__label, string hasVisibility -) { - toBeTested(x) and - not x.isUnknown() and - hasExtendedCanonicalPath__label = "hasExtendedCanonicalPath:" and - ( - if x.hasExtendedCanonicalPath() - then hasExtendedCanonicalPath = "yes" - else hasExtendedCanonicalPath = "no" - ) and - hasCrateOrigin__label = "hasCrateOrigin:" and - (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasDiscriminant__label = "hasDiscriminant:" and - (if x.hasDiscriminant() then hasDiscriminant = "yes" else hasDiscriminant = "no") and - hasFieldList__label = "hasFieldList:" and - (if x.hasFieldList() then hasFieldList = "yes" else hasFieldList = "no") and - hasName__label = "hasName:" and - (if x.hasName() then hasName = "yes" else hasName = "no") and - hasVisibility__label = "hasVisibility:" and - if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no" -} +query predicate instances(Variant x) { toBeTested(x) and not x.isUnknown() } query predicate getExtendedCanonicalPath(Variant x, string getExtendedCanonicalPath) { toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath() diff --git a/rust/ql/test/extractor-tests/generated/VariantList/VariantList.expected b/rust/ql/test/extractor-tests/generated/VariantList/VariantList.expected index 61ec4edbab7..9642b1fe308 100644 --- a/rust/ql/test/extractor-tests/generated/VariantList/VariantList.expected +++ b/rust/ql/test/extractor-tests/generated/VariantList/VariantList.expected @@ -1,5 +1,5 @@ instances -| gen_variant_list.rs:7:12:7:22 | VariantList | getNumberOfVariants: | 3 | +| gen_variant_list.rs:7:12:7:22 | VariantList | getVariant | gen_variant_list.rs:7:12:7:22 | VariantList | 0 | gen_variant_list.rs:7:14:7:14 | A | | gen_variant_list.rs:7:12:7:22 | VariantList | 1 | gen_variant_list.rs:7:17:7:17 | B | diff --git a/rust/ql/test/extractor-tests/generated/VariantList/VariantList.ql b/rust/ql/test/extractor-tests/generated/VariantList/VariantList.ql index c858f92bfab..85ecb0fe409 100644 --- a/rust/ql/test/extractor-tests/generated/VariantList/VariantList.ql +++ b/rust/ql/test/extractor-tests/generated/VariantList/VariantList.ql @@ -2,12 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances(VariantList x, string getNumberOfVariants__label, int getNumberOfVariants) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfVariants__label = "getNumberOfVariants:" and - getNumberOfVariants = x.getNumberOfVariants() -} +query predicate instances(VariantList x) { toBeTested(x) and not x.isUnknown() } query predicate getVariant(VariantList x, int index, Variant getVariant) { toBeTested(x) and not x.isUnknown() and getVariant = x.getVariant(index) diff --git a/rust/ql/test/extractor-tests/generated/Visibility/Visibility.expected b/rust/ql/test/extractor-tests/generated/Visibility/Visibility.expected index f9c6ebbeb7a..daae8776ad7 100644 --- a/rust/ql/test/extractor-tests/generated/Visibility/Visibility.expected +++ b/rust/ql/test/extractor-tests/generated/Visibility/Visibility.expected @@ -1,3 +1,3 @@ instances -| gen_visibility.rs:7:7:7:9 | Visibility | hasPath: | no | +| gen_visibility.rs:7:7:7:9 | Visibility | getPath diff --git a/rust/ql/test/extractor-tests/generated/Visibility/Visibility.ql b/rust/ql/test/extractor-tests/generated/Visibility/Visibility.ql index d071e76cf33..651d0aecb2f 100644 --- a/rust/ql/test/extractor-tests/generated/Visibility/Visibility.ql +++ b/rust/ql/test/extractor-tests/generated/Visibility/Visibility.ql @@ -2,12 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances(Visibility x, string hasPath__label, string hasPath) { - toBeTested(x) and - not x.isUnknown() and - hasPath__label = "hasPath:" and - if x.hasPath() then hasPath = "yes" else hasPath = "no" -} +query predicate instances(Visibility x) { toBeTested(x) and not x.isUnknown() } query predicate getPath(Visibility x, Path getPath) { toBeTested(x) and not x.isUnknown() and getPath = x.getPath() diff --git a/rust/ql/test/extractor-tests/generated/WhereClause/WhereClause.expected b/rust/ql/test/extractor-tests/generated/WhereClause/WhereClause.expected index cfa28e51e44..8dbec29fd90 100644 --- a/rust/ql/test/extractor-tests/generated/WhereClause/WhereClause.expected +++ b/rust/ql/test/extractor-tests/generated/WhereClause/WhereClause.expected @@ -1,4 +1,4 @@ instances -| gen_where_clause.rs:7:21:7:34 | WhereClause | getNumberOfPredicates: | 1 | +| gen_where_clause.rs:7:21:7:34 | WhereClause | getPredicate | gen_where_clause.rs:7:21:7:34 | WhereClause | 0 | gen_where_clause.rs:7:27:7:34 | WherePred | diff --git a/rust/ql/test/extractor-tests/generated/WhereClause/WhereClause.ql b/rust/ql/test/extractor-tests/generated/WhereClause/WhereClause.ql index df436c29f57..8890de0efaf 100644 --- a/rust/ql/test/extractor-tests/generated/WhereClause/WhereClause.ql +++ b/rust/ql/test/extractor-tests/generated/WhereClause/WhereClause.ql @@ -2,14 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - WhereClause x, string getNumberOfPredicates__label, int getNumberOfPredicates -) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfPredicates__label = "getNumberOfPredicates:" and - getNumberOfPredicates = x.getNumberOfPredicates() -} +query predicate instances(WhereClause x) { toBeTested(x) and not x.isUnknown() } query predicate getPredicate(WhereClause x, int index, WherePred getPredicate) { toBeTested(x) and not x.isUnknown() and getPredicate = x.getPredicate(index) diff --git a/rust/ql/test/extractor-tests/generated/WherePred/WherePred.expected b/rust/ql/test/extractor-tests/generated/WherePred/WherePred.expected index 8d5dc840361..4980b912b86 100644 --- a/rust/ql/test/extractor-tests/generated/WherePred/WherePred.expected +++ b/rust/ql/test/extractor-tests/generated/WherePred/WherePred.expected @@ -1,6 +1,6 @@ instances -| gen_where_pred.rs:7:36:7:43 | WherePred | hasGenericParamList: | no | hasLifetime: | no | hasTypeRepr: | yes | hasTypeBoundList: | yes | -| gen_where_pred.rs:7:46:7:53 | WherePred | hasGenericParamList: | no | hasLifetime: | no | hasTypeRepr: | yes | hasTypeBoundList: | yes | +| gen_where_pred.rs:7:36:7:43 | WherePred | +| gen_where_pred.rs:7:46:7:53 | WherePred | getGenericParamList getLifetime getTypeRepr diff --git a/rust/ql/test/extractor-tests/generated/WherePred/WherePred.ql b/rust/ql/test/extractor-tests/generated/WherePred/WherePred.ql index 7e18fec77c4..3d1ecb7339d 100644 --- a/rust/ql/test/extractor-tests/generated/WherePred/WherePred.ql +++ b/rust/ql/test/extractor-tests/generated/WherePred/WherePred.ql @@ -2,22 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - WherePred x, string hasGenericParamList__label, string hasGenericParamList, - string hasLifetime__label, string hasLifetime, string hasTypeRepr__label, string hasTypeRepr, - string hasTypeBoundList__label, string hasTypeBoundList -) { - toBeTested(x) and - not x.isUnknown() and - hasGenericParamList__label = "hasGenericParamList:" and - (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and - hasLifetime__label = "hasLifetime:" and - (if x.hasLifetime() then hasLifetime = "yes" else hasLifetime = "no") and - hasTypeRepr__label = "hasTypeRepr:" and - (if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no") and - hasTypeBoundList__label = "hasTypeBoundList:" and - if x.hasTypeBoundList() then hasTypeBoundList = "yes" else hasTypeBoundList = "no" -} +query predicate instances(WherePred x) { toBeTested(x) and not x.isUnknown() } query predicate getGenericParamList(WherePred x, GenericParamList getGenericParamList) { toBeTested(x) and not x.isUnknown() and getGenericParamList = x.getGenericParamList() diff --git a/rust/ql/test/extractor-tests/generated/WhileExpr/WhileExpr.expected b/rust/ql/test/extractor-tests/generated/WhileExpr/WhileExpr.expected index 7ec0c386713..8ff736a0af0 100644 --- a/rust/ql/test/extractor-tests/generated/WhileExpr/WhileExpr.expected +++ b/rust/ql/test/extractor-tests/generated/WhileExpr/WhileExpr.expected @@ -1,5 +1,5 @@ instances -| gen_while_expr.rs:7:5:9:5 | while ... { ... } | hasLabel: | no | hasLoopBody: | yes | getNumberOfAttrs: | 0 | hasCondition: | yes | +| gen_while_expr.rs:7:5:9:5 | while ... { ... } | getLabel getLoopBody | gen_while_expr.rs:7:5:9:5 | while ... { ... } | gen_while_expr.rs:7:18:9:5 | { ... } | diff --git a/rust/ql/test/extractor-tests/generated/WhileExpr/WhileExpr.ql b/rust/ql/test/extractor-tests/generated/WhileExpr/WhileExpr.ql index c33cb0b915d..67a0dc562ad 100644 --- a/rust/ql/test/extractor-tests/generated/WhileExpr/WhileExpr.ql +++ b/rust/ql/test/extractor-tests/generated/WhileExpr/WhileExpr.ql @@ -2,22 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - WhileExpr x, string hasLabel__label, string hasLabel, string hasLoopBody__label, - string hasLoopBody, string getNumberOfAttrs__label, int getNumberOfAttrs, - string hasCondition__label, string hasCondition -) { - toBeTested(x) and - not x.isUnknown() and - hasLabel__label = "hasLabel:" and - (if x.hasLabel() then hasLabel = "yes" else hasLabel = "no") and - hasLoopBody__label = "hasLoopBody:" and - (if x.hasLoopBody() then hasLoopBody = "yes" else hasLoopBody = "no") and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasCondition__label = "hasCondition:" and - if x.hasCondition() then hasCondition = "yes" else hasCondition = "no" -} +query predicate instances(WhileExpr x) { toBeTested(x) and not x.isUnknown() } query predicate getLabel(WhileExpr x, Label getLabel) { toBeTested(x) and not x.isUnknown() and getLabel = x.getLabel() diff --git a/rust/ql/test/extractor-tests/generated/YeetExpr/YeetExpr.expected b/rust/ql/test/extractor-tests/generated/YeetExpr/YeetExpr.expected index 6b644bf82e0..a77777c99fd 100644 --- a/rust/ql/test/extractor-tests/generated/YeetExpr/YeetExpr.expected +++ b/rust/ql/test/extractor-tests/generated/YeetExpr/YeetExpr.expected @@ -1,5 +1,5 @@ instances -| gen_yeet_expr.rs:6:8:6:36 | YeetExpr | getNumberOfAttrs: | 0 | hasExpr: | yes | +| gen_yeet_expr.rs:6:8:6:36 | YeetExpr | getAttr getExpr | gen_yeet_expr.rs:6:8:6:36 | YeetExpr | gen_yeet_expr.rs:6:16:6:36 | "index out of bounds" | diff --git a/rust/ql/test/extractor-tests/generated/YeetExpr/YeetExpr.ql b/rust/ql/test/extractor-tests/generated/YeetExpr/YeetExpr.ql index 18b65e5d174..88d4e570a1e 100644 --- a/rust/ql/test/extractor-tests/generated/YeetExpr/YeetExpr.ql +++ b/rust/ql/test/extractor-tests/generated/YeetExpr/YeetExpr.ql @@ -2,17 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - YeetExpr x, string getNumberOfAttrs__label, int getNumberOfAttrs, string hasExpr__label, - string hasExpr -) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasExpr__label = "hasExpr:" and - if x.hasExpr() then hasExpr = "yes" else hasExpr = "no" -} +query predicate instances(YeetExpr x) { toBeTested(x) and not x.isUnknown() } query predicate getAttr(YeetExpr x, int index, Attr getAttr) { toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index) diff --git a/rust/ql/test/extractor-tests/generated/YieldExpr/YieldExpr.expected b/rust/ql/test/extractor-tests/generated/YieldExpr/YieldExpr.expected index c2513181c84..da73c1be671 100644 --- a/rust/ql/test/extractor-tests/generated/YieldExpr/YieldExpr.expected +++ b/rust/ql/test/extractor-tests/generated/YieldExpr/YieldExpr.expected @@ -1,5 +1,5 @@ instances -| gen_yield_expr.rs:7:13:7:19 | YieldExpr | getNumberOfAttrs: | 0 | hasExpr: | yes | +| gen_yield_expr.rs:7:13:7:19 | YieldExpr | getAttr getExpr | gen_yield_expr.rs:7:13:7:19 | YieldExpr | gen_yield_expr.rs:7:19:7:19 | 1 | diff --git a/rust/ql/test/extractor-tests/generated/YieldExpr/YieldExpr.ql b/rust/ql/test/extractor-tests/generated/YieldExpr/YieldExpr.ql index 3d684a51dbf..68281d39d9e 100644 --- a/rust/ql/test/extractor-tests/generated/YieldExpr/YieldExpr.ql +++ b/rust/ql/test/extractor-tests/generated/YieldExpr/YieldExpr.ql @@ -2,17 +2,7 @@ import codeql.rust.elements import TestUtils -query predicate instances( - YieldExpr x, string getNumberOfAttrs__label, int getNumberOfAttrs, string hasExpr__label, - string hasExpr -) { - toBeTested(x) and - not x.isUnknown() and - getNumberOfAttrs__label = "getNumberOfAttrs:" and - getNumberOfAttrs = x.getNumberOfAttrs() and - hasExpr__label = "hasExpr:" and - if x.hasExpr() then hasExpr = "yes" else hasExpr = "no" -} +query predicate instances(YieldExpr x) { toBeTested(x) and not x.isUnknown() } query predicate getAttr(YieldExpr x, int index, Attr getAttr) { toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index) diff --git a/swift/ql/.generated.list b/swift/ql/.generated.list index 90d81e9a1bd..f8da120e0d4 100644 --- a/swift/ql/.generated.list +++ b/swift/ql/.generated.list @@ -1032,37 +1032,37 @@ lib/codeql/swift/generated/type/UnownedStorageType.qll bbab372902a625c16b2d9a058 lib/codeql/swift/generated/type/UnresolvedType.qll 3b99e19ca7177619fb79e6e8511df915811b7b9078c0bc9ae47cf3b79e923407 b715e01583738b5e8fb2f6640d8f390bad8f5ad6d8c25ad771dfabbe5736bfaa lib/codeql/swift/generated/type/VariadicSequenceType.qll 7ece2c953e24d1c51715610f2813bd97f6d9fc6e58e5df0aacadad31e1fd1d8f be0005d973fd7c4c937fc340711fafe7ceba592ac407b88731bc35a1c2800aeb lib/codeql/swift/generated/type/WeakStorageType.qll d46b67f2b7bcc8aa7599e38506e91c219f894df4668ff1f0b5b66c1858040f5b c8e34ec9df085d938e36492d172fbf84ca56fc9d805713b8ada92e1b4c7bef54 -test/extractor-tests/generated/AvailabilityInfo/AvailabilityInfo.ql 6f199a90eff4f349ce695c84eeed2c64aa442a85cc1f1df5fe422b521d292016 967b1a60e51815af1d828528f2db568d6c88bfac2647211bad80492566f223f3 +test/extractor-tests/generated/AvailabilityInfo/AvailabilityInfo.ql 0bb0cfe3f8c38af3b870f8c404c16a5715e80d5ea8fd7939cc13032d7b824809 142ae1e76138b287aa66e091683aae545d139ef2971624e2dfdd3ea454bc2d05 test/extractor-tests/generated/Comment/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/Diagnostics/Diagnostics.ql c1f8be2c283e13c1a4dadaa008e42f660ea09d9ee1de22b0e8493ef76384546e d84efa40eaecbce6b928a5b235e10bf1e4409a9d0778c365ec19d2fade7ab3ab test/extractor-tests/generated/File/File.ql a1385ef2080e04e8757f61b8e1d0129df9f955edf03fbb3b83cc9cb5498b4e95 0364d8c7f108d01b2641f996efedab7084956307e875e6bc078ea677d04267e0 -test/extractor-tests/generated/KeyPathComponent/KeyPathComponent.ql 502cdf0e7f31922cb5cb4ab9904a4ce0d6c8f135f087f116de7822488f033eef 0b4ca2b92f850d51abbcccee6733d702620b32e8ca8ef99604000325b2a02fe7 +test/extractor-tests/generated/KeyPathComponent/KeyPathComponent.ql 3fa617f8ed1b308d0c56f429ee8abe6d33ef60bf57d87f6dc89fdc8fe969a102 c2fa3153077dbe9e0fc608524dc03c82ff4ed460364d341ee6a817b0d75291c3 test/extractor-tests/generated/OtherAvailabilitySpec/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/PlatformVersionAvailabilitySpec/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d -test/extractor-tests/generated/decl/Accessor/Accessor.ql ae47bd44cd76d59a24307c02eef594880c5c2c5eb07730d3328218c52e6d7dee 6ccba4549134280101e208961947273586976155b8df0f2c942b29a0a71ab166 -test/extractor-tests/generated/decl/AssociatedTypeDecl/AssociatedTypeDecl.ql f3b9a5297b172476edd97088fb332d1e8abb590ed9f6796e7a4a490cd76fbd82 fef7c5b8eb37cd04a5e1ef5581f0514738568230788c16a75bc22434eecd5b6d -test/extractor-tests/generated/decl/CapturedDecl/CapturedDecl.ql 6a87d0369a845512af295909cdbfe2b1a4f87e9a0b6a91a15ef563b2459cb5fb 44a1560eaae49bf4cd060187e6da4088b4536f085c945c3916dd24cb9df3756a -test/extractor-tests/generated/decl/ClassDecl/ClassDecl.ql fe7d77e072686225c70b15c0c3dfdafde1680c758095dc814f483ff70f9a99ef 084c352b7019bc84463e4b6a46a7633987a3b75b26145698eba82634549168ee -test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl.ql 4b003a42c171041ab0719e66cc9f398653600bdbaace200f3b96f508b8776209 ca793775f296c723d396bd0d1ae9327d94c3837127b5407defd8cbd598eff6b9 +test/extractor-tests/generated/decl/Accessor/Accessor.ql 74d288273f26d2551ed661f0c729ae561c76c21976c3f539d4ba135d92d3aba5 e237e6ca8db21afea6c96558aae873ede63feaa81b0e6038234ab7856a0d95d4 +test/extractor-tests/generated/decl/AssociatedTypeDecl/AssociatedTypeDecl.ql 55a78a6b96a17532178a39bd39aa4df23295f98019bb00de041ba15dfd4f84d9 51dbcd86203d5d031d748f77943a81c2c50de4ff559af20a4a1a682a19978d4f +test/extractor-tests/generated/decl/CapturedDecl/CapturedDecl.ql fd62be6c38d39f371c20e8c2f233e37a9da5aa234588920634f5db67e8beb3bd d51d35d4fd6a21cd596e064e0221d0c86e36312412a9bd4e64f431c123f3019a +test/extractor-tests/generated/decl/ClassDecl/ClassDecl.ql d5fa7f68307e2e3e7ad060a125bda148e4a28f6acbef08a1a975bbf9ba947641 46d1e4f801414f1c869601dc706e41393e5fcd399e51da593c1e58737f6ff427 +test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl.ql 936ac4aa52a55bd5bb4c75c117fffcc00208b9f502ff7ee05acbaad7d48a52fb d80346fe34d40910f5ecdb33d7266b6e4d1ec79f8d767c7da5e2ab780f201457 test/extractor-tests/generated/decl/Deinitializer/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d -test/extractor-tests/generated/decl/EnumDecl/EnumCaseDecl.ql 9ec947283ea1369cc0e22c767524e36c62ee1effc198b392b6142f9434918f03 272337f27bd6299737242a57ef06e0ab7b4fe542156e01030fca5614933c07bd -test/extractor-tests/generated/decl/EnumDecl/EnumDecl.ql ec9d008ff7683c76cf3574d24e499d687ffe18ca966202be8e55475895bf30c1 2fb78d8e466d4f3ec3daf8bfa41e8aba89387e2a7a7464341e3a52131ecb5632 -test/extractor-tests/generated/decl/EnumDecl/EnumElementDecl.ql f163fb082c06fa7d1d1f68b6b586bc597e0366ad8761c29cdd7506c3d45a5d03 eec3a2f7444bb766dea8d22ce3a660cf660b87477db8519d5ba2f498cb361397 -test/extractor-tests/generated/decl/ExtensionDecl/ExtensionDecl.ql 6cfdfbe68b1cc3c31b61475c88b884dc10160fe1da26179e6394f6c03a542dda 511da6c1e4130c1af977452d2e9d7b0a89dac5312009735bec32ab0bc68c4660 +test/extractor-tests/generated/decl/EnumDecl/EnumCaseDecl.ql 7436bb7dfaa471f5a21ea2e3faba97d61bf53f930720999abdcc6745a65f0a1a 0241b2bb07c17136f6099185f65ea1266cd912296dfe481dce30eb9e3d1dd23f +test/extractor-tests/generated/decl/EnumDecl/EnumDecl.ql 47f20279f49388a4850df4f5ee61634e30beed58567eff891688c09942862ec2 8e11af1ceb07cab9738ffb25ac877ced712d1883a6514de5e8895cd1809a7bd8 +test/extractor-tests/generated/decl/EnumDecl/EnumElementDecl.ql 16caf5b014dea42a36b23eee6932c0818d94b1416e151ce46ba06a1fd2fb73ba cac704575b50613c8f8f297ce37c6d09ef943c94df4289643a4496103ac8388e +test/extractor-tests/generated/decl/ExtensionDecl/ExtensionDecl.ql 7293da617df8d12dae74a8c7a97230d6b34b64d0afc8629988eac09dde8bcbc6 56f1e7edf6424f14ade4b99b6e1e93fbdf678e300367c07200230b640bf8d358 test/extractor-tests/generated/decl/GenericTypeParamDecl/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d -test/extractor-tests/generated/decl/IfConfigDecl/IfConfigDecl.ql 014fbec10916b7b7f19c54e02c2c853a08dee971b8ed1d90d2cdba6729eda7e4 ab736878f14e3ad2658591d301fce3bbe9cd3036c396ff3b836b7ba5cbf3d1d3 -test/extractor-tests/generated/decl/ImportDecl/ImportDecl.ql cce94d0eeff92d5323aaa02a6faf3293c7ff3d54eb68183942b484d351f741b8 c442eec49ae84e5928013a6e6418d2bece51daeaa8cc7f3191bdf69e89409aac +test/extractor-tests/generated/decl/IfConfigDecl/IfConfigDecl.ql b33916c742a97ea687a46aa337738666a4cf4854b394e3296582be0e8f0b7fb3 d1b4caf8bf04af0f11685f6381e52ca62dffbb6a50256be78dd686bf0a53df1d +test/extractor-tests/generated/decl/ImportDecl/ImportDecl.ql d5d5475363155fad37fd3f60a8eb22c324b8af52a91c065ee5fffe0f855a3b03 ac642144ecd2c5fbdfe628a88394646e5047d0db284d83b6a449654545456286 test/extractor-tests/generated/decl/InfixOperatorDecl/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/decl/Initializer/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d -test/extractor-tests/generated/decl/MacroDecl/MacroDecl.ql c9f9721356e659affa7cd868a1974dd5df11a323f0e0763a0c1ae7a5651d4baf e1443de1040786c4e79ed4c4477b30643d51712a7e2900197b5194bb8c3bba62 -test/extractor-tests/generated/decl/MacroDecl/MacroRole.ql 53f52161bf7734b61164acc1312fb0ba2c95d8e00b855bf63284e3f7366860fe 0fe47abd9ae26b82527e3dd812d0c6f5666fa23deccb7013effefdace7ab60a8 -test/extractor-tests/generated/decl/ModuleDecl/ModuleDecl.ql 639397528c54774decbd4ae3c0dd39e27514a2c44c5c3f3c2b7e086fd682ea23 0988e38a30eaa20adbd474f4ca6222b4dd4ec96a661d7658158a0249a7944102 -test/extractor-tests/generated/decl/NamedFunction/NamedFunction.ql d6da7228a3db42d82fd8abfeb48242088c9c7bc60bd61fc66f17712a49e6294f 6a90aa7263ac62bb1f3aa169396032947619e1985ae0a8c52fc0b194c005cdb9 -test/extractor-tests/generated/decl/OpaqueTypeDecl/OpaqueTypeDecl.ql bb86d80f67c2011a780e981d6219de46f97e5237c7abc964a744e36b943a3e3d 045148b344759060166157277de19a71f3ac9d74e35a9c839294ee51f6e32cec -test/extractor-tests/generated/decl/ParamDecl/ParamDecl.ql d66a29d906e70d82c50ebe27520448961bfde2355db50fa6579c74afc29fa894 37b7e4f112462d55f703453f6b4d68669173992ddb33ae1a271f537c1e4e7c6f +test/extractor-tests/generated/decl/MacroDecl/MacroDecl.ql 61f092d4ed5972283b3eb0eeec81c8f299496dc548a98dca56a1aadaf8248d1d b9cd637cb0f6f34d8d0a4473f2c212a0534d49891d55593758bb03f8d225f32a +test/extractor-tests/generated/decl/MacroDecl/MacroRole.ql 7ab0dc211663c1b09a54ccbee7d6be94ffa45f420b383d2e2f22b7ccfb8d7a48 92296b89fccf6aebe877e67796885bedd809ebb470f23f48f98b27c2922c4ba2 +test/extractor-tests/generated/decl/ModuleDecl/ModuleDecl.ql 63a41a3b393b29d19752379fe29f26fe649dad2927836e24832e07c503d092a6 927fa4056a5d7c65803f7baa1216e6bef9b3b6a223c4a2bb50f2a6a31580db6a +test/extractor-tests/generated/decl/NamedFunction/NamedFunction.ql f3d080cc8ed9c0f1753f20a21d700e0f95549510d8246971dc52a6ddcf2ee385 95cf0a0789df14593348b40ccfbce27b728eff368ffebb8137efc59065cd543d +test/extractor-tests/generated/decl/OpaqueTypeDecl/OpaqueTypeDecl.ql 85b041e1f791b40ff3d3c58c79e017cebf9ef535ea3d576984b7c093f25aa95b 9fcf314b02ac95fbd2c0e5fc95dc48c16522c74def57f5647dd5ad7e80f7c2c1 +test/extractor-tests/generated/decl/ParamDecl/ParamDecl.ql cc9d89731f7a5ecc2267923268e2d8046aa3f0eb9556c6a12e53b541347f45a4 6d06279172ff2c04be0f39293a2e9a9de5e41ff1efffd41a67d5a921e1afe9ea test/extractor-tests/generated/decl/PatternBindingDecl/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/decl/PostfixOperatorDecl/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d -test/extractor-tests/generated/decl/PoundDiagnosticDecl/PoundDiagnosticDecl.ql 2c1b4957764602352f820ce3fd3bacb80b0b9a3aa04d2b077ce7f20553c3958c ba28928fd8caa3f8b8f85b73fbb0d926120bc497fbfda4088795cdf45a78b901 +test/extractor-tests/generated/decl/PoundDiagnosticDecl/PoundDiagnosticDecl.ql bf730c1d84c4f6ac67f46962849bf38c4442bddb1dd70c379735ba889171d097 d58ce712bfd18d470f00c8ab7c023285fa651ab8f4f8dc6bc6c5f33df4de577b test/extractor-tests/generated/decl/PrecedenceGroupDecl/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/decl/PrefixOperatorDecl/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/decl/ProtocolDecl/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d @@ -1070,7 +1070,7 @@ test/extractor-tests/generated/decl/StructDecl/MISSING_SOURCE.txt 35fb32ea539315 test/extractor-tests/generated/decl/SubscriptDecl/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/decl/TopLevelCodeDecl/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/decl/TypeAliasDecl/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d -test/extractor-tests/generated/expr/AppliedPropertyWrapperExpr/AppliedPropertyWrapperExpr.ql 88a9ba46c3437e48cd14d4190ae2e5603e1c50f52df49b0fb3095db591494d7b 4890daf58ac006f2023f8928dd32a93b2add05ce2b8008110f67a2dcf11ccde2 +test/extractor-tests/generated/expr/AppliedPropertyWrapperExpr/AppliedPropertyWrapperExpr.ql 612ed1b62baed51cb74ea682512de8042c71cc14c99f966f8de33c65c8be7cdf 390197357690dd42d23ee5f0670f1183139cfbdd63f67c7430dd62c51e5d9426 test/extractor-tests/generated/expr/Argument/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/expr/ArrayExpr/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/expr/AssignExpr/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d @@ -1082,56 +1082,56 @@ test/extractor-tests/generated/expr/CallExpr/MISSING_SOURCE.txt 35fb32ea5393152e test/extractor-tests/generated/expr/CaptureListExpr/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/expr/CoerceExpr/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/expr/ConditionalCheckedCastExpr/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d -test/extractor-tests/generated/expr/CopyExpr/ConsumeExpr.ql e06b95ffab44f50ef3c44803879bac739bdf3ecddaed64afc1f2c17a8136dcfc 07c7dfb15adeb56c2e6d8d8b8f237a313f48af6aa47d7a48069687187836a94a -test/extractor-tests/generated/expr/CopyExpr/CopyExpr.ql a78cb132bcbf2c9b4c1a3ad8c1c961915ad273869b80b797a772cae8033dc0a2 492672964a3cc0f53c0233d5392ce6fc1fa577246177ae6cafcb83918e1045bd +test/extractor-tests/generated/expr/CopyExpr/ConsumeExpr.ql bb2fc1efbc7ff3abe7cd812f2c906607307c30d160412e1c8be4b6162c12566c ac8a2623b7dfa1b5b406cb6e47d022e341ec3400fa22ab3017692a88cb497c51 +test/extractor-tests/generated/expr/CopyExpr/CopyExpr.ql 423e4b23c2a0b7166fd53457fcad656391f09c6a06e9a9f865ecebdf5b227ff1 9a55d96e7665cfac9adf0477119cb532645645f0a3181c5c5a16bf99f3b84ebc test/extractor-tests/generated/expr/DeclRefExpr/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/expr/DefaultArgumentExpr/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/expr/DictionaryExpr/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/expr/DiscardAssignmentExpr/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/expr/DotSyntaxBaseIgnoredExpr/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d -test/extractor-tests/generated/expr/DotSyntaxCallExpr/DotSyntaxCallExpr.ql 31786adbee4984621937005dc268026d252dde7bf4d8de1889fef90e4db92250 3b0f2a276de100fa20f261091e00bc6c3ae49f09cfcf388662bb31d136634efa -test/extractor-tests/generated/expr/DynamicLookupExpr/DynamicLookupExpr.ql 4f8f20e27e34b1fcc57249621987339d9b0789b51e3e491842bbae82a0e20ff7 109968fd71a44c98231c555b8af53d15832ff1accf1a63429b44a1270538a63d +test/extractor-tests/generated/expr/DotSyntaxCallExpr/DotSyntaxCallExpr.ql 55a98af29e0f0ddc8b57b8e5a4c31bd83cd3c00effe096081f0ad842c909ad72 3d6122bd86461e28aa4712d3733d0fa6836554abed51cc2017d6569fd6c08103 +test/extractor-tests/generated/expr/DynamicLookupExpr/DynamicLookupExpr.ql d8c376e073a24922a0f5b41def0832813771dd20f2ff57af334120d8b685914e a3a5a93f213f3212545dde703b163aa61894f0c2c59b39aa1ad57ccf203471ac test/extractor-tests/generated/expr/DynamicTypeExpr/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d -test/extractor-tests/generated/expr/EnumIsCaseExpr/EnumIsCaseExpr.ql cc82c780010a55b054b2a89b7721b593820659fe1333db491c4e3075245d0aa8 8c5ded1ed9a014f21065acb3a730b8085fb8fdaa29aed0637350b95718c13696 +test/extractor-tests/generated/expr/EnumIsCaseExpr/EnumIsCaseExpr.ql 7e9942e6cf4bbd72405b4f1dff3c5bc0f66940117e992bce151e1fa2fca2237a b033e79c3b2d9a776c95ca0ea8adc7d78601cf825eace86fdfea74cd52755413 test/extractor-tests/generated/expr/ExplicitClosureExpr/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d -test/extractor-tests/generated/expr/ExtractFunctionIsolationExpr/ExtractFunctionIsolationExpr.ql d5bdd7a642d0856773c3f478ce7f5f6d96ade1263607be32f98b884c979005fc cdb84fd0afe23435e0a6f94e27f48e839cc248bbcad69ef7dd1198bfddc4098b +test/extractor-tests/generated/expr/ExtractFunctionIsolationExpr/ExtractFunctionIsolationExpr.ql b48618adfe1eb5fb2f71def3a786a00c1e8c7a6c3ca98a6223a9eaefa2df9b93 10ff1649b73698e2b89a56ba2ce950e5ce32c56eb50ee03151261ed11d20cd85 test/extractor-tests/generated/expr/FloatLiteralExpr/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/expr/ForceTryExpr/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/expr/ForceValueExpr/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/expr/ForcedCheckedCastExpr/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d -test/extractor-tests/generated/expr/IdentityExpr/IdentityExpr.ql 48854de45173d4e2c460efc689c9cdbfee0a310e1ab6164a1ddf64a84b50eb65 4e1254dd4dbab68510eafda4161761b757cfdb9321e0b31c151572541e468d6a +test/extractor-tests/generated/expr/IdentityExpr/IdentityExpr.ql 2e27b79f73c73d3950b1ac356e83b40e791c6a4dd5e88a425fea4b6158aa3ae7 7bd02c429e4dcbe3d40f139b07e74c409656b9dcfb6e996a7d0be24bb96e779b test/extractor-tests/generated/expr/IfExpr/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d -test/extractor-tests/generated/expr/ImplicitConversionExpr/ImplicitConversionExpr.ql 9076b7dd47a4fd64aa33175167af5bb045a4168b858c70f1f05abab80a4120bd 7a5773c610f06274b9bc282aa7b71ee023ae22da707f68f0962f130d6ef150dc +test/extractor-tests/generated/expr/ImplicitConversionExpr/ImplicitConversionExpr.ql 846effaf47a53401f3cf13e5c58d169fa34ffd9abc8f746c65ad9f0da1edebca 37fa3a12598862abb2dd534861de5778638263173f87a8454f09a2f4173a7962 test/extractor-tests/generated/expr/InOutExpr/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d -test/extractor-tests/generated/expr/InitializerRefCallExpr/InitializerRefCallExpr.ql 7e722ec2fa7692b8b988fb11d7a0809221bf2ba06bb420e4d60c5abe170bffd4 0706c0dd26023bf2b02bc9581513c8449318738b0e942124d1e2db196c8bc14f +test/extractor-tests/generated/expr/InitializerRefCallExpr/InitializerRefCallExpr.ql a34bcbeb9a03bd0c88055bb347407f5099104d2d2bbc6c10cada8ac63cccdf7c a553ffd8f71ca792235e306a82e3a8e19bf2cc9ab8fd288c71e2b1c01e3f51d6 test/extractor-tests/generated/expr/IntegerLiteralExpr/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/expr/InterpolatedStringLiteralExpr/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/expr/IsExpr/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/expr/KeyPathApplicationExpr/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/expr/KeyPathDotExpr/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d -test/extractor-tests/generated/expr/KeyPathExpr/KeyPathExpr.ql 22116bc9e6bc90c8ab5beb59ba69344ce2c0eca1ddb10f6bfc2c28156678b5a0 034abff6eb54649da0661798a0d73180feac2e6669e9424c5cea81e3d8c4e65d +test/extractor-tests/generated/expr/KeyPathExpr/KeyPathExpr.ql db48f476e6d7a1b179d90eca624351232fd6cf08db87e06e4967256839da47c5 6aaa88e54d2a58a867223d5c964da83d3e7fd2d943f3f3b9b9f2caa4bb72b7b5 test/extractor-tests/generated/expr/LazyInitializationExpr/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/expr/MagicIdentifierLiteralExpr/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/expr/MakeTemporarilyEscapableExpr/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/expr/MemberRefExpr/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d -test/extractor-tests/generated/expr/MethodLookupExpr/MethodLookupExpr.ql 436ae4c6fd6b1c870da204dc12def2a3ecad4cee5c10dd2af635d3964d7fec08 c1e089fc3612b1439b8b8e18c49b1de372a654e018671a7c37f0cf72c64941e0 +test/extractor-tests/generated/expr/MethodLookupExpr/MethodLookupExpr.ql ea84ba5e032d499a4ef941fcf22bf268bc3dcbe8777d27583456540ba2b3f77c c9cdeda32de8b7ac8b8cccb259458d9015d1564fae35773c041f8b48a899dec1 test/extractor-tests/generated/expr/NilLiteralExpr/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d -test/extractor-tests/generated/expr/ObjectLiteralExpr/ObjectLiteralExpr.ql 05768e0d59e314b716e9cf3a41d57cf15bede2023c8466ef1e3ad762b582150c b7661b1052db0731365b4d1cffc38fd2ce141ffa2634714cff5c00764eee0a79 +test/extractor-tests/generated/expr/ObjectLiteralExpr/ObjectLiteralExpr.ql 620878a3c2f8dd25cfb1dc400b22fa20d549793a27edd419df0693bfd1d7b987 0af15ca80f025dad9e343e392e15f40b348b2efe670cbce230f4ebe1863ec45d test/extractor-tests/generated/expr/OneWayExpr/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/expr/OpaqueValueExpr/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d -test/extractor-tests/generated/expr/OpenExistentialExpr/OpenExistentialExpr.ql f324111c422127d9251c231f971da57a64c28bfa1fb61f1a8acaea6997996126 7f1bc62003ecc03897fb3c4e0389135277a9d56cb224a73a0f7e102c78cac127 +test/extractor-tests/generated/expr/OpenExistentialExpr/OpenExistentialExpr.ql 5486acdbada57e8b99e129b41fe7f674f42aa5cb1c1f01d7e3d39ddeac838db2 849a5378784006c65b8806582a8c5aa98642623a13a17e4d879ade4f682ff733 test/extractor-tests/generated/expr/OptionalEvaluationExpr/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/expr/OptionalTryExpr/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/expr/OtherInitializerRefExpr/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d -test/extractor-tests/generated/expr/PackExpansionExpr/MaterializePackExpr.ql 7b3532a0b1c21100c2362f721f6f3f95277d9934bb22a2928070713f247b4480 9c6fb2be429fa21582b5babb8da9edf09e1e28a29e1c6e0cf1c9802b111e889b -test/extractor-tests/generated/expr/PackExpansionExpr/PackElementExpr.ql cf22bbffb7c0586a190324e56aecc3ecb0559257ff728ea7f4f9ecce1e67d6a3 1c3fb6ec13b61ed1eca88eb20f8c3b4f34018c28aaa88acec04a1b0e82a10412 -test/extractor-tests/generated/expr/PackExpansionExpr/PackExpansionExpr.ql 8c6c61391eca3058547ff66a374ce6578f25f358d917b24e3d0e8ee949fb6d30 2bd9310feedbe7a68700814519b95c5082345b4529c95684d367a5d659b44b2e -test/extractor-tests/generated/expr/PostfixUnaryExpr/PostfixUnaryExpr.ql bfa3b681b3e50aed4304dfdc11789a3875afd6a5a16072c090ce8ff382028c1b a0bbffd7f622bc0e7c9eaec948b2d4ac65c73ace45c136ccc41c4e70648ac1c8 +test/extractor-tests/generated/expr/PackExpansionExpr/MaterializePackExpr.ql fbcec327377a2f349824b82ba9d17556010cce52ce60d28ca4efee045d0d4225 2155d566e460db6b6693b3bdf93e304ed762abf5edf5072c1b4cc3b4cf3d18d1 +test/extractor-tests/generated/expr/PackExpansionExpr/PackElementExpr.ql fbf8f8ee6411c1c4bf241710eac37dde39efeae70a06f4bc7ac16dd941b52937 63e2ba99385a135a5503db87db98ad16eabf9297178baee42a9d4109511c08fd +test/extractor-tests/generated/expr/PackExpansionExpr/PackExpansionExpr.ql cf89d8c42bcb31ffb33283655823ac7afb086a44ba0245887cf4cef108f71ed8 1d7bc7969aae39435178177cb0494baa20e93b3195de5ccc05a05db123cd2708 +test/extractor-tests/generated/expr/PostfixUnaryExpr/PostfixUnaryExpr.ql 0fde7c56085ede00a4e5bd33c00f51cf7bd3cf678312610b12a52399d43700eb 1d469792c22b20fe7e317d46c40b533756e279a6c2acffdfa9b1faa156d43c24 test/extractor-tests/generated/expr/PrefixUnaryExpr/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d -test/extractor-tests/generated/expr/PropertyWrapperValuePlaceholderExpr/PropertyWrapperValuePlaceholderExpr.ql d1a7dee25b0b69ce898d305deea3f6f883595d0dda70dee8726cf3bc90504792 daec9bde6192c9b9e6fb87f1669d109a777fd16cef31a862e1d09f5da798f0f9 +test/extractor-tests/generated/expr/PropertyWrapperValuePlaceholderExpr/PropertyWrapperValuePlaceholderExpr.ql 9d5ed8460a0c906a44f7693fec6288313cc3ee73cdb09c1a54af525093f2ff10 c0fe8a5a88ce747e6f7977a2edd6123759725b6fbbed7f81e94fb1a5550d22fe test/extractor-tests/generated/expr/RebindSelfInInitializerExpr/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/expr/RegexLiteralExpr/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d -test/extractor-tests/generated/expr/SingleValueStmtExpr/SingleValueStmtExpr.ql 974a773308132a076a2dded006658b5e61b2f72ab7192d9653239eeb7aea7168 ee603a1fce41760044475858de9df9b86d18b299d272324a2eac1193049712a6 +test/extractor-tests/generated/expr/SingleValueStmtExpr/SingleValueStmtExpr.ql 5414253ffcd24b16a2725d7e1f8b543dac9458e32d610a7722ddcafd00d31048 3bdd13684344dae067612345cef43b4a4b13ebad3157e3dd76edce4a40895df6 test/extractor-tests/generated/expr/SingleValueStmtExpr/ThenStmt.ql 5dea0a19b45feedee2808d81cda006b94c15d253ea80ef66dfc67d199bfec29b 49b07c7695a47935f1fdabbb547c6508360bd5269fbcd4743a486a6f9029d6c2 test/extractor-tests/generated/expr/StringLiteralExpr/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/expr/SubscriptExpr/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d @@ -1141,7 +1141,7 @@ test/extractor-tests/generated/expr/TryExpr/MISSING_SOURCE.txt 35fb32ea5393152eb test/extractor-tests/generated/expr/TupleElementExpr/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/expr/TupleExpr/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/expr/TypeExpr/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d -test/extractor-tests/generated/expr/TypeValueExpr/TypeValueExpr.ql 6c961000667082800ce02e73f627124028826a6e9ae64b9a44a5f62c3b64cf6f e8298da860d16edd30ffff341cef248e0e4faa377842ebd2ba6639c79d208ff4 +test/extractor-tests/generated/expr/TypeValueExpr/TypeValueExpr.ql e4f1cd638a06cfd32e987e560777fc94d016944f4c87847c4bb059bfbba48dde 3864ad30240bdccff665f77621f361e192612c95a690b6f7b31ba62652bf6b00 test/extractor-tests/generated/expr/VarargExpansionExpr/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/pattern/AnyPattern/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/pattern/BindingPattern/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d @@ -1164,16 +1164,16 @@ test/extractor-tests/generated/stmt/DoCatchStmt/MISSING_SOURCE.txt 35fb32ea53931 test/extractor-tests/generated/stmt/DoStmt/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/stmt/FailStmt/FailStmt.ql 70eb21a0717e68bcf59ba9861d474aaa5f7791c39fccea4015bca47fc8d082f1 18eaafd230e4eaaeb114466db17bb480591af6357d5ed7bafe74a3352b806690 test/extractor-tests/generated/stmt/FallthroughStmt/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d -test/extractor-tests/generated/stmt/ForEachStmt/ForEachStmt.ql afb6c63f2114317b41c5d9ab33fdd83402badbba9d8761b1eaf51cad62598959 6454d689a0178bb6704e8e18a84fd8e6e3bd622fdba44838ea3576c37aebfd1e +test/extractor-tests/generated/stmt/ForEachStmt/ForEachStmt.ql 72fc91069e68f975006d6d49a54ff92a23a27706a6d5d15acdcfef09cafa2f69 38a4c56c7ed6ec47b990ee79ae2fe45cf287db474b6dbf13b4e781205894e27f test/extractor-tests/generated/stmt/GuardStmt/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/stmt/IfStmt/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/stmt/PoundAssertStmt/PoundAssertStmt.ql dbe340f6f2468a6c5ff42785101d3529ca11ce49d28cc607cbc842678b9f0b61 96aea7859f0a606ea032850339d78907406dcdcc2d3ac5b15ea8c7bd2cd36eb1 test/extractor-tests/generated/stmt/RepeatWhileStmt/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/stmt/ReturnStmt/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/stmt/StmtCondition/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d -test/extractor-tests/generated/stmt/SwitchStmt/CaseLabelItem.ql 93280609dc6ed32a2a4bf841f5634be468b0cfbd292e350cd1da4551fce600f5 990ccf7781a13c132bde62ae78a5e988f65c56a882d73a7d4f1869b623c86d9b -test/extractor-tests/generated/stmt/SwitchStmt/CaseStmt.ql 776687b32f3817d41457b3c59ca06fba6566409b8746e91e03d2c06a53bc0879 5625c682730bae276505221411c49515f3dd9918af61b4c61439e25afbef781c -test/extractor-tests/generated/stmt/SwitchStmt/SwitchStmt.ql 689815400a7f3c6b3cd9992fad5a66b7354ee6c3d0371e0f388ca8ff9f9d791f a0aa7adb9050bf6ecfb99d4737e57ee7e26745204c2767094757af7ca831979f +test/extractor-tests/generated/stmt/SwitchStmt/CaseLabelItem.ql 5119caff56f18954f8d01f21d7a381de9aa7c35cc8a7515205542574f9b161c1 5e122758bc0cdc44ad0d292dc5bfcfc36717ab5db3b363202659d0da5c6469a6 +test/extractor-tests/generated/stmt/SwitchStmt/CaseStmt.ql 1460fc714ab50c56afd608934a9a1081104b99c032b6d77954cb6e9dd7fa33a8 c15d9755ffbe45d447d55c5408d897cbff647ec97a458090c0ad9cf597e62859 +test/extractor-tests/generated/stmt/SwitchStmt/SwitchStmt.ql 1d010c5ad6ece987163696d629ef073b6476d37794cc080ad5fcc4980dc9f64b 4b39d3945ef7419b277fa94eb15878b20e46811a5bedb03217577f507145734b test/extractor-tests/generated/stmt/ThrowStmt/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/stmt/WhileStmt/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/stmt/YieldStmt/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d @@ -1181,7 +1181,7 @@ test/extractor-tests/generated/type/ArraySliceType/MISSING_SOURCE.txt 35fb32ea53 test/extractor-tests/generated/type/BoundGenericClassType/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/type/BoundGenericEnumType/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/type/BoundGenericStructType/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d -test/extractor-tests/generated/type/BuiltinIntegerType/BuiltinIntegerType.ql 73bc348dc4be941cd417da61d8f2043c04390e4435eccf7afc851a477829b110 4d8276ce10df5ee74a65d436261de4d2397404a65058320bfa4cad2de6c56d15 +test/extractor-tests/generated/type/BuiltinIntegerType/BuiltinIntegerType.ql 78d10029fa696ec4bcc48ea666923b98aa120a4a66004c491314f4abf283eac4 d23455d2ec38a1bba726d2e8fb349dfa2cdc52b8751d9caabb438d0dcdff6ab7 test/extractor-tests/generated/type/BuiltinType/BuiltinType.ql 83a861b3ad63bed272f892031adc5bc651ed244cfcd53fc3090a2cea3f9d6a8d 197689774e28406b4bd798059fc57078695b43ca0833a7a4ef9dabd519e62d0d test/extractor-tests/generated/type/ClassType/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/type/DependentMemberType/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d @@ -1198,21 +1198,21 @@ test/extractor-tests/generated/type/IntegerType/IntegerType.ql 6f18b3b5b4c53ca5d test/extractor-tests/generated/type/LValueType/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/type/MetatypeType/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/type/ModuleType/ModuleType.ql 7d78142dc82b06e454b9875a47890d5c2364e51f6e496640d6c4d20327f535b7 cecd45f6a4b0f137cdd7e694259044016ab01da6a42e73c3a361b4d00b594133 -test/extractor-tests/generated/type/OpaqueTypeArchetypeType/OpaqueTypeArchetypeType.ql 84e8d21e87bbac3057df2b87623681e7d18b191d58310e90bb9b5bc380d892fb b808ee970c1cda6a48b8b5f0987179b3f08c260ac2184ea7d286eebcf0c17257 -test/extractor-tests/generated/type/OpenedArchetypeType/OpenedArchetypeType.ql 51f3a697bb924c7569ed4d3eaa66d8006aa627dc61c06a368aea693506f60f4d 617eff2e028ca1fc3d219d4518379f38ec347c3c14ef620a5e7ccbfb4af13db5 +test/extractor-tests/generated/type/OpaqueTypeArchetypeType/OpaqueTypeArchetypeType.ql 86bc4823c19da17cbcebe3a4634eccff0a96cbebd174d8d4b1610e3fda3f8bdb 82179cb6e188a3a271428de4631c2a6fa4cec2e65a628fb56c2cbcff8a6a13d3 +test/extractor-tests/generated/type/OpenedArchetypeType/OpenedArchetypeType.ql fdbbc1cffb209097480596d3be405188d045758da03a7980511d56874690b9c4 9ba8ffc028988a21cd751d25f0c363c3c37dfc0a13629379c8ca94b6b066bb7d test/extractor-tests/generated/type/OptionalType/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d -test/extractor-tests/generated/type/PackType/ElementArchetypeType.ql 69cedea6ad2fb2d8dab357f5c6442e59fd2c329548c3d414431b3ccbd8ccbab5 675c1bbde4e5652626cd8d11bf1f3890f2921c99ebca74a6146a3fd43cffcf4e -test/extractor-tests/generated/type/PackType/PackArchetypeType.ql 7abbf651e726374b2b5a74533b8adf7e48ba3b04306ab65a65fbba974eade7bf 44fdada7fa7f5a20e4238c391fd0572866247c1580a675795832b35699a3e105 +test/extractor-tests/generated/type/PackType/ElementArchetypeType.ql d4d695dcd0e723cdc9f196d828e22a3650ac751f0488e257f3bc2e2afbc343ec ff20bf849e18621b6193699bf58b3d6d127c29113dc996100bc18938fdf4658c +test/extractor-tests/generated/type/PackType/PackArchetypeType.ql 56e7f72a2d6f03e394a5e7103e337aee06b8e1fa9198d8f6123c44c4e33d5b57 e7259313ade883242bffb8e812da64c77108b55acbf39d7b8cda47251ee5f5d3 test/extractor-tests/generated/type/PackType/PackElementType.ql 8f78e329812bb16d0ab644944c3dffba9701dffcd980018accf22c4540828315 adf4b155e1d5ba0c54177b9a296e0e5d06d2566dafcb43d60403fcf94a009009 test/extractor-tests/generated/type/PackType/PackExpansionType.ql 4ae76353b2312ca356a11191b3b8c235fc5a394b91c9a1de48da1fbc9986f14c c676192e609e434c1c617d9c32752f39d2aa7119a9c00bd092f30734099c89dc -test/extractor-tests/generated/type/PackType/PackType.ql c90ac94fe7a04c68c6be69efae60db4222b04cdccc66c621018a29e3440c9dce 9ffa5b1a5c5861c7a41304cb966dcd4c51e696e959f173a55bab10863866d3db -test/extractor-tests/generated/type/ParameterizedProtocolType/ParameterizedProtocolType.ql 4f21c14b26c5caa56ecf1e920a4a28a44c39a7fc450a21379c214ba69457f6cd 0c2d519cdf6772ff03fb93eab88faefdc5988ea92601301c9949cfde4d476a93 +test/extractor-tests/generated/type/PackType/PackType.ql 9d235d6c608da8a3f2eaf3f1bc32a130cc36565c27d60f62654a2b4f3c95dfb4 760d5daf96ec4a903fa09b6ed3687f8a3e59525b1d621b6866cc7506ebe20888 +test/extractor-tests/generated/type/ParameterizedProtocolType/ParameterizedProtocolType.ql d72a5ea146d99b43e0446f7e2c5b6999383de7b6962bce2f14c616a28c75a6be 0892b65674289bc7d1bdac0b7ab6da267876765641679ee2821aba258de563f2 test/extractor-tests/generated/type/ParenType/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d -test/extractor-tests/generated/type/PrimaryArchetypeType/PrimaryArchetypeType.ql 4091dea43f9581727efe73cdfb0020dd7e9142161c0e1e024da972fa215cac43 84f422c35ef2552fcbf93e641ee161b57314260276c8f5b9a69d61db002db549 -test/extractor-tests/generated/type/ProtocolCompositionType/ProtocolCompositionType.ql 7464ecd9faf7fa1a2d1c73db8a9d0de83410f840cf35990fe173ef76c66f8d8a 20359be7f01a0d870331c96961d9cf05a6e51d4af6096657a31dad5a0936d1a5 +test/extractor-tests/generated/type/PrimaryArchetypeType/PrimaryArchetypeType.ql 4355fd06fe5e9c775ce58c025f3a8383d94e48fd8461b69325905da551001e5a 8f200f8517191b6db86c65cbd7ef4efa537eb9b26d6a417112d25af5aa9632fd +test/extractor-tests/generated/type/ProtocolCompositionType/ProtocolCompositionType.ql 5e9d97fb048d108fe3d52a69da929f93cb52afd694993cb2ed66155cb668ed0a 40888e1af510016ad7843f0e5194e4af10f6929567b63532f66667f466dcfb9e test/extractor-tests/generated/type/ProtocolType/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/type/StructType/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d -test/extractor-tests/generated/type/TupleType/TupleType.ql 566acfb4e12c09dc8cee7ac89244cb9b6209820cba633d4ef42e958bbec01882 974e270501e10e82d94653c181dc7bfd06d2b9903440ba1d7d44ec61f8b974d2 +test/extractor-tests/generated/type/TupleType/TupleType.ql 4b7c7db3decc5d901658e1a72943c48d661f5a69f0f1c36972bee2200d0532f5 2539d830cb6dd71789072bd87bd35a260e31dbe7ca7208e84f087f13fd7c9561 test/extractor-tests/generated/type/TypeAliasType/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/type/TypeRepr/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d test/extractor-tests/generated/type/UnboundGenericType/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d diff --git a/swift/ql/test/extractor-tests/generated/AvailabilityInfo/AvailabilityInfo.expected b/swift/ql/test/extractor-tests/generated/AvailabilityInfo/AvailabilityInfo.expected index aaa2782bdea..e6b02e7a01b 100644 --- a/swift/ql/test/extractor-tests/generated/AvailabilityInfo/AvailabilityInfo.expected +++ b/swift/ql/test/extractor-tests/generated/AvailabilityInfo/AvailabilityInfo.expected @@ -1,6 +1,6 @@ instances -| test.swift:1:4:1:27 | #available | isUnavailable: | no | getNumberOfSpecs: | 2 | -| test.swift:5:4:5:45 | #unavailable | isUnavailable: | yes | getNumberOfSpecs: | 3 | +| test.swift:1:4:1:27 | #available | isUnavailable: | no | +| test.swift:5:4:5:45 | #unavailable | isUnavailable: | yes | getSpec | test.swift:1:4:1:27 | #available | 0 | test.swift:1:15:1:21 | macOS 142 | | test.swift:1:4:1:27 | #available | 1 | test.swift:1:26:1:26 | * | diff --git a/swift/ql/test/extractor-tests/generated/AvailabilityInfo/AvailabilityInfo.ql b/swift/ql/test/extractor-tests/generated/AvailabilityInfo/AvailabilityInfo.ql index 5bc4b6072a8..50d7addece8 100644 --- a/swift/ql/test/extractor-tests/generated/AvailabilityInfo/AvailabilityInfo.ql +++ b/swift/ql/test/extractor-tests/generated/AvailabilityInfo/AvailabilityInfo.ql @@ -2,16 +2,11 @@ import codeql.swift.elements import TestUtils -query predicate instances( - AvailabilityInfo x, string isUnavailable__label, string isUnavailable, - string getNumberOfSpecs__label, int getNumberOfSpecs -) { +query predicate instances(AvailabilityInfo x, string isUnavailable__label, string isUnavailable) { toBeTested(x) and not x.isUnknown() and isUnavailable__label = "isUnavailable:" and - (if x.isUnavailable() then isUnavailable = "yes" else isUnavailable = "no") and - getNumberOfSpecs__label = "getNumberOfSpecs:" and - getNumberOfSpecs = x.getNumberOfSpecs() + if x.isUnavailable() then isUnavailable = "yes" else isUnavailable = "no" } query predicate getSpec(AvailabilityInfo x, int index, AvailabilitySpec getSpec) { diff --git a/swift/ql/test/extractor-tests/generated/KeyPathComponent/KeyPathComponent.expected b/swift/ql/test/extractor-tests/generated/KeyPathComponent/KeyPathComponent.expected index edffa1037b7..9d51a6ed8d5 100644 --- a/swift/ql/test/extractor-tests/generated/KeyPathComponent/KeyPathComponent.expected +++ b/swift/ql/test/extractor-tests/generated/KeyPathComponent/KeyPathComponent.expected @@ -1,18 +1,18 @@ instances -| file://:0:0:0:0 | KeyPathComponent | getKind: | 7 | getNumberOfSubscriptArguments: | 0 | hasTupleIndex: | no | hasDeclRef: | no | getComponentType: | Int? | -| key_path_expr.swift:11:17:11:17 | KeyPathComponent | getKind: | 3 | getNumberOfSubscriptArguments: | 0 | hasTupleIndex: | no | hasDeclRef: | yes | getComponentType: | Int | -| key_path_expr.swift:12:24:12:26 | KeyPathComponent | getKind: | 4 | getNumberOfSubscriptArguments: | 1 | hasTupleIndex: | no | hasDeclRef: | yes | getComponentType: | Int | -| key_path_expr.swift:13:34:13:38 | KeyPathComponent | getKind: | 4 | getNumberOfSubscriptArguments: | 1 | hasTupleIndex: | no | hasDeclRef: | yes | getComponentType: | Int? | -| key_path_expr.swift:14:31:14:31 | KeyPathComponent | getKind: | 5 | getNumberOfSubscriptArguments: | 0 | hasTupleIndex: | no | hasDeclRef: | no | getComponentType: | Int | -| key_path_expr.swift:14:31:14:31 | KeyPathComponent | getKind: | 8 | getNumberOfSubscriptArguments: | 0 | hasTupleIndex: | no | hasDeclRef: | no | getComponentType: | Int? | -| key_path_expr.swift:15:21:15:21 | KeyPathComponent | getKind: | 3 | getNumberOfSubscriptArguments: | 0 | hasTupleIndex: | no | hasDeclRef: | yes | getComponentType: | Bar? | -| key_path_expr.swift:15:24:15:24 | KeyPathComponent | getKind: | 6 | getNumberOfSubscriptArguments: | 0 | hasTupleIndex: | no | hasDeclRef: | no | getComponentType: | Bar | -| key_path_expr.swift:15:26:15:26 | KeyPathComponent | getKind: | 3 | getNumberOfSubscriptArguments: | 0 | hasTupleIndex: | no | hasDeclRef: | yes | getComponentType: | Int? | -| key_path_expr.swift:16:25:16:25 | KeyPathComponent | getKind: | 3 | getNumberOfSubscriptArguments: | 0 | hasTupleIndex: | no | hasDeclRef: | yes | getComponentType: | Bar? | -| key_path_expr.swift:16:28:16:28 | KeyPathComponent | getKind: | 6 | getNumberOfSubscriptArguments: | 0 | hasTupleIndex: | no | hasDeclRef: | no | getComponentType: | Bar | -| key_path_expr.swift:16:30:16:30 | KeyPathComponent | getKind: | 3 | getNumberOfSubscriptArguments: | 0 | hasTupleIndex: | no | hasDeclRef: | yes | getComponentType: | Int | -| key_path_expr.swift:17:16:17:16 | KeyPathComponent | getKind: | 8 | getNumberOfSubscriptArguments: | 0 | hasTupleIndex: | no | hasDeclRef: | no | getComponentType: | Int | -| key_path_expr.swift:18:32:18:32 | KeyPathComponent | getKind: | 9 | getNumberOfSubscriptArguments: | 0 | hasTupleIndex: | yes | hasDeclRef: | no | getComponentType: | Int | +| file://:0:0:0:0 | KeyPathComponent | getKind: | 7 | getComponentType: | Int? | +| key_path_expr.swift:11:17:11:17 | KeyPathComponent | getKind: | 3 | getComponentType: | Int | +| key_path_expr.swift:12:24:12:26 | KeyPathComponent | getKind: | 4 | getComponentType: | Int | +| key_path_expr.swift:13:34:13:38 | KeyPathComponent | getKind: | 4 | getComponentType: | Int? | +| key_path_expr.swift:14:31:14:31 | KeyPathComponent | getKind: | 5 | getComponentType: | Int | +| key_path_expr.swift:14:31:14:31 | KeyPathComponent | getKind: | 8 | getComponentType: | Int? | +| key_path_expr.swift:15:21:15:21 | KeyPathComponent | getKind: | 3 | getComponentType: | Bar? | +| key_path_expr.swift:15:24:15:24 | KeyPathComponent | getKind: | 6 | getComponentType: | Bar | +| key_path_expr.swift:15:26:15:26 | KeyPathComponent | getKind: | 3 | getComponentType: | Int? | +| key_path_expr.swift:16:25:16:25 | KeyPathComponent | getKind: | 3 | getComponentType: | Bar? | +| key_path_expr.swift:16:28:16:28 | KeyPathComponent | getKind: | 6 | getComponentType: | Bar | +| key_path_expr.swift:16:30:16:30 | KeyPathComponent | getKind: | 3 | getComponentType: | Int | +| key_path_expr.swift:17:16:17:16 | KeyPathComponent | getKind: | 8 | getComponentType: | Int | +| key_path_expr.swift:18:32:18:32 | KeyPathComponent | getKind: | 9 | getComponentType: | Int | getSubscriptArgument | key_path_expr.swift:12:24:12:26 | KeyPathComponent | 0 | key_path_expr.swift:12:25:12:25 | : 0 | | key_path_expr.swift:13:34:13:38 | KeyPathComponent | 0 | key_path_expr.swift:13:35:13:35 | : a | diff --git a/swift/ql/test/extractor-tests/generated/KeyPathComponent/KeyPathComponent.ql b/swift/ql/test/extractor-tests/generated/KeyPathComponent/KeyPathComponent.ql index aaad6bfa8d6..a81df30d465 100644 --- a/swift/ql/test/extractor-tests/generated/KeyPathComponent/KeyPathComponent.ql +++ b/swift/ql/test/extractor-tests/generated/KeyPathComponent/KeyPathComponent.ql @@ -3,21 +3,13 @@ import codeql.swift.elements import TestUtils query predicate instances( - KeyPathComponent x, string getKind__label, int getKind, - string getNumberOfSubscriptArguments__label, int getNumberOfSubscriptArguments, - string hasTupleIndex__label, string hasTupleIndex, string hasDeclRef__label, string hasDeclRef, - string getComponentType__label, Type getComponentType + KeyPathComponent x, string getKind__label, int getKind, string getComponentType__label, + Type getComponentType ) { toBeTested(x) and not x.isUnknown() and getKind__label = "getKind:" and getKind = x.getKind() and - getNumberOfSubscriptArguments__label = "getNumberOfSubscriptArguments:" and - getNumberOfSubscriptArguments = x.getNumberOfSubscriptArguments() and - hasTupleIndex__label = "hasTupleIndex:" and - (if x.hasTupleIndex() then hasTupleIndex = "yes" else hasTupleIndex = "no") and - hasDeclRef__label = "hasDeclRef:" and - (if x.hasDeclRef() then hasDeclRef = "yes" else hasDeclRef = "no") and getComponentType__label = "getComponentType:" and getComponentType = x.getComponentType() } diff --git a/swift/ql/test/extractor-tests/generated/decl/Accessor/Accessor.expected b/swift/ql/test/extractor-tests/generated/decl/Accessor/Accessor.expected index 853e0647575..ade62608569 100644 --- a/swift/ql/test/extractor-tests/generated/decl/Accessor/Accessor.expected +++ b/swift/ql/test/extractor-tests/generated/decl/Accessor/Accessor.expected @@ -1,40 +1,40 @@ instances -| accessors.swift:2:9:2:9 | _modify | hasName: | yes | hasSelfParam: | yes | getNumberOfParams: | 0 | hasBody: | yes | getNumberOfCaptures: | 0 | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | accessors | getNumberOfMembers: | 0 | getInterfaceType: | (inout Foo) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | yes | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | -| accessors.swift:2:9:2:9 | get | hasName: | yes | hasSelfParam: | yes | getNumberOfParams: | 0 | hasBody: | yes | getNumberOfCaptures: | 0 | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | accessors | getNumberOfMembers: | 0 | getInterfaceType: | (Foo) -> () -> Int | isGetter: | yes | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | -| accessors.swift:2:9:2:9 | set | hasName: | yes | hasSelfParam: | yes | getNumberOfParams: | 1 | hasBody: | yes | getNumberOfCaptures: | 0 | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | accessors | getNumberOfMembers: | 0 | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | yes | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | -| accessors.swift:3:9:3:9 | _modify | hasName: | yes | hasSelfParam: | yes | getNumberOfParams: | 0 | hasBody: | yes | getNumberOfCaptures: | 0 | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | accessors | getNumberOfMembers: | 0 | getInterfaceType: | (inout Foo) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | yes | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | -| accessors.swift:4:9:4:28 | get | hasName: | yes | hasSelfParam: | yes | getNumberOfParams: | 0 | hasBody: | yes | getNumberOfCaptures: | 0 | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | accessors | getNumberOfMembers: | 0 | getInterfaceType: | (Foo) -> () -> Int | isGetter: | yes | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | -| accessors.swift:5:9:5:42 | set | hasName: | yes | hasSelfParam: | yes | getNumberOfParams: | 1 | hasBody: | yes | getNumberOfCaptures: | 0 | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | accessors | getNumberOfMembers: | 0 | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | yes | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | -| accessors.swift:7:9:7:9 | _modify | hasName: | yes | hasSelfParam: | yes | getNumberOfParams: | 0 | hasBody: | yes | getNumberOfCaptures: | 0 | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | accessors | getNumberOfMembers: | 0 | getInterfaceType: | (inout Foo) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | yes | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | -| accessors.swift:7:9:7:9 | get | hasName: | yes | hasSelfParam: | yes | getNumberOfParams: | 0 | hasBody: | yes | getNumberOfCaptures: | 0 | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | accessors | getNumberOfMembers: | 0 | getInterfaceType: | (Foo) -> () -> Int | isGetter: | yes | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | -| accessors.swift:7:9:7:9 | set | hasName: | yes | hasSelfParam: | yes | getNumberOfParams: | 1 | hasBody: | yes | getNumberOfCaptures: | 0 | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | accessors | getNumberOfMembers: | 0 | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | yes | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | -| accessors.swift:8:9:8:29 | willSet | hasName: | yes | hasSelfParam: | yes | getNumberOfParams: | 1 | hasBody: | yes | getNumberOfCaptures: | 0 | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | accessors | getNumberOfMembers: | 0 | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | no | isWillSet: | yes | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | -| accessors.swift:11:9:11:9 | _modify | hasName: | yes | hasSelfParam: | yes | getNumberOfParams: | 0 | hasBody: | yes | getNumberOfCaptures: | 0 | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | accessors | getNumberOfMembers: | 0 | getInterfaceType: | (inout Foo) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | yes | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | -| accessors.swift:11:9:11:9 | get | hasName: | yes | hasSelfParam: | yes | getNumberOfParams: | 0 | hasBody: | yes | getNumberOfCaptures: | 0 | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | accessors | getNumberOfMembers: | 0 | getInterfaceType: | (Foo) -> () -> Int | isGetter: | yes | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | -| accessors.swift:11:9:11:9 | set | hasName: | yes | hasSelfParam: | yes | getNumberOfParams: | 1 | hasBody: | yes | getNumberOfCaptures: | 0 | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | accessors | getNumberOfMembers: | 0 | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | yes | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | -| accessors.swift:12:9:12:19 | willSet | hasName: | yes | hasSelfParam: | yes | getNumberOfParams: | 1 | hasBody: | yes | getNumberOfCaptures: | 0 | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | accessors | getNumberOfMembers: | 0 | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | no | isWillSet: | yes | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | -| accessors.swift:15:9:15:9 | _modify | hasName: | yes | hasSelfParam: | yes | getNumberOfParams: | 0 | hasBody: | yes | getNumberOfCaptures: | 0 | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | accessors | getNumberOfMembers: | 0 | getInterfaceType: | (inout Foo) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | yes | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | -| accessors.swift:15:9:15:9 | get | hasName: | yes | hasSelfParam: | yes | getNumberOfParams: | 0 | hasBody: | yes | getNumberOfCaptures: | 0 | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | accessors | getNumberOfMembers: | 0 | getInterfaceType: | (Foo) -> () -> Int | isGetter: | yes | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | -| accessors.swift:15:9:15:9 | set | hasName: | yes | hasSelfParam: | yes | getNumberOfParams: | 1 | hasBody: | yes | getNumberOfCaptures: | 0 | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | accessors | getNumberOfMembers: | 0 | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | yes | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | -| accessors.swift:16:9:16:28 | didSet | hasName: | yes | hasSelfParam: | yes | getNumberOfParams: | 1 | hasBody: | yes | getNumberOfCaptures: | 0 | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | accessors | getNumberOfMembers: | 0 | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | yes | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | -| accessors.swift:19:9:19:9 | _modify | hasName: | yes | hasSelfParam: | yes | getNumberOfParams: | 0 | hasBody: | yes | getNumberOfCaptures: | 0 | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | accessors | getNumberOfMembers: | 0 | getInterfaceType: | (inout Foo) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | yes | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | -| accessors.swift:19:9:19:9 | get | hasName: | yes | hasSelfParam: | yes | getNumberOfParams: | 0 | hasBody: | yes | getNumberOfCaptures: | 0 | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | accessors | getNumberOfMembers: | 0 | getInterfaceType: | (Foo) -> () -> Int | isGetter: | yes | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | -| accessors.swift:19:9:19:9 | set | hasName: | yes | hasSelfParam: | yes | getNumberOfParams: | 1 | hasBody: | yes | getNumberOfCaptures: | 0 | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | accessors | getNumberOfMembers: | 0 | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | yes | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | -| accessors.swift:20:9:20:18 | didSet | hasName: | yes | hasSelfParam: | yes | getNumberOfParams: | 0 | hasBody: | yes | getNumberOfCaptures: | 0 | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | accessors | getNumberOfMembers: | 0 | getInterfaceType: | (inout Foo) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | yes | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | -| accessors.swift:23:9:23:9 | _modify | hasName: | yes | hasSelfParam: | yes | getNumberOfParams: | 0 | hasBody: | yes | getNumberOfCaptures: | 0 | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | accessors | getNumberOfMembers: | 0 | getInterfaceType: | (inout Foo) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | yes | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | -| accessors.swift:23:9:23:9 | get | hasName: | yes | hasSelfParam: | yes | getNumberOfParams: | 0 | hasBody: | yes | getNumberOfCaptures: | 0 | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | accessors | getNumberOfMembers: | 0 | getInterfaceType: | (Foo) -> () -> Int | isGetter: | yes | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | -| accessors.swift:23:9:23:9 | set | hasName: | yes | hasSelfParam: | yes | getNumberOfParams: | 1 | hasBody: | yes | getNumberOfCaptures: | 0 | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | accessors | getNumberOfMembers: | 0 | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | yes | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | -| accessors.swift:24:9:24:19 | willSet | hasName: | yes | hasSelfParam: | yes | getNumberOfParams: | 1 | hasBody: | yes | getNumberOfCaptures: | 0 | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | accessors | getNumberOfMembers: | 0 | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | no | isWillSet: | yes | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | -| accessors.swift:26:9:26:18 | didSet | hasName: | yes | hasSelfParam: | yes | getNumberOfParams: | 0 | hasBody: | yes | getNumberOfCaptures: | 0 | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | accessors | getNumberOfMembers: | 0 | getInterfaceType: | (inout Foo) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | yes | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | -| accessors.swift:29:9:29:9 | get | hasName: | yes | hasSelfParam: | yes | getNumberOfParams: | 0 | hasBody: | yes | getNumberOfCaptures: | 0 | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | accessors | getNumberOfMembers: | 0 | getInterfaceType: | (Foo) -> () -> Int | isGetter: | yes | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | -| accessors.swift:29:9:29:9 | set | hasName: | yes | hasSelfParam: | yes | getNumberOfParams: | 1 | hasBody: | yes | getNumberOfCaptures: | 0 | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | accessors | getNumberOfMembers: | 0 | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | yes | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | -| accessors.swift:30:9:32:9 | _read | hasName: | yes | hasSelfParam: | yes | getNumberOfParams: | 0 | hasBody: | yes | getNumberOfCaptures: | 0 | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | accessors | getNumberOfMembers: | 0 | getInterfaceType: | (Foo) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | yes | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | -| accessors.swift:33:9:35:9 | _modify | hasName: | yes | hasSelfParam: | yes | getNumberOfParams: | 0 | hasBody: | yes | getNumberOfCaptures: | 0 | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | accessors | getNumberOfMembers: | 0 | getInterfaceType: | (inout Foo) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | yes | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | -| accessors.swift:38:9:38:9 | _modify | hasName: | yes | hasSelfParam: | yes | getNumberOfParams: | 0 | hasBody: | yes | getNumberOfCaptures: | 0 | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | accessors | getNumberOfMembers: | 0 | getInterfaceType: | (inout Foo) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | yes | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | -| accessors.swift:38:9:38:9 | get | hasName: | yes | hasSelfParam: | yes | getNumberOfParams: | 0 | hasBody: | yes | getNumberOfCaptures: | 0 | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | accessors | getNumberOfMembers: | 0 | getInterfaceType: | (Foo) -> () -> Int | isGetter: | yes | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | -| accessors.swift:38:9:38:9 | set | hasName: | yes | hasSelfParam: | yes | getNumberOfParams: | 1 | hasBody: | yes | getNumberOfCaptures: | 0 | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | accessors | getNumberOfMembers: | 0 | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | yes | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | -| accessors.swift:39:9:41:9 | unsafeAddress | hasName: | yes | hasSelfParam: | yes | getNumberOfParams: | 0 | hasBody: | yes | getNumberOfCaptures: | 0 | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | accessors | getNumberOfMembers: | 0 | getInterfaceType: | (Foo) -> () -> UnsafePointer | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | yes | isUnsafeMutableAddress: | no | -| accessors.swift:42:9:44:9 | unsafeMutableAddress | hasName: | yes | hasSelfParam: | yes | getNumberOfParams: | 0 | hasBody: | yes | getNumberOfCaptures: | 0 | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | accessors | getNumberOfMembers: | 0 | getInterfaceType: | (inout Foo) -> () -> UnsafeMutablePointer | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | yes | +| accessors.swift:2:9:2:9 | _modify | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | yes | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | +| accessors.swift:2:9:2:9 | get | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (Foo) -> () -> Int | isGetter: | yes | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | +| accessors.swift:2:9:2:9 | set | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | yes | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | +| accessors.swift:3:9:3:9 | _modify | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | yes | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | +| accessors.swift:4:9:4:28 | get | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (Foo) -> () -> Int | isGetter: | yes | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | +| accessors.swift:5:9:5:42 | set | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | yes | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | +| accessors.swift:7:9:7:9 | _modify | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | yes | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | +| accessors.swift:7:9:7:9 | get | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (Foo) -> () -> Int | isGetter: | yes | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | +| accessors.swift:7:9:7:9 | set | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | yes | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | +| accessors.swift:8:9:8:29 | willSet | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | no | isWillSet: | yes | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | +| accessors.swift:11:9:11:9 | _modify | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | yes | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | +| accessors.swift:11:9:11:9 | get | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (Foo) -> () -> Int | isGetter: | yes | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | +| accessors.swift:11:9:11:9 | set | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | yes | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | +| accessors.swift:12:9:12:19 | willSet | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | no | isWillSet: | yes | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | +| accessors.swift:15:9:15:9 | _modify | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | yes | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | +| accessors.swift:15:9:15:9 | get | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (Foo) -> () -> Int | isGetter: | yes | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | +| accessors.swift:15:9:15:9 | set | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | yes | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | +| accessors.swift:16:9:16:28 | didSet | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | yes | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | +| accessors.swift:19:9:19:9 | _modify | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | yes | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | +| accessors.swift:19:9:19:9 | get | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (Foo) -> () -> Int | isGetter: | yes | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | +| accessors.swift:19:9:19:9 | set | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | yes | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | +| accessors.swift:20:9:20:18 | didSet | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | yes | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | +| accessors.swift:23:9:23:9 | _modify | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | yes | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | +| accessors.swift:23:9:23:9 | get | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (Foo) -> () -> Int | isGetter: | yes | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | +| accessors.swift:23:9:23:9 | set | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | yes | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | +| accessors.swift:24:9:24:19 | willSet | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | no | isWillSet: | yes | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | +| accessors.swift:26:9:26:18 | didSet | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | yes | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | +| accessors.swift:29:9:29:9 | get | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (Foo) -> () -> Int | isGetter: | yes | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | +| accessors.swift:29:9:29:9 | set | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | yes | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | +| accessors.swift:30:9:32:9 | _read | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (Foo) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | yes | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | +| accessors.swift:33:9:35:9 | _modify | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | yes | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | +| accessors.swift:38:9:38:9 | _modify | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | yes | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | +| accessors.swift:38:9:38:9 | get | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (Foo) -> () -> Int | isGetter: | yes | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | +| accessors.swift:38:9:38:9 | set | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | yes | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | +| accessors.swift:39:9:41:9 | unsafeAddress | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (Foo) -> () -> UnsafePointer | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | yes | isUnsafeMutableAddress: | no | +| accessors.swift:42:9:44:9 | unsafeMutableAddress | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> () -> UnsafeMutablePointer | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | yes | getName | accessors.swift:2:9:2:9 | _modify | (unnamed function decl) | | accessors.swift:2:9:2:9 | get | (unnamed function decl) | diff --git a/swift/ql/test/extractor-tests/generated/decl/Accessor/Accessor.ql b/swift/ql/test/extractor-tests/generated/decl/Accessor/Accessor.ql index 177163b71c2..8fd5bfbcd9e 100644 --- a/swift/ql/test/extractor-tests/generated/decl/Accessor/Accessor.ql +++ b/swift/ql/test/extractor-tests/generated/decl/Accessor/Accessor.ql @@ -3,36 +3,17 @@ import codeql.swift.elements import TestUtils query predicate instances( - Accessor x, string hasName__label, string hasName, string hasSelfParam__label, - string hasSelfParam, string getNumberOfParams__label, int getNumberOfParams, - string hasBody__label, string hasBody, string getNumberOfCaptures__label, int getNumberOfCaptures, - string getNumberOfGenericTypeParams__label, int getNumberOfGenericTypeParams, - string getModule__label, ModuleDecl getModule, string getNumberOfMembers__label, - int getNumberOfMembers, string getInterfaceType__label, Type getInterfaceType, - string isGetter__label, string isGetter, string isSetter__label, string isSetter, - string isWillSet__label, string isWillSet, string isDidSet__label, string isDidSet, - string isRead__label, string isRead, string isModify__label, string isModify, + Accessor x, string getModule__label, ModuleDecl getModule, string getInterfaceType__label, + Type getInterfaceType, string isGetter__label, string isGetter, string isSetter__label, + string isSetter, string isWillSet__label, string isWillSet, string isDidSet__label, + string isDidSet, string isRead__label, string isRead, string isModify__label, string isModify, string isUnsafeAddress__label, string isUnsafeAddress, string isUnsafeMutableAddress__label, string isUnsafeMutableAddress ) { toBeTested(x) and not x.isUnknown() and - hasName__label = "hasName:" and - (if x.hasName() then hasName = "yes" else hasName = "no") and - hasSelfParam__label = "hasSelfParam:" and - (if x.hasSelfParam() then hasSelfParam = "yes" else hasSelfParam = "no") and - getNumberOfParams__label = "getNumberOfParams:" and - getNumberOfParams = x.getNumberOfParams() and - hasBody__label = "hasBody:" and - (if x.hasBody() then hasBody = "yes" else hasBody = "no") and - getNumberOfCaptures__label = "getNumberOfCaptures:" and - getNumberOfCaptures = x.getNumberOfCaptures() and - getNumberOfGenericTypeParams__label = "getNumberOfGenericTypeParams:" and - getNumberOfGenericTypeParams = x.getNumberOfGenericTypeParams() and getModule__label = "getModule:" and getModule = x.getModule() and - getNumberOfMembers__label = "getNumberOfMembers:" and - getNumberOfMembers = x.getNumberOfMembers() and getInterfaceType__label = "getInterfaceType:" and getInterfaceType = x.getInterfaceType() and isGetter__label = "isGetter:" and diff --git a/swift/ql/test/extractor-tests/generated/decl/AssociatedTypeDecl/AssociatedTypeDecl.expected b/swift/ql/test/extractor-tests/generated/decl/AssociatedTypeDecl/AssociatedTypeDecl.expected index 232470336aa..9daa87b09cc 100644 --- a/swift/ql/test/extractor-tests/generated/decl/AssociatedTypeDecl/AssociatedTypeDecl.expected +++ b/swift/ql/test/extractor-tests/generated/decl/AssociatedTypeDecl/AssociatedTypeDecl.expected @@ -1,6 +1,6 @@ instances -| associated_type.swift:2:5:2:20 | Bar | getModule: | file://:0:0:0:0 | associated_type | getNumberOfMembers: | 0 | getInterfaceType: | Self.Bar.Type | getName: | Bar | getNumberOfInheritedTypes: | 0 | -| associated_type.swift:3:5:3:25 | Baz | getModule: | file://:0:0:0:0 | associated_type | getNumberOfMembers: | 0 | getInterfaceType: | Self.Baz.Type | getName: | Baz | getNumberOfInheritedTypes: | 1 | +| associated_type.swift:2:5:2:20 | Bar | getModule: | file://:0:0:0:0 | associated_type | getInterfaceType: | Self.Bar.Type | getName: | Bar | +| associated_type.swift:3:5:3:25 | Baz | getModule: | file://:0:0:0:0 | associated_type | getInterfaceType: | Self.Baz.Type | getName: | Baz | getMember getInheritedType | associated_type.swift:3:5:3:25 | Baz | 0 | Equatable | diff --git a/swift/ql/test/extractor-tests/generated/decl/AssociatedTypeDecl/AssociatedTypeDecl.ql b/swift/ql/test/extractor-tests/generated/decl/AssociatedTypeDecl/AssociatedTypeDecl.ql index b81a9b93e63..41cc9d349a4 100644 --- a/swift/ql/test/extractor-tests/generated/decl/AssociatedTypeDecl/AssociatedTypeDecl.ql +++ b/swift/ql/test/extractor-tests/generated/decl/AssociatedTypeDecl/AssociatedTypeDecl.ql @@ -4,22 +4,16 @@ import TestUtils query predicate instances( AssociatedTypeDecl x, string getModule__label, ModuleDecl getModule, - string getNumberOfMembers__label, int getNumberOfMembers, string getInterfaceType__label, - Type getInterfaceType, string getName__label, string getName, - string getNumberOfInheritedTypes__label, int getNumberOfInheritedTypes + string getInterfaceType__label, Type getInterfaceType, string getName__label, string getName ) { toBeTested(x) and not x.isUnknown() and getModule__label = "getModule:" and getModule = x.getModule() and - getNumberOfMembers__label = "getNumberOfMembers:" and - getNumberOfMembers = x.getNumberOfMembers() and getInterfaceType__label = "getInterfaceType:" and getInterfaceType = x.getInterfaceType() and getName__label = "getName:" and - getName = x.getName() and - getNumberOfInheritedTypes__label = "getNumberOfInheritedTypes:" and - getNumberOfInheritedTypes = x.getNumberOfInheritedTypes() + getName = x.getName() } query predicate getMember(AssociatedTypeDecl x, int index, Decl getMember) { diff --git a/swift/ql/test/extractor-tests/generated/decl/CapturedDecl/CapturedDecl.expected b/swift/ql/test/extractor-tests/generated/decl/CapturedDecl/CapturedDecl.expected index 8c20593f598..cbf62d5bd64 100644 --- a/swift/ql/test/extractor-tests/generated/decl/CapturedDecl/CapturedDecl.expected +++ b/swift/ql/test/extractor-tests/generated/decl/CapturedDecl/CapturedDecl.expected @@ -1,43 +1,43 @@ instances -| closures.swift:8:12:8:12 | x | getModule: | file://:0:0:0:0 | closures | getNumberOfMembers: | 0 | getDecl: | closures.swift:7:6:7:6 | x | isDirect: | yes | isEscaping: | no | -| closures.swift:9:12:9:12 | y | getModule: | file://:0:0:0:0 | closures | getNumberOfMembers: | 0 | getDecl: | closures.swift:6:7:6:7 | y | isDirect: | yes | isEscaping: | no | -| closures.swift:16:3:16:3 | escape | getModule: | file://:0:0:0:0 | closures | getNumberOfMembers: | 0 | getDecl: | closures.swift:12:5:12:5 | escape | isDirect: | yes | isEscaping: | yes | -| closures.swift:17:5:17:5 | x | getModule: | file://:0:0:0:0 | closures | getNumberOfMembers: | 0 | getDecl: | closures.swift:15:7:15:7 | x | isDirect: | yes | isEscaping: | yes | -| closures.swift:24:3:24:3 | escape | getModule: | file://:0:0:0:0 | closures | getNumberOfMembers: | 0 | getDecl: | closures.swift:12:5:12:5 | escape | isDirect: | yes | isEscaping: | yes | -| closures.swift:31:11:31:11 | x | getModule: | file://:0:0:0:0 | closures | getNumberOfMembers: | 0 | getDecl: | closures.swift:29:7:29:7 | x | isDirect: | no | isEscaping: | no | -| closures.swift:32:14:32:14 | f | getModule: | file://:0:0:0:0 | closures | getNumberOfMembers: | 0 | getDecl: | closures.swift:28:7:28:7 | f | isDirect: | no | isEscaping: | no | -| closures.swift:32:14:32:14 | f | getModule: | file://:0:0:0:0 | closures | getNumberOfMembers: | 0 | getDecl: | closures.swift:28:7:28:7 | f | isDirect: | yes | isEscaping: | no | -| closures.swift:32:17:32:17 | x | getModule: | file://:0:0:0:0 | closures | getNumberOfMembers: | 0 | getDecl: | closures.swift:29:7:29:7 | x | isDirect: | yes | isEscaping: | no | -| closures.swift:39:20:39:20 | callback | getModule: | file://:0:0:0:0 | closures | getNumberOfMembers: | 0 | getDecl: | closures.swift:36:21:36:58 | callback | isDirect: | yes | isEscaping: | yes | -| closures.swift:42:35:42:35 | wrapper(_:) | getModule: | file://:0:0:0:0 | closures | getNumberOfMembers: | 0 | getDecl: | closures.swift:38:5:40:5 | wrapper(_:) | isDirect: | no | isEscaping: | yes | -| closures.swift:52:18:52:18 | x | getModule: | file://:0:0:0:0 | closures | getNumberOfMembers: | 0 | getDecl: | closures.swift:51:7:51:7 | x | isDirect: | yes | isEscaping: | yes | -| closures.swift:54:13:54:13 | x | getModule: | file://:0:0:0:0 | closures | getNumberOfMembers: | 0 | getDecl: | closures.swift:51:7:51:7 | x | isDirect: | yes | isEscaping: | yes | -| closures.swift:61:18:61:18 | x | getModule: | file://:0:0:0:0 | closures | getNumberOfMembers: | 0 | getDecl: | closures.swift:60:7:60:7 | x | isDirect: | yes | isEscaping: | yes | -| closures.swift:63:13:63:13 | x | getModule: | file://:0:0:0:0 | closures | getNumberOfMembers: | 0 | getDecl: | closures.swift:60:7:60:7 | x | isDirect: | yes | isEscaping: | yes | -| closures.swift:71:3:71:3 | g | getModule: | file://:0:0:0:0 | closures | getNumberOfMembers: | 0 | getDecl: | closures.swift:68:5:68:5 | g | isDirect: | yes | isEscaping: | yes | -| closures.swift:71:14:71:14 | x | getModule: | file://:0:0:0:0 | closures | getNumberOfMembers: | 0 | getDecl: | closures.swift:70:7:70:7 | x | isDirect: | yes | isEscaping: | yes | -| closures.swift:73:13:73:13 | x | getModule: | file://:0:0:0:0 | closures | getNumberOfMembers: | 0 | getDecl: | closures.swift:70:7:70:7 | x | isDirect: | yes | isEscaping: | yes | -| closures.swift:85:7:85:7 | y | getModule: | file://:0:0:0:0 | closures | getNumberOfMembers: | 0 | getDecl: | closures.swift:79:7:79:7 | y | isDirect: | no | isEscaping: | yes | -| closures.swift:85:7:85:7 | y | getModule: | file://:0:0:0:0 | closures | getNumberOfMembers: | 0 | getDecl: | closures.swift:79:7:79:7 | y | isDirect: | yes | isEscaping: | yes | -| closures.swift:85:18:85:18 | x | getModule: | file://:0:0:0:0 | closures | getNumberOfMembers: | 0 | getDecl: | closures.swift:82:9:82:9 | x | isDirect: | yes | isEscaping: | yes | -| closures.swift:88:9:88:9 | b() | getModule: | file://:0:0:0:0 | closures | getNumberOfMembers: | 0 | getDecl: | closures.swift:92:5:98:5 | b() | isDirect: | no | isEscaping: | yes | -| closures.swift:93:7:93:7 | y | getModule: | file://:0:0:0:0 | closures | getNumberOfMembers: | 0 | getDecl: | closures.swift:79:7:79:7 | y | isDirect: | yes | isEscaping: | yes | -| closures.swift:93:20:93:20 | x | getModule: | file://:0:0:0:0 | closures | getNumberOfMembers: | 0 | getDecl: | closures.swift:82:9:82:9 | x | isDirect: | yes | isEscaping: | yes | -| closures.swift:96:9:96:9 | a() | getModule: | file://:0:0:0:0 | closures | getNumberOfMembers: | 0 | getDecl: | closures.swift:84:5:90:5 | a() | isDirect: | no | isEscaping: | yes | -| closures.swift:111:15:111:15 | x | getModule: | file://:0:0:0:0 | closures | getNumberOfMembers: | 0 | getDecl: | closures.swift:110:9:110:9 | x | isDirect: | yes | isEscaping: | yes | -| closures.swift:111:27:111:27 | x | getModule: | file://:0:0:0:0 | closures | getNumberOfMembers: | 0 | getDecl: | closures.swift:110:9:110:9 | x | isDirect: | yes | isEscaping: | yes | -| closures.swift:115:5:115:5 | incrX | getModule: | file://:0:0:0:0 | closures | getNumberOfMembers: | 0 | getDecl: | closures.swift:109:8:109:8 | incrX | isDirect: | yes | isEscaping: | yes | -| closures.swift:130:25:130:25 | x | getModule: | file://:0:0:0:0 | closures | getNumberOfMembers: | 0 | getDecl: | closures.swift:128:7:128:7 | x | isDirect: | yes | isEscaping: | yes | -| closures.swift:133:20:133:20 | x | getModule: | file://:0:0:0:0 | closures | getNumberOfMembers: | 0 | getDecl: | closures.swift:128:7:128:7 | x | isDirect: | no | isEscaping: | yes | -| closures.swift:133:20:133:20 | x | getModule: | file://:0:0:0:0 | closures | getNumberOfMembers: | 0 | getDecl: | closures.swift:128:7:128:7 | x | isDirect: | yes | isEscaping: | yes | -| closures.swift:133:24:133:24 | y | getModule: | file://:0:0:0:0 | closures | getNumberOfMembers: | 0 | getDecl: | closures.swift:132:22:132:22 | y | isDirect: | yes | isEscaping: | yes | -| closures.swift:151:21:151:21 | x | getModule: | file://:0:0:0:0 | closures | getNumberOfMembers: | 0 | getDecl: | closures.swift:149:10:149:15 | x | isDirect: | yes | isEscaping: | yes | -| closures.swift:154:16:154:16 | g(_:) | getModule: | file://:0:0:0:0 | closures | getNumberOfMembers: | 0 | getDecl: | closures.swift:158:3:165:3 | g(_:) | isDirect: | no | isEscaping: | yes | -| closures.swift:155:21:155:21 | next | getModule: | file://:0:0:0:0 | closures | getNumberOfMembers: | 0 | getDecl: | closures.swift:154:9:154:9 | next | isDirect: | yes | isEscaping: | yes | -| closures.swift:155:34:155:34 | x | getModule: | file://:0:0:0:0 | closures | getNumberOfMembers: | 0 | getDecl: | closures.swift:149:10:149:15 | x | isDirect: | yes | isEscaping: | yes | -| closures.swift:160:21:160:21 | x | getModule: | file://:0:0:0:0 | closures | getNumberOfMembers: | 0 | getDecl: | closures.swift:158:10:158:15 | x | isDirect: | yes | isEscaping: | yes | -| closures.swift:163:16:163:16 | f(_:) | getModule: | file://:0:0:0:0 | closures | getNumberOfMembers: | 0 | getDecl: | closures.swift:149:3:156:3 | f(_:) | isDirect: | no | isEscaping: | yes | -| closures.swift:164:21:164:21 | next | getModule: | file://:0:0:0:0 | closures | getNumberOfMembers: | 0 | getDecl: | closures.swift:163:9:163:9 | next | isDirect: | yes | isEscaping: | yes | -| closures.swift:164:36:164:36 | x | getModule: | file://:0:0:0:0 | closures | getNumberOfMembers: | 0 | getDecl: | closures.swift:158:10:158:15 | x | isDirect: | yes | isEscaping: | yes | -| closures.swift:195:3:195:3 | g | getModule: | file://:0:0:0:0 | closures | getNumberOfMembers: | 0 | getDecl: | closures.swift:68:5:68:5 | g | isDirect: | yes | isEscaping: | yes | +| closures.swift:8:12:8:12 | x | getModule: | file://:0:0:0:0 | closures | getDecl: | closures.swift:7:6:7:6 | x | isDirect: | yes | isEscaping: | no | +| closures.swift:9:12:9:12 | y | getModule: | file://:0:0:0:0 | closures | getDecl: | closures.swift:6:7:6:7 | y | isDirect: | yes | isEscaping: | no | +| closures.swift:16:3:16:3 | escape | getModule: | file://:0:0:0:0 | closures | getDecl: | closures.swift:12:5:12:5 | escape | isDirect: | yes | isEscaping: | yes | +| closures.swift:17:5:17:5 | x | getModule: | file://:0:0:0:0 | closures | getDecl: | closures.swift:15:7:15:7 | x | isDirect: | yes | isEscaping: | yes | +| closures.swift:24:3:24:3 | escape | getModule: | file://:0:0:0:0 | closures | getDecl: | closures.swift:12:5:12:5 | escape | isDirect: | yes | isEscaping: | yes | +| closures.swift:31:11:31:11 | x | getModule: | file://:0:0:0:0 | closures | getDecl: | closures.swift:29:7:29:7 | x | isDirect: | no | isEscaping: | no | +| closures.swift:32:14:32:14 | f | getModule: | file://:0:0:0:0 | closures | getDecl: | closures.swift:28:7:28:7 | f | isDirect: | no | isEscaping: | no | +| closures.swift:32:14:32:14 | f | getModule: | file://:0:0:0:0 | closures | getDecl: | closures.swift:28:7:28:7 | f | isDirect: | yes | isEscaping: | no | +| closures.swift:32:17:32:17 | x | getModule: | file://:0:0:0:0 | closures | getDecl: | closures.swift:29:7:29:7 | x | isDirect: | yes | isEscaping: | no | +| closures.swift:39:20:39:20 | callback | getModule: | file://:0:0:0:0 | closures | getDecl: | closures.swift:36:21:36:58 | callback | isDirect: | yes | isEscaping: | yes | +| closures.swift:42:35:42:35 | wrapper(_:) | getModule: | file://:0:0:0:0 | closures | getDecl: | closures.swift:38:5:40:5 | wrapper(_:) | isDirect: | no | isEscaping: | yes | +| closures.swift:52:18:52:18 | x | getModule: | file://:0:0:0:0 | closures | getDecl: | closures.swift:51:7:51:7 | x | isDirect: | yes | isEscaping: | yes | +| closures.swift:54:13:54:13 | x | getModule: | file://:0:0:0:0 | closures | getDecl: | closures.swift:51:7:51:7 | x | isDirect: | yes | isEscaping: | yes | +| closures.swift:61:18:61:18 | x | getModule: | file://:0:0:0:0 | closures | getDecl: | closures.swift:60:7:60:7 | x | isDirect: | yes | isEscaping: | yes | +| closures.swift:63:13:63:13 | x | getModule: | file://:0:0:0:0 | closures | getDecl: | closures.swift:60:7:60:7 | x | isDirect: | yes | isEscaping: | yes | +| closures.swift:71:3:71:3 | g | getModule: | file://:0:0:0:0 | closures | getDecl: | closures.swift:68:5:68:5 | g | isDirect: | yes | isEscaping: | yes | +| closures.swift:71:14:71:14 | x | getModule: | file://:0:0:0:0 | closures | getDecl: | closures.swift:70:7:70:7 | x | isDirect: | yes | isEscaping: | yes | +| closures.swift:73:13:73:13 | x | getModule: | file://:0:0:0:0 | closures | getDecl: | closures.swift:70:7:70:7 | x | isDirect: | yes | isEscaping: | yes | +| closures.swift:85:7:85:7 | y | getModule: | file://:0:0:0:0 | closures | getDecl: | closures.swift:79:7:79:7 | y | isDirect: | no | isEscaping: | yes | +| closures.swift:85:7:85:7 | y | getModule: | file://:0:0:0:0 | closures | getDecl: | closures.swift:79:7:79:7 | y | isDirect: | yes | isEscaping: | yes | +| closures.swift:85:18:85:18 | x | getModule: | file://:0:0:0:0 | closures | getDecl: | closures.swift:82:9:82:9 | x | isDirect: | yes | isEscaping: | yes | +| closures.swift:88:9:88:9 | b() | getModule: | file://:0:0:0:0 | closures | getDecl: | closures.swift:92:5:98:5 | b() | isDirect: | no | isEscaping: | yes | +| closures.swift:93:7:93:7 | y | getModule: | file://:0:0:0:0 | closures | getDecl: | closures.swift:79:7:79:7 | y | isDirect: | yes | isEscaping: | yes | +| closures.swift:93:20:93:20 | x | getModule: | file://:0:0:0:0 | closures | getDecl: | closures.swift:82:9:82:9 | x | isDirect: | yes | isEscaping: | yes | +| closures.swift:96:9:96:9 | a() | getModule: | file://:0:0:0:0 | closures | getDecl: | closures.swift:84:5:90:5 | a() | isDirect: | no | isEscaping: | yes | +| closures.swift:111:15:111:15 | x | getModule: | file://:0:0:0:0 | closures | getDecl: | closures.swift:110:9:110:9 | x | isDirect: | yes | isEscaping: | yes | +| closures.swift:111:27:111:27 | x | getModule: | file://:0:0:0:0 | closures | getDecl: | closures.swift:110:9:110:9 | x | isDirect: | yes | isEscaping: | yes | +| closures.swift:115:5:115:5 | incrX | getModule: | file://:0:0:0:0 | closures | getDecl: | closures.swift:109:8:109:8 | incrX | isDirect: | yes | isEscaping: | yes | +| closures.swift:130:25:130:25 | x | getModule: | file://:0:0:0:0 | closures | getDecl: | closures.swift:128:7:128:7 | x | isDirect: | yes | isEscaping: | yes | +| closures.swift:133:20:133:20 | x | getModule: | file://:0:0:0:0 | closures | getDecl: | closures.swift:128:7:128:7 | x | isDirect: | no | isEscaping: | yes | +| closures.swift:133:20:133:20 | x | getModule: | file://:0:0:0:0 | closures | getDecl: | closures.swift:128:7:128:7 | x | isDirect: | yes | isEscaping: | yes | +| closures.swift:133:24:133:24 | y | getModule: | file://:0:0:0:0 | closures | getDecl: | closures.swift:132:22:132:22 | y | isDirect: | yes | isEscaping: | yes | +| closures.swift:151:21:151:21 | x | getModule: | file://:0:0:0:0 | closures | getDecl: | closures.swift:149:10:149:15 | x | isDirect: | yes | isEscaping: | yes | +| closures.swift:154:16:154:16 | g(_:) | getModule: | file://:0:0:0:0 | closures | getDecl: | closures.swift:158:3:165:3 | g(_:) | isDirect: | no | isEscaping: | yes | +| closures.swift:155:21:155:21 | next | getModule: | file://:0:0:0:0 | closures | getDecl: | closures.swift:154:9:154:9 | next | isDirect: | yes | isEscaping: | yes | +| closures.swift:155:34:155:34 | x | getModule: | file://:0:0:0:0 | closures | getDecl: | closures.swift:149:10:149:15 | x | isDirect: | yes | isEscaping: | yes | +| closures.swift:160:21:160:21 | x | getModule: | file://:0:0:0:0 | closures | getDecl: | closures.swift:158:10:158:15 | x | isDirect: | yes | isEscaping: | yes | +| closures.swift:163:16:163:16 | f(_:) | getModule: | file://:0:0:0:0 | closures | getDecl: | closures.swift:149:3:156:3 | f(_:) | isDirect: | no | isEscaping: | yes | +| closures.swift:164:21:164:21 | next | getModule: | file://:0:0:0:0 | closures | getDecl: | closures.swift:163:9:163:9 | next | isDirect: | yes | isEscaping: | yes | +| closures.swift:164:36:164:36 | x | getModule: | file://:0:0:0:0 | closures | getDecl: | closures.swift:158:10:158:15 | x | isDirect: | yes | isEscaping: | yes | +| closures.swift:195:3:195:3 | g | getModule: | file://:0:0:0:0 | closures | getDecl: | closures.swift:68:5:68:5 | g | isDirect: | yes | isEscaping: | yes | getMember diff --git a/swift/ql/test/extractor-tests/generated/decl/CapturedDecl/CapturedDecl.ql b/swift/ql/test/extractor-tests/generated/decl/CapturedDecl/CapturedDecl.ql index 1f76d90ee2e..d4f39d659bc 100644 --- a/swift/ql/test/extractor-tests/generated/decl/CapturedDecl/CapturedDecl.ql +++ b/swift/ql/test/extractor-tests/generated/decl/CapturedDecl/CapturedDecl.ql @@ -3,16 +3,14 @@ import codeql.swift.elements import TestUtils query predicate instances( - CapturedDecl x, string getModule__label, ModuleDecl getModule, string getNumberOfMembers__label, - int getNumberOfMembers, string getDecl__label, ValueDecl getDecl, string isDirect__label, - string isDirect, string isEscaping__label, string isEscaping + CapturedDecl x, string getModule__label, ModuleDecl getModule, string getDecl__label, + ValueDecl getDecl, string isDirect__label, string isDirect, string isEscaping__label, + string isEscaping ) { toBeTested(x) and not x.isUnknown() and getModule__label = "getModule:" and getModule = x.getModule() and - getNumberOfMembers__label = "getNumberOfMembers:" and - getNumberOfMembers = x.getNumberOfMembers() and getDecl__label = "getDecl:" and getDecl = x.getDecl() and isDirect__label = "isDirect:" and diff --git a/swift/ql/test/extractor-tests/generated/decl/ClassDecl/ClassDecl.expected b/swift/ql/test/extractor-tests/generated/decl/ClassDecl/ClassDecl.expected index ad3f2429988..b15a1cc649d 100644 --- a/swift/ql/test/extractor-tests/generated/decl/ClassDecl/ClassDecl.expected +++ b/swift/ql/test/extractor-tests/generated/decl/ClassDecl/ClassDecl.expected @@ -1,7 +1,7 @@ instances -| class.swift:1:1:7:1 | Foo | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | class | getNumberOfMembers: | 4 | getInterfaceType: | Foo.Type | getName: | Foo | getNumberOfInheritedTypes: | 0 | getType: | Foo | -| class.swift:11:1:14:1 | Generic | getNumberOfGenericTypeParams: | 2 | getModule: | file://:0:0:0:0 | class | getNumberOfMembers: | 6 | getInterfaceType: | Generic.Type | getName: | Generic | getNumberOfInheritedTypes: | 0 | getType: | Generic | -| class.swift:16:1:17:1 | Baz | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | class | getNumberOfMembers: | 2 | getInterfaceType: | Baz.Type | getName: | Baz | getNumberOfInheritedTypes: | 2 | getType: | Baz | +| class.swift:1:1:7:1 | Foo | getModule: | file://:0:0:0:0 | class | getInterfaceType: | Foo.Type | getName: | Foo | getType: | Foo | +| class.swift:11:1:14:1 | Generic | getModule: | file://:0:0:0:0 | class | getInterfaceType: | Generic.Type | getName: | Generic | getType: | Generic | +| class.swift:16:1:17:1 | Baz | getModule: | file://:0:0:0:0 | class | getInterfaceType: | Baz.Type | getName: | Baz | getType: | Baz | getGenericTypeParam | class.swift:11:1:14:1 | Generic | 0 | class.swift:11:15:11:15 | X | | class.swift:11:1:14:1 | Generic | 1 | class.swift:11:18:11:18 | Y | diff --git a/swift/ql/test/extractor-tests/generated/decl/ClassDecl/ClassDecl.ql b/swift/ql/test/extractor-tests/generated/decl/ClassDecl/ClassDecl.ql index a9e86d07108..e32a98ca2bc 100644 --- a/swift/ql/test/extractor-tests/generated/decl/ClassDecl/ClassDecl.ql +++ b/swift/ql/test/extractor-tests/generated/decl/ClassDecl/ClassDecl.ql @@ -3,26 +3,17 @@ import codeql.swift.elements import TestUtils query predicate instances( - ClassDecl x, string getNumberOfGenericTypeParams__label, int getNumberOfGenericTypeParams, - string getModule__label, ModuleDecl getModule, string getNumberOfMembers__label, - int getNumberOfMembers, string getInterfaceType__label, Type getInterfaceType, - string getName__label, string getName, string getNumberOfInheritedTypes__label, - int getNumberOfInheritedTypes, string getType__label, Type getType + ClassDecl x, string getModule__label, ModuleDecl getModule, string getInterfaceType__label, + Type getInterfaceType, string getName__label, string getName, string getType__label, Type getType ) { toBeTested(x) and not x.isUnknown() and - getNumberOfGenericTypeParams__label = "getNumberOfGenericTypeParams:" and - getNumberOfGenericTypeParams = x.getNumberOfGenericTypeParams() and getModule__label = "getModule:" and getModule = x.getModule() and - getNumberOfMembers__label = "getNumberOfMembers:" and - getNumberOfMembers = x.getNumberOfMembers() and getInterfaceType__label = "getInterfaceType:" and getInterfaceType = x.getInterfaceType() and getName__label = "getName:" and getName = x.getName() and - getNumberOfInheritedTypes__label = "getNumberOfInheritedTypes:" and - getNumberOfInheritedTypes = x.getNumberOfInheritedTypes() and getType__label = "getType:" and getType = x.getType() } diff --git a/swift/ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl.expected b/swift/ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl.expected index 75fc7aa41cd..85fef3f52ca 100644 --- a/swift/ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl.expected +++ b/swift/ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl.expected @@ -1,32 +1,32 @@ instances -| var_decls.swift:2:7:2:7 | i | getModule: | file://:0:0:0:0 | var_decls | getNumberOfMembers: | 0 | getInterfaceType: | Int | getNumberOfAccessors: | 0 | getName: | i | getType: | Int | hasAttachedPropertyWrapperType: | no | hasParentPattern: | yes | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | getIntroducerInt: | 0 | -| var_decls.swift:2:12:2:12 | $i$generator | getModule: | file://:0:0:0:0 | var_decls | getNumberOfMembers: | 0 | getInterfaceType: | IndexingIterator> | getNumberOfAccessors: | 0 | getName: | $i$generator | getType: | IndexingIterator> | hasAttachedPropertyWrapperType: | no | hasParentPattern: | yes | hasParentInitializer: | yes | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | getIntroducerInt: | 1 | -| var_decls.swift:4:7:4:7 | i | getModule: | file://:0:0:0:0 | var_decls | getNumberOfMembers: | 0 | getInterfaceType: | Int | getNumberOfAccessors: | 0 | getName: | i | getType: | Int | hasAttachedPropertyWrapperType: | no | hasParentPattern: | yes | hasParentInitializer: | yes | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | getIntroducerInt: | 1 | -| var_decls.swift:7:5:7:5 | numbers | getModule: | file://:0:0:0:0 | var_decls | getNumberOfMembers: | 0 | getInterfaceType: | [Int] | getNumberOfAccessors: | 0 | getName: | numbers | getType: | [Int] | hasAttachedPropertyWrapperType: | no | hasParentPattern: | yes | hasParentInitializer: | yes | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | getIntroducerInt: | 1 | -| var_decls.swift:10:12:10:12 | numbers | getModule: | file://:0:0:0:0 | var_decls | getNumberOfMembers: | 0 | getInterfaceType: | [Int] | getNumberOfAccessors: | 1 | getName: | numbers | getType: | [Int] | hasAttachedPropertyWrapperType: | no | hasParentPattern: | yes | hasParentInitializer: | yes | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | getIntroducerInt: | 0 | -| var_decls.swift:15:7:15:7 | wrappedValue | getModule: | file://:0:0:0:0 | var_decls | getNumberOfMembers: | 0 | getInterfaceType: | T | getNumberOfAccessors: | 3 | getName: | wrappedValue | getType: | T | hasAttachedPropertyWrapperType: | no | hasParentPattern: | yes | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | getIntroducerInt: | 1 | -| var_decls.swift:20:7:20:7 | wrappedValue | getModule: | file://:0:0:0:0 | var_decls | getNumberOfMembers: | 0 | getInterfaceType: | Int | getNumberOfAccessors: | 3 | getName: | wrappedValue | getType: | Int | hasAttachedPropertyWrapperType: | no | hasParentPattern: | yes | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | getIntroducerInt: | 1 | -| var_decls.swift:24:15:24:15 | _wrapped | getModule: | file://:0:0:0:0 | var_decls | getNumberOfMembers: | 0 | getInterfaceType: | X | getNumberOfAccessors: | 3 | getName: | _wrapped | getType: | X | hasAttachedPropertyWrapperType: | no | hasParentPattern: | yes | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | getIntroducerInt: | 1 | -| var_decls.swift:24:15:24:15 | wrapped | getModule: | file://:0:0:0:0 | var_decls | getNumberOfMembers: | 0 | getInterfaceType: | Int | getNumberOfAccessors: | 3 | getName: | wrapped | getType: | Int | hasAttachedPropertyWrapperType: | yes | hasParentPattern: | yes | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | yes | hasPropertyWrapperBackingVar: | yes | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | getIntroducerInt: | 1 | -| var_decls.swift:28:7:28:7 | wrappedValue | getModule: | file://:0:0:0:0 | var_decls | getNumberOfMembers: | 0 | getInterfaceType: | Int | getNumberOfAccessors: | 3 | getName: | wrappedValue | getType: | Int | hasAttachedPropertyWrapperType: | no | hasParentPattern: | yes | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | getIntroducerInt: | 1 | -| var_decls.swift:34:7:34:7 | wrappedValue | getModule: | file://:0:0:0:0 | var_decls | getNumberOfMembers: | 0 | getInterfaceType: | Int | getNumberOfAccessors: | 3 | getName: | wrappedValue | getType: | Int | hasAttachedPropertyWrapperType: | no | hasParentPattern: | yes | hasParentInitializer: | yes | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | getIntroducerInt: | 1 | -| var_decls.swift:35:7:35:7 | projectedValue | getModule: | file://:0:0:0:0 | var_decls | getNumberOfMembers: | 0 | getInterfaceType: | Bool | getNumberOfAccessors: | 3 | getName: | projectedValue | getType: | Bool | hasAttachedPropertyWrapperType: | no | hasParentPattern: | yes | hasParentInitializer: | yes | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | getIntroducerInt: | 1 | -| var_decls.swift:39:7:39:7 | wrappedValue | getModule: | file://:0:0:0:0 | var_decls | getNumberOfMembers: | 0 | getInterfaceType: | Int | getNumberOfAccessors: | 3 | getName: | wrappedValue | getType: | Int | hasAttachedPropertyWrapperType: | no | hasParentPattern: | yes | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | getIntroducerInt: | 1 | -| var_decls.swift:40:7:40:7 | projectedValue | getModule: | file://:0:0:0:0 | var_decls | getNumberOfMembers: | 0 | getInterfaceType: | Bool | getNumberOfAccessors: | 3 | getName: | projectedValue | getType: | Bool | hasAttachedPropertyWrapperType: | no | hasParentPattern: | yes | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | getIntroducerInt: | 1 | -| var_decls.swift:54:10:54:10 | _w1 | getModule: | file://:0:0:0:0 | var_decls | getNumberOfMembers: | 0 | getInterfaceType: | X | getNumberOfAccessors: | 0 | getName: | _w1 | getType: | X | hasAttachedPropertyWrapperType: | no | hasParentPattern: | yes | hasParentInitializer: | yes | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | getIntroducerInt: | 1 | -| var_decls.swift:54:10:54:10 | w1 | getModule: | file://:0:0:0:0 | var_decls | getNumberOfMembers: | 0 | getInterfaceType: | Int | getNumberOfAccessors: | 2 | getName: | w1 | getType: | Int | hasAttachedPropertyWrapperType: | yes | hasParentPattern: | yes | hasParentInitializer: | yes | hasPropertyWrapperBackingVarBinding: | yes | hasPropertyWrapperBackingVar: | yes | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | getIntroducerInt: | 1 | -| var_decls.swift:55:24:55:24 | _w2 | getModule: | file://:0:0:0:0 | var_decls | getNumberOfMembers: | 0 | getInterfaceType: | WrapperWithInit | getNumberOfAccessors: | 0 | getName: | _w2 | getType: | WrapperWithInit | hasAttachedPropertyWrapperType: | no | hasParentPattern: | yes | hasParentInitializer: | yes | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | getIntroducerInt: | 1 | -| var_decls.swift:55:24:55:24 | w2 | getModule: | file://:0:0:0:0 | var_decls | getNumberOfMembers: | 0 | getInterfaceType: | Int | getNumberOfAccessors: | 2 | getName: | w2 | getType: | Int | hasAttachedPropertyWrapperType: | yes | hasParentPattern: | yes | hasParentInitializer: | yes | hasPropertyWrapperBackingVarBinding: | yes | hasPropertyWrapperBackingVar: | yes | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | getIntroducerInt: | 1 | -| var_decls.swift:56:29:56:29 | $w3 | getModule: | file://:0:0:0:0 | var_decls | getNumberOfMembers: | 0 | getInterfaceType: | Bool | getNumberOfAccessors: | 2 | getName: | $w3 | getType: | Bool | hasAttachedPropertyWrapperType: | no | hasParentPattern: | yes | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | getIntroducerInt: | 1 | -| var_decls.swift:56:29:56:29 | _w3 | getModule: | file://:0:0:0:0 | var_decls | getNumberOfMembers: | 0 | getInterfaceType: | WrapperWithProjected | getNumberOfAccessors: | 0 | getName: | _w3 | getType: | WrapperWithProjected | hasAttachedPropertyWrapperType: | no | hasParentPattern: | yes | hasParentInitializer: | yes | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | getIntroducerInt: | 1 | -| var_decls.swift:56:29:56:29 | w3 | getModule: | file://:0:0:0:0 | var_decls | getNumberOfMembers: | 0 | getInterfaceType: | Int | getNumberOfAccessors: | 2 | getName: | w3 | getType: | Int | hasAttachedPropertyWrapperType: | yes | hasParentPattern: | yes | hasParentInitializer: | yes | hasPropertyWrapperBackingVarBinding: | yes | hasPropertyWrapperBackingVar: | yes | hasPropertyWrapperProjectionVarBinding: | yes | hasPropertyWrapperProjectionVar: | yes | getIntroducerInt: | 1 | -| var_decls.swift:57:36:57:36 | $w4 | getModule: | file://:0:0:0:0 | var_decls | getNumberOfMembers: | 0 | getInterfaceType: | Bool | getNumberOfAccessors: | 2 | getName: | $w4 | getType: | Bool | hasAttachedPropertyWrapperType: | no | hasParentPattern: | yes | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | getIntroducerInt: | 1 | -| var_decls.swift:57:36:57:36 | _w4 | getModule: | file://:0:0:0:0 | var_decls | getNumberOfMembers: | 0 | getInterfaceType: | WrapperWithProjectedAndInit | getNumberOfAccessors: | 0 | getName: | _w4 | getType: | WrapperWithProjectedAndInit | hasAttachedPropertyWrapperType: | no | hasParentPattern: | yes | hasParentInitializer: | yes | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | getIntroducerInt: | 1 | -| var_decls.swift:57:36:57:36 | w4 | getModule: | file://:0:0:0:0 | var_decls | getNumberOfMembers: | 0 | getInterfaceType: | Int | getNumberOfAccessors: | 2 | getName: | w4 | getType: | Int | hasAttachedPropertyWrapperType: | yes | hasParentPattern: | yes | hasParentInitializer: | yes | hasPropertyWrapperBackingVarBinding: | yes | hasPropertyWrapperBackingVar: | yes | hasPropertyWrapperProjectionVarBinding: | yes | hasPropertyWrapperProjectionVar: | yes | getIntroducerInt: | 1 | -| var_decls.swift:65:19:65:19 | case_variable | getModule: | file://:0:0:0:0 | var_decls | getNumberOfMembers: | 0 | getInterfaceType: | Int | getNumberOfAccessors: | 0 | getName: | case_variable | getType: | Int | hasAttachedPropertyWrapperType: | no | hasParentPattern: | yes | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | getIntroducerInt: | 0 | -| var_decls.swift:65:34:65:34 | $match | getModule: | file://:0:0:0:0 | var_decls | getNumberOfMembers: | 0 | getInterfaceType: | Int | getNumberOfAccessors: | 0 | getName: | $match | getType: | Int | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | getIntroducerInt: | 0 | -| var_decls.swift:67:15:67:15 | $match | getModule: | file://:0:0:0:0 | var_decls | getNumberOfMembers: | 0 | getInterfaceType: | Int | getNumberOfAccessors: | 0 | getName: | $match | getType: | Int | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | getIntroducerInt: | 0 | -| var_decls.swift:67:22:67:22 | unused_case_variable | getModule: | file://:0:0:0:0 | var_decls | getNumberOfMembers: | 0 | getInterfaceType: | Int | getNumberOfAccessors: | 0 | getName: | unused_case_variable | getType: | Int | hasAttachedPropertyWrapperType: | no | hasParentPattern: | yes | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | getIntroducerInt: | 0 | +| var_decls.swift:2:7:2:7 | i | getModule: | file://:0:0:0:0 | var_decls | getInterfaceType: | Int | getName: | i | getType: | Int | getIntroducerInt: | 0 | +| var_decls.swift:2:12:2:12 | $i$generator | getModule: | file://:0:0:0:0 | var_decls | getInterfaceType: | IndexingIterator> | getName: | $i$generator | getType: | IndexingIterator> | getIntroducerInt: | 1 | +| var_decls.swift:4:7:4:7 | i | getModule: | file://:0:0:0:0 | var_decls | getInterfaceType: | Int | getName: | i | getType: | Int | getIntroducerInt: | 1 | +| var_decls.swift:7:5:7:5 | numbers | getModule: | file://:0:0:0:0 | var_decls | getInterfaceType: | [Int] | getName: | numbers | getType: | [Int] | getIntroducerInt: | 1 | +| var_decls.swift:10:12:10:12 | numbers | getModule: | file://:0:0:0:0 | var_decls | getInterfaceType: | [Int] | getName: | numbers | getType: | [Int] | getIntroducerInt: | 0 | +| var_decls.swift:15:7:15:7 | wrappedValue | getModule: | file://:0:0:0:0 | var_decls | getInterfaceType: | T | getName: | wrappedValue | getType: | T | getIntroducerInt: | 1 | +| var_decls.swift:20:7:20:7 | wrappedValue | getModule: | file://:0:0:0:0 | var_decls | getInterfaceType: | Int | getName: | wrappedValue | getType: | Int | getIntroducerInt: | 1 | +| var_decls.swift:24:15:24:15 | _wrapped | getModule: | file://:0:0:0:0 | var_decls | getInterfaceType: | X | getName: | _wrapped | getType: | X | getIntroducerInt: | 1 | +| var_decls.swift:24:15:24:15 | wrapped | getModule: | file://:0:0:0:0 | var_decls | getInterfaceType: | Int | getName: | wrapped | getType: | Int | getIntroducerInt: | 1 | +| var_decls.swift:28:7:28:7 | wrappedValue | getModule: | file://:0:0:0:0 | var_decls | getInterfaceType: | Int | getName: | wrappedValue | getType: | Int | getIntroducerInt: | 1 | +| var_decls.swift:34:7:34:7 | wrappedValue | getModule: | file://:0:0:0:0 | var_decls | getInterfaceType: | Int | getName: | wrappedValue | getType: | Int | getIntroducerInt: | 1 | +| var_decls.swift:35:7:35:7 | projectedValue | getModule: | file://:0:0:0:0 | var_decls | getInterfaceType: | Bool | getName: | projectedValue | getType: | Bool | getIntroducerInt: | 1 | +| var_decls.swift:39:7:39:7 | wrappedValue | getModule: | file://:0:0:0:0 | var_decls | getInterfaceType: | Int | getName: | wrappedValue | getType: | Int | getIntroducerInt: | 1 | +| var_decls.swift:40:7:40:7 | projectedValue | getModule: | file://:0:0:0:0 | var_decls | getInterfaceType: | Bool | getName: | projectedValue | getType: | Bool | getIntroducerInt: | 1 | +| var_decls.swift:54:10:54:10 | _w1 | getModule: | file://:0:0:0:0 | var_decls | getInterfaceType: | X | getName: | _w1 | getType: | X | getIntroducerInt: | 1 | +| var_decls.swift:54:10:54:10 | w1 | getModule: | file://:0:0:0:0 | var_decls | getInterfaceType: | Int | getName: | w1 | getType: | Int | getIntroducerInt: | 1 | +| var_decls.swift:55:24:55:24 | _w2 | getModule: | file://:0:0:0:0 | var_decls | getInterfaceType: | WrapperWithInit | getName: | _w2 | getType: | WrapperWithInit | getIntroducerInt: | 1 | +| var_decls.swift:55:24:55:24 | w2 | getModule: | file://:0:0:0:0 | var_decls | getInterfaceType: | Int | getName: | w2 | getType: | Int | getIntroducerInt: | 1 | +| var_decls.swift:56:29:56:29 | $w3 | getModule: | file://:0:0:0:0 | var_decls | getInterfaceType: | Bool | getName: | $w3 | getType: | Bool | getIntroducerInt: | 1 | +| var_decls.swift:56:29:56:29 | _w3 | getModule: | file://:0:0:0:0 | var_decls | getInterfaceType: | WrapperWithProjected | getName: | _w3 | getType: | WrapperWithProjected | getIntroducerInt: | 1 | +| var_decls.swift:56:29:56:29 | w3 | getModule: | file://:0:0:0:0 | var_decls | getInterfaceType: | Int | getName: | w3 | getType: | Int | getIntroducerInt: | 1 | +| var_decls.swift:57:36:57:36 | $w4 | getModule: | file://:0:0:0:0 | var_decls | getInterfaceType: | Bool | getName: | $w4 | getType: | Bool | getIntroducerInt: | 1 | +| var_decls.swift:57:36:57:36 | _w4 | getModule: | file://:0:0:0:0 | var_decls | getInterfaceType: | WrapperWithProjectedAndInit | getName: | _w4 | getType: | WrapperWithProjectedAndInit | getIntroducerInt: | 1 | +| var_decls.swift:57:36:57:36 | w4 | getModule: | file://:0:0:0:0 | var_decls | getInterfaceType: | Int | getName: | w4 | getType: | Int | getIntroducerInt: | 1 | +| var_decls.swift:65:19:65:19 | case_variable | getModule: | file://:0:0:0:0 | var_decls | getInterfaceType: | Int | getName: | case_variable | getType: | Int | getIntroducerInt: | 0 | +| var_decls.swift:65:34:65:34 | $match | getModule: | file://:0:0:0:0 | var_decls | getInterfaceType: | Int | getName: | $match | getType: | Int | getIntroducerInt: | 0 | +| var_decls.swift:67:15:67:15 | $match | getModule: | file://:0:0:0:0 | var_decls | getInterfaceType: | Int | getName: | $match | getType: | Int | getIntroducerInt: | 0 | +| var_decls.swift:67:22:67:22 | unused_case_variable | getModule: | file://:0:0:0:0 | var_decls | getInterfaceType: | Int | getName: | unused_case_variable | getType: | Int | getIntroducerInt: | 0 | getMember getAccessor | var_decls.swift:10:12:10:12 | numbers | 0 | var_decls.swift:10:12:10:12 | get | diff --git a/swift/ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl.ql b/swift/ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl.ql index 6569901dcbe..f6c7b554143 100644 --- a/swift/ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl.ql +++ b/swift/ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl.ql @@ -3,66 +3,20 @@ import codeql.swift.elements import TestUtils query predicate instances( - ConcreteVarDecl x, string getModule__label, ModuleDecl getModule, - string getNumberOfMembers__label, int getNumberOfMembers, string getInterfaceType__label, - Type getInterfaceType, string getNumberOfAccessors__label, int getNumberOfAccessors, - string getName__label, string getName, string getType__label, Type getType, - string hasAttachedPropertyWrapperType__label, string hasAttachedPropertyWrapperType, - string hasParentPattern__label, string hasParentPattern, string hasParentInitializer__label, - string hasParentInitializer, string hasPropertyWrapperBackingVarBinding__label, - string hasPropertyWrapperBackingVarBinding, string hasPropertyWrapperBackingVar__label, - string hasPropertyWrapperBackingVar, string hasPropertyWrapperProjectionVarBinding__label, - string hasPropertyWrapperProjectionVarBinding, string hasPropertyWrapperProjectionVar__label, - string hasPropertyWrapperProjectionVar, string getIntroducerInt__label, int getIntroducerInt + ConcreteVarDecl x, string getModule__label, ModuleDecl getModule, string getInterfaceType__label, + Type getInterfaceType, string getName__label, string getName, string getType__label, Type getType, + string getIntroducerInt__label, int getIntroducerInt ) { toBeTested(x) and not x.isUnknown() and getModule__label = "getModule:" and getModule = x.getModule() and - getNumberOfMembers__label = "getNumberOfMembers:" and - getNumberOfMembers = x.getNumberOfMembers() and getInterfaceType__label = "getInterfaceType:" and getInterfaceType = x.getInterfaceType() and - getNumberOfAccessors__label = "getNumberOfAccessors:" and - getNumberOfAccessors = x.getNumberOfAccessors() and getName__label = "getName:" and getName = x.getName() and getType__label = "getType:" and getType = x.getType() and - hasAttachedPropertyWrapperType__label = "hasAttachedPropertyWrapperType:" and - ( - if x.hasAttachedPropertyWrapperType() - then hasAttachedPropertyWrapperType = "yes" - else hasAttachedPropertyWrapperType = "no" - ) and - hasParentPattern__label = "hasParentPattern:" and - (if x.hasParentPattern() then hasParentPattern = "yes" else hasParentPattern = "no") and - hasParentInitializer__label = "hasParentInitializer:" and - (if x.hasParentInitializer() then hasParentInitializer = "yes" else hasParentInitializer = "no") and - hasPropertyWrapperBackingVarBinding__label = "hasPropertyWrapperBackingVarBinding:" and - ( - if x.hasPropertyWrapperBackingVarBinding() - then hasPropertyWrapperBackingVarBinding = "yes" - else hasPropertyWrapperBackingVarBinding = "no" - ) and - hasPropertyWrapperBackingVar__label = "hasPropertyWrapperBackingVar:" and - ( - if x.hasPropertyWrapperBackingVar() - then hasPropertyWrapperBackingVar = "yes" - else hasPropertyWrapperBackingVar = "no" - ) and - hasPropertyWrapperProjectionVarBinding__label = "hasPropertyWrapperProjectionVarBinding:" and - ( - if x.hasPropertyWrapperProjectionVarBinding() - then hasPropertyWrapperProjectionVarBinding = "yes" - else hasPropertyWrapperProjectionVarBinding = "no" - ) and - hasPropertyWrapperProjectionVar__label = "hasPropertyWrapperProjectionVar:" and - ( - if x.hasPropertyWrapperProjectionVar() - then hasPropertyWrapperProjectionVar = "yes" - else hasPropertyWrapperProjectionVar = "no" - ) and getIntroducerInt__label = "getIntroducerInt:" and getIntroducerInt = x.getIntroducerInt() } diff --git a/swift/ql/test/extractor-tests/generated/decl/EnumDecl/EnumCaseDecl.expected b/swift/ql/test/extractor-tests/generated/decl/EnumDecl/EnumCaseDecl.expected index 4f4fe8cfa1b..b6e400b30fa 100644 --- a/swift/ql/test/extractor-tests/generated/decl/EnumDecl/EnumCaseDecl.expected +++ b/swift/ql/test/extractor-tests/generated/decl/EnumDecl/EnumCaseDecl.expected @@ -1,16 +1,16 @@ instances -| enums.swift:2:5:2:18 | case ... | getModule: | file://:0:0:0:0 | enums | getNumberOfMembers: | 0 | getNumberOfElements: | 2 | -| enums.swift:3:5:3:26 | case ... | getModule: | file://:0:0:0:0 | enums | getNumberOfMembers: | 0 | getNumberOfElements: | 3 | -| enums.swift:8:5:8:18 | case ... | getModule: | file://:0:0:0:0 | enums | getNumberOfMembers: | 0 | getNumberOfElements: | 2 | -| enums.swift:9:5:9:26 | case ... | getModule: | file://:0:0:0:0 | enums | getNumberOfMembers: | 0 | getNumberOfElements: | 3 | -| enums.swift:13:5:13:22 | case ... | getModule: | file://:0:0:0:0 | enums | getNumberOfMembers: | 0 | getNumberOfElements: | 1 | -| enums.swift:14:5:14:21 | case ... | getModule: | file://:0:0:0:0 | enums | getNumberOfMembers: | 0 | getNumberOfElements: | 1 | -| enums.swift:15:5:15:35 | case ... | getModule: | file://:0:0:0:0 | enums | getNumberOfMembers: | 0 | getNumberOfElements: | 1 | -| enums.swift:19:5:19:10 | case ... | getModule: | file://:0:0:0:0 | enums | getNumberOfMembers: | 0 | getNumberOfElements: | 1 | -| enums.swift:20:5:20:16 | case ... | getModule: | file://:0:0:0:0 | enums | getNumberOfMembers: | 0 | getNumberOfElements: | 1 | -| enums.swift:24:5:24:25 | case ... | getModule: | file://:0:0:0:0 | enums | getNumberOfMembers: | 0 | getNumberOfElements: | 1 | -| enums.swift:25:5:25:24 | case ... | getModule: | file://:0:0:0:0 | enums | getNumberOfMembers: | 0 | getNumberOfElements: | 1 | -| enums.swift:26:5:26:44 | case ... | getModule: | file://:0:0:0:0 | enums | getNumberOfMembers: | 0 | getNumberOfElements: | 1 | +| enums.swift:2:5:2:18 | case ... | getModule: | file://:0:0:0:0 | enums | +| enums.swift:3:5:3:26 | case ... | getModule: | file://:0:0:0:0 | enums | +| enums.swift:8:5:8:18 | case ... | getModule: | file://:0:0:0:0 | enums | +| enums.swift:9:5:9:26 | case ... | getModule: | file://:0:0:0:0 | enums | +| enums.swift:13:5:13:22 | case ... | getModule: | file://:0:0:0:0 | enums | +| enums.swift:14:5:14:21 | case ... | getModule: | file://:0:0:0:0 | enums | +| enums.swift:15:5:15:35 | case ... | getModule: | file://:0:0:0:0 | enums | +| enums.swift:19:5:19:10 | case ... | getModule: | file://:0:0:0:0 | enums | +| enums.swift:20:5:20:16 | case ... | getModule: | file://:0:0:0:0 | enums | +| enums.swift:24:5:24:25 | case ... | getModule: | file://:0:0:0:0 | enums | +| enums.swift:25:5:25:24 | case ... | getModule: | file://:0:0:0:0 | enums | +| enums.swift:26:5:26:44 | case ... | getModule: | file://:0:0:0:0 | enums | getMember getElement | enums.swift:2:5:2:18 | case ... | 0 | enums.swift:2:10:2:10 | value1 | diff --git a/swift/ql/test/extractor-tests/generated/decl/EnumDecl/EnumCaseDecl.ql b/swift/ql/test/extractor-tests/generated/decl/EnumDecl/EnumCaseDecl.ql index 77c68ef40e9..fffe694415c 100644 --- a/swift/ql/test/extractor-tests/generated/decl/EnumDecl/EnumCaseDecl.ql +++ b/swift/ql/test/extractor-tests/generated/decl/EnumDecl/EnumCaseDecl.ql @@ -2,18 +2,11 @@ import codeql.swift.elements import TestUtils -query predicate instances( - EnumCaseDecl x, string getModule__label, ModuleDecl getModule, string getNumberOfMembers__label, - int getNumberOfMembers, string getNumberOfElements__label, int getNumberOfElements -) { +query predicate instances(EnumCaseDecl x, string getModule__label, ModuleDecl getModule) { toBeTested(x) and not x.isUnknown() and getModule__label = "getModule:" and - getModule = x.getModule() and - getNumberOfMembers__label = "getNumberOfMembers:" and - getNumberOfMembers = x.getNumberOfMembers() and - getNumberOfElements__label = "getNumberOfElements:" and - getNumberOfElements = x.getNumberOfElements() + getModule = x.getModule() } query predicate getMember(EnumCaseDecl x, int index, Decl getMember) { diff --git a/swift/ql/test/extractor-tests/generated/decl/EnumDecl/EnumDecl.expected b/swift/ql/test/extractor-tests/generated/decl/EnumDecl/EnumDecl.expected index 3f499934751..06c1789b3bc 100644 --- a/swift/ql/test/extractor-tests/generated/decl/EnumDecl/EnumDecl.expected +++ b/swift/ql/test/extractor-tests/generated/decl/EnumDecl/EnumDecl.expected @@ -1,9 +1,9 @@ instances -| enums.swift:1:1:4:1 | EnumValues | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | enums | getNumberOfMembers: | 11 | getInterfaceType: | EnumValues.Type | getName: | EnumValues | getNumberOfInheritedTypes: | 0 | getType: | EnumValues | -| enums.swift:7:1:10:1 | EnumValuesWithBase | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | enums | getNumberOfMembers: | 11 | getInterfaceType: | EnumValuesWithBase.Type | getName: | EnumValuesWithBase | getNumberOfInheritedTypes: | 1 | getType: | EnumValuesWithBase | -| enums.swift:12:1:16:1 | EnumWithParams | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | enums | getNumberOfMembers: | 6 | getInterfaceType: | EnumWithParams.Type | getName: | EnumWithParams | getNumberOfInheritedTypes: | 0 | getType: | EnumWithParams | -| enums.swift:18:1:21:1 | GenericEnum | getNumberOfGenericTypeParams: | 1 | getModule: | file://:0:0:0:0 | enums | getNumberOfMembers: | 4 | getInterfaceType: | GenericEnum.Type | getName: | GenericEnum | getNumberOfInheritedTypes: | 0 | getType: | GenericEnum | -| enums.swift:23:1:27:1 | EnumWithNamedParams | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | enums | getNumberOfMembers: | 6 | getInterfaceType: | EnumWithNamedParams.Type | getName: | EnumWithNamedParams | getNumberOfInheritedTypes: | 0 | getType: | EnumWithNamedParams | +| enums.swift:1:1:4:1 | EnumValues | getModule: | file://:0:0:0:0 | enums | getInterfaceType: | EnumValues.Type | getName: | EnumValues | getType: | EnumValues | +| enums.swift:7:1:10:1 | EnumValuesWithBase | getModule: | file://:0:0:0:0 | enums | getInterfaceType: | EnumValuesWithBase.Type | getName: | EnumValuesWithBase | getType: | EnumValuesWithBase | +| enums.swift:12:1:16:1 | EnumWithParams | getModule: | file://:0:0:0:0 | enums | getInterfaceType: | EnumWithParams.Type | getName: | EnumWithParams | getType: | EnumWithParams | +| enums.swift:18:1:21:1 | GenericEnum | getModule: | file://:0:0:0:0 | enums | getInterfaceType: | GenericEnum.Type | getName: | GenericEnum | getType: | GenericEnum | +| enums.swift:23:1:27:1 | EnumWithNamedParams | getModule: | file://:0:0:0:0 | enums | getInterfaceType: | EnumWithNamedParams.Type | getName: | EnumWithNamedParams | getType: | EnumWithNamedParams | getGenericTypeParam | enums.swift:18:1:21:1 | GenericEnum | 0 | enums.swift:18:18:18:18 | T | getMember diff --git a/swift/ql/test/extractor-tests/generated/decl/EnumDecl/EnumDecl.ql b/swift/ql/test/extractor-tests/generated/decl/EnumDecl/EnumDecl.ql index 3eee947b9f6..dabf9078cea 100644 --- a/swift/ql/test/extractor-tests/generated/decl/EnumDecl/EnumDecl.ql +++ b/swift/ql/test/extractor-tests/generated/decl/EnumDecl/EnumDecl.ql @@ -3,26 +3,17 @@ import codeql.swift.elements import TestUtils query predicate instances( - EnumDecl x, string getNumberOfGenericTypeParams__label, int getNumberOfGenericTypeParams, - string getModule__label, ModuleDecl getModule, string getNumberOfMembers__label, - int getNumberOfMembers, string getInterfaceType__label, Type getInterfaceType, - string getName__label, string getName, string getNumberOfInheritedTypes__label, - int getNumberOfInheritedTypes, string getType__label, Type getType + EnumDecl x, string getModule__label, ModuleDecl getModule, string getInterfaceType__label, + Type getInterfaceType, string getName__label, string getName, string getType__label, Type getType ) { toBeTested(x) and not x.isUnknown() and - getNumberOfGenericTypeParams__label = "getNumberOfGenericTypeParams:" and - getNumberOfGenericTypeParams = x.getNumberOfGenericTypeParams() and getModule__label = "getModule:" and getModule = x.getModule() and - getNumberOfMembers__label = "getNumberOfMembers:" and - getNumberOfMembers = x.getNumberOfMembers() and getInterfaceType__label = "getInterfaceType:" and getInterfaceType = x.getInterfaceType() and getName__label = "getName:" and getName = x.getName() and - getNumberOfInheritedTypes__label = "getNumberOfInheritedTypes:" and - getNumberOfInheritedTypes = x.getNumberOfInheritedTypes() and getType__label = "getType:" and getType = x.getType() } diff --git a/swift/ql/test/extractor-tests/generated/decl/EnumDecl/EnumElementDecl.expected b/swift/ql/test/extractor-tests/generated/decl/EnumDecl/EnumElementDecl.expected index dd0bc7bdc22..70601a44e2a 100644 --- a/swift/ql/test/extractor-tests/generated/decl/EnumDecl/EnumElementDecl.expected +++ b/swift/ql/test/extractor-tests/generated/decl/EnumDecl/EnumElementDecl.expected @@ -1,22 +1,22 @@ instances -| enums.swift:2:10:2:10 | value1 | getModule: | file://:0:0:0:0 | enums | getNumberOfMembers: | 0 | getInterfaceType: | (EnumValues.Type) -> EnumValues | getName: | value1 | getNumberOfParams: | 0 | -| enums.swift:2:18:2:18 | value2 | getModule: | file://:0:0:0:0 | enums | getNumberOfMembers: | 0 | getInterfaceType: | (EnumValues.Type) -> EnumValues | getName: | value2 | getNumberOfParams: | 0 | -| enums.swift:3:10:3:10 | value3 | getModule: | file://:0:0:0:0 | enums | getNumberOfMembers: | 0 | getInterfaceType: | (EnumValues.Type) -> EnumValues | getName: | value3 | getNumberOfParams: | 0 | -| enums.swift:3:18:3:18 | value4 | getModule: | file://:0:0:0:0 | enums | getNumberOfMembers: | 0 | getInterfaceType: | (EnumValues.Type) -> EnumValues | getName: | value4 | getNumberOfParams: | 0 | -| enums.swift:3:26:3:26 | value5 | getModule: | file://:0:0:0:0 | enums | getNumberOfMembers: | 0 | getInterfaceType: | (EnumValues.Type) -> EnumValues | getName: | value5 | getNumberOfParams: | 0 | -| enums.swift:8:10:8:10 | value1 | getModule: | file://:0:0:0:0 | enums | getNumberOfMembers: | 0 | getInterfaceType: | (EnumValuesWithBase.Type) -> EnumValuesWithBase | getName: | value1 | getNumberOfParams: | 0 | -| enums.swift:8:18:8:18 | value2 | getModule: | file://:0:0:0:0 | enums | getNumberOfMembers: | 0 | getInterfaceType: | (EnumValuesWithBase.Type) -> EnumValuesWithBase | getName: | value2 | getNumberOfParams: | 0 | -| enums.swift:9:10:9:10 | value3 | getModule: | file://:0:0:0:0 | enums | getNumberOfMembers: | 0 | getInterfaceType: | (EnumValuesWithBase.Type) -> EnumValuesWithBase | getName: | value3 | getNumberOfParams: | 0 | -| enums.swift:9:18:9:18 | value4 | getModule: | file://:0:0:0:0 | enums | getNumberOfMembers: | 0 | getInterfaceType: | (EnumValuesWithBase.Type) -> EnumValuesWithBase | getName: | value4 | getNumberOfParams: | 0 | -| enums.swift:9:26:9:26 | value5 | getModule: | file://:0:0:0:0 | enums | getNumberOfMembers: | 0 | getInterfaceType: | (EnumValuesWithBase.Type) -> EnumValuesWithBase | getName: | value5 | getNumberOfParams: | 0 | -| enums.swift:13:10:13:22 | nodata1 | getModule: | file://:0:0:0:0 | enums | getNumberOfMembers: | 0 | getInterfaceType: | (EnumWithParams.Type) -> (Void) -> EnumWithParams | getName: | nodata1 | getNumberOfParams: | 1 | -| enums.swift:14:10:14:21 | intdata | getModule: | file://:0:0:0:0 | enums | getNumberOfMembers: | 0 | getInterfaceType: | (EnumWithParams.Type) -> (Int) -> EnumWithParams | getName: | intdata | getNumberOfParams: | 1 | -| enums.swift:15:10:15:35 | tuple | getModule: | file://:0:0:0:0 | enums | getNumberOfMembers: | 0 | getInterfaceType: | (EnumWithParams.Type) -> (Int, String, Double) -> EnumWithParams | getName: | tuple | getNumberOfParams: | 3 | -| enums.swift:19:10:19:10 | none | getModule: | file://:0:0:0:0 | enums | getNumberOfMembers: | 0 | getInterfaceType: | (GenericEnum.Type) -> GenericEnum | getName: | none | getNumberOfParams: | 0 | -| enums.swift:20:10:20:16 | some | getModule: | file://:0:0:0:0 | enums | getNumberOfMembers: | 0 | getInterfaceType: | (GenericEnum.Type) -> (T) -> GenericEnum | getName: | some | getNumberOfParams: | 1 | -| enums.swift:24:10:24:25 | nodata1 | getModule: | file://:0:0:0:0 | enums | getNumberOfMembers: | 0 | getInterfaceType: | (EnumWithNamedParams.Type) -> (Void) -> EnumWithNamedParams | getName: | nodata1 | getNumberOfParams: | 1 | -| enums.swift:25:10:25:24 | intdata | getModule: | file://:0:0:0:0 | enums | getNumberOfMembers: | 0 | getInterfaceType: | (EnumWithNamedParams.Type) -> (Int) -> EnumWithNamedParams | getName: | intdata | getNumberOfParams: | 1 | -| enums.swift:26:10:26:44 | tuple | getModule: | file://:0:0:0:0 | enums | getNumberOfMembers: | 0 | getInterfaceType: | (EnumWithNamedParams.Type) -> (Int, String, Double) -> EnumWithNamedParams | getName: | tuple | getNumberOfParams: | 3 | +| enums.swift:2:10:2:10 | value1 | getModule: | file://:0:0:0:0 | enums | getInterfaceType: | (EnumValues.Type) -> EnumValues | getName: | value1 | +| enums.swift:2:18:2:18 | value2 | getModule: | file://:0:0:0:0 | enums | getInterfaceType: | (EnumValues.Type) -> EnumValues | getName: | value2 | +| enums.swift:3:10:3:10 | value3 | getModule: | file://:0:0:0:0 | enums | getInterfaceType: | (EnumValues.Type) -> EnumValues | getName: | value3 | +| enums.swift:3:18:3:18 | value4 | getModule: | file://:0:0:0:0 | enums | getInterfaceType: | (EnumValues.Type) -> EnumValues | getName: | value4 | +| enums.swift:3:26:3:26 | value5 | getModule: | file://:0:0:0:0 | enums | getInterfaceType: | (EnumValues.Type) -> EnumValues | getName: | value5 | +| enums.swift:8:10:8:10 | value1 | getModule: | file://:0:0:0:0 | enums | getInterfaceType: | (EnumValuesWithBase.Type) -> EnumValuesWithBase | getName: | value1 | +| enums.swift:8:18:8:18 | value2 | getModule: | file://:0:0:0:0 | enums | getInterfaceType: | (EnumValuesWithBase.Type) -> EnumValuesWithBase | getName: | value2 | +| enums.swift:9:10:9:10 | value3 | getModule: | file://:0:0:0:0 | enums | getInterfaceType: | (EnumValuesWithBase.Type) -> EnumValuesWithBase | getName: | value3 | +| enums.swift:9:18:9:18 | value4 | getModule: | file://:0:0:0:0 | enums | getInterfaceType: | (EnumValuesWithBase.Type) -> EnumValuesWithBase | getName: | value4 | +| enums.swift:9:26:9:26 | value5 | getModule: | file://:0:0:0:0 | enums | getInterfaceType: | (EnumValuesWithBase.Type) -> EnumValuesWithBase | getName: | value5 | +| enums.swift:13:10:13:22 | nodata1 | getModule: | file://:0:0:0:0 | enums | getInterfaceType: | (EnumWithParams.Type) -> (Void) -> EnumWithParams | getName: | nodata1 | +| enums.swift:14:10:14:21 | intdata | getModule: | file://:0:0:0:0 | enums | getInterfaceType: | (EnumWithParams.Type) -> (Int) -> EnumWithParams | getName: | intdata | +| enums.swift:15:10:15:35 | tuple | getModule: | file://:0:0:0:0 | enums | getInterfaceType: | (EnumWithParams.Type) -> (Int, String, Double) -> EnumWithParams | getName: | tuple | +| enums.swift:19:10:19:10 | none | getModule: | file://:0:0:0:0 | enums | getInterfaceType: | (GenericEnum.Type) -> GenericEnum | getName: | none | +| enums.swift:20:10:20:16 | some | getModule: | file://:0:0:0:0 | enums | getInterfaceType: | (GenericEnum.Type) -> (T) -> GenericEnum | getName: | some | +| enums.swift:24:10:24:25 | nodata1 | getModule: | file://:0:0:0:0 | enums | getInterfaceType: | (EnumWithNamedParams.Type) -> (Void) -> EnumWithNamedParams | getName: | nodata1 | +| enums.swift:25:10:25:24 | intdata | getModule: | file://:0:0:0:0 | enums | getInterfaceType: | (EnumWithNamedParams.Type) -> (Int) -> EnumWithNamedParams | getName: | intdata | +| enums.swift:26:10:26:44 | tuple | getModule: | file://:0:0:0:0 | enums | getInterfaceType: | (EnumWithNamedParams.Type) -> (Int, String, Double) -> EnumWithNamedParams | getName: | tuple | getMember getParam | enums.swift:13:10:13:22 | nodata1 | 0 | enums.swift:13:18:13:18 | _ | diff --git a/swift/ql/test/extractor-tests/generated/decl/EnumDecl/EnumElementDecl.ql b/swift/ql/test/extractor-tests/generated/decl/EnumDecl/EnumElementDecl.ql index 13e0e10ea54..23f6fdd8e72 100644 --- a/swift/ql/test/extractor-tests/generated/decl/EnumDecl/EnumElementDecl.ql +++ b/swift/ql/test/extractor-tests/generated/decl/EnumDecl/EnumElementDecl.ql @@ -3,23 +3,17 @@ import codeql.swift.elements import TestUtils query predicate instances( - EnumElementDecl x, string getModule__label, ModuleDecl getModule, - string getNumberOfMembers__label, int getNumberOfMembers, string getInterfaceType__label, - Type getInterfaceType, string getName__label, string getName, string getNumberOfParams__label, - int getNumberOfParams + EnumElementDecl x, string getModule__label, ModuleDecl getModule, string getInterfaceType__label, + Type getInterfaceType, string getName__label, string getName ) { toBeTested(x) and not x.isUnknown() and getModule__label = "getModule:" and getModule = x.getModule() and - getNumberOfMembers__label = "getNumberOfMembers:" and - getNumberOfMembers = x.getNumberOfMembers() and getInterfaceType__label = "getInterfaceType:" and getInterfaceType = x.getInterfaceType() and getName__label = "getName:" and - getName = x.getName() and - getNumberOfParams__label = "getNumberOfParams:" and - getNumberOfParams = x.getNumberOfParams() + getName = x.getName() } query predicate getMember(EnumElementDecl x, int index, Decl getMember) { diff --git a/swift/ql/test/extractor-tests/generated/decl/ExtensionDecl/ExtensionDecl.expected b/swift/ql/test/extractor-tests/generated/decl/ExtensionDecl/ExtensionDecl.expected index 712149164f6..581c5d53fc8 100644 --- a/swift/ql/test/extractor-tests/generated/decl/ExtensionDecl/ExtensionDecl.expected +++ b/swift/ql/test/extractor-tests/generated/decl/ExtensionDecl/ExtensionDecl.expected @@ -1,8 +1,8 @@ instances -| extensions.swift:5:1:9:1 | extension of S | getModule: | file://:0:0:0:0 | extensions | getNumberOfMembers: | 3 | getNumberOfGenericTypeParams: | 0 | getExtendedTypeDecl: | extensions.swift:1:1:1:11 | S | getNumberOfProtocols: | 0 | -| extensions.swift:11:1:15:1 | extension of C | getModule: | file://:0:0:0:0 | extensions | getNumberOfMembers: | 3 | getNumberOfGenericTypeParams: | 0 | getExtendedTypeDecl: | extensions.swift:3:1:3:10 | C | getNumberOfProtocols: | 0 | -| extensions.swift:21:1:23:1 | extension of S | getModule: | file://:0:0:0:0 | extensions | getNumberOfMembers: | 1 | getNumberOfGenericTypeParams: | 0 | getExtendedTypeDecl: | extensions.swift:1:1:1:11 | S | getNumberOfProtocols: | 1 | -| extensions.swift:27:1:29:1 | extension of C | getModule: | file://:0:0:0:0 | extensions | getNumberOfMembers: | 1 | getNumberOfGenericTypeParams: | 0 | getExtendedTypeDecl: | extensions.swift:3:1:3:10 | C | getNumberOfProtocols: | 2 | +| extensions.swift:5:1:9:1 | extension of S | getModule: | file://:0:0:0:0 | extensions | getExtendedTypeDecl: | extensions.swift:1:1:1:11 | S | +| extensions.swift:11:1:15:1 | extension of C | getModule: | file://:0:0:0:0 | extensions | getExtendedTypeDecl: | extensions.swift:3:1:3:10 | C | +| extensions.swift:21:1:23:1 | extension of S | getModule: | file://:0:0:0:0 | extensions | getExtendedTypeDecl: | extensions.swift:1:1:1:11 | S | +| extensions.swift:27:1:29:1 | extension of C | getModule: | file://:0:0:0:0 | extensions | getExtendedTypeDecl: | extensions.swift:3:1:3:10 | C | getMember | extensions.swift:5:1:9:1 | extension of S | 0 | extensions.swift:6:5:6:37 | var ... = ... | | extensions.swift:5:1:9:1 | extension of S | 1 | extensions.swift:6:9:6:9 | x | diff --git a/swift/ql/test/extractor-tests/generated/decl/ExtensionDecl/ExtensionDecl.ql b/swift/ql/test/extractor-tests/generated/decl/ExtensionDecl/ExtensionDecl.ql index 05fdef80f8e..f5900f76e5f 100644 --- a/swift/ql/test/extractor-tests/generated/decl/ExtensionDecl/ExtensionDecl.ql +++ b/swift/ql/test/extractor-tests/generated/decl/ExtensionDecl/ExtensionDecl.ql @@ -3,23 +3,15 @@ import codeql.swift.elements import TestUtils query predicate instances( - ExtensionDecl x, string getModule__label, ModuleDecl getModule, string getNumberOfMembers__label, - int getNumberOfMembers, string getNumberOfGenericTypeParams__label, - int getNumberOfGenericTypeParams, string getExtendedTypeDecl__label, - NominalTypeDecl getExtendedTypeDecl, string getNumberOfProtocols__label, int getNumberOfProtocols + ExtensionDecl x, string getModule__label, ModuleDecl getModule, string getExtendedTypeDecl__label, + NominalTypeDecl getExtendedTypeDecl ) { toBeTested(x) and not x.isUnknown() and getModule__label = "getModule:" and getModule = x.getModule() and - getNumberOfMembers__label = "getNumberOfMembers:" and - getNumberOfMembers = x.getNumberOfMembers() and - getNumberOfGenericTypeParams__label = "getNumberOfGenericTypeParams:" and - getNumberOfGenericTypeParams = x.getNumberOfGenericTypeParams() and getExtendedTypeDecl__label = "getExtendedTypeDecl:" and - getExtendedTypeDecl = x.getExtendedTypeDecl() and - getNumberOfProtocols__label = "getNumberOfProtocols:" and - getNumberOfProtocols = x.getNumberOfProtocols() + getExtendedTypeDecl = x.getExtendedTypeDecl() } query predicate getMember(ExtensionDecl x, int index, Decl getMember) { diff --git a/swift/ql/test/extractor-tests/generated/decl/IfConfigDecl/IfConfigDecl.ql b/swift/ql/test/extractor-tests/generated/decl/IfConfigDecl/IfConfigDecl.ql index 31bf9b9c00e..b9948cf8d48 100644 --- a/swift/ql/test/extractor-tests/generated/decl/IfConfigDecl/IfConfigDecl.ql +++ b/swift/ql/test/extractor-tests/generated/decl/IfConfigDecl/IfConfigDecl.ql @@ -2,18 +2,11 @@ import codeql.swift.elements import TestUtils -query predicate instances( - IfConfigDecl x, string getModule__label, ModuleDecl getModule, string getNumberOfMembers__label, - int getNumberOfMembers, string getNumberOfActiveElements__label, int getNumberOfActiveElements -) { +query predicate instances(IfConfigDecl x, string getModule__label, ModuleDecl getModule) { toBeTested(x) and not x.isUnknown() and getModule__label = "getModule:" and - getModule = x.getModule() and - getNumberOfMembers__label = "getNumberOfMembers:" and - getNumberOfMembers = x.getNumberOfMembers() and - getNumberOfActiveElements__label = "getNumberOfActiveElements:" and - getNumberOfActiveElements = x.getNumberOfActiveElements() + getModule = x.getModule() } query predicate getMember(IfConfigDecl x, int index, Decl getMember) { diff --git a/swift/ql/test/extractor-tests/generated/decl/ImportDecl/ImportDecl.expected b/swift/ql/test/extractor-tests/generated/decl/ImportDecl/ImportDecl.expected index b20c6b2f2f9..0e4b0b1d19a 100644 --- a/swift/ql/test/extractor-tests/generated/decl/ImportDecl/ImportDecl.expected +++ b/swift/ql/test/extractor-tests/generated/decl/ImportDecl/ImportDecl.expected @@ -1,9 +1,9 @@ instances -| import.swift:1:1:1:8 | import ... | getModule: | file://:0:0:0:0 | import | getNumberOfMembers: | 0 | isExported: | no | hasImportedModule: | yes | getNumberOfDeclarations: | 0 | -| import.swift:2:1:2:24 | import ... | getModule: | file://:0:0:0:0 | import | getNumberOfMembers: | 0 | isExported: | no | hasImportedModule: | yes | getNumberOfDeclarations: | 1 | -| import.swift:3:12:3:32 | import ... | getModule: | file://:0:0:0:0 | import | getNumberOfMembers: | 0 | isExported: | yes | hasImportedModule: | yes | getNumberOfDeclarations: | 1 | -| import.swift:4:1:4:19 | import ... | getModule: | file://:0:0:0:0 | import | getNumberOfMembers: | 0 | isExported: | no | hasImportedModule: | yes | getNumberOfDeclarations: | 2 | -| import.swift:5:1:5:23 | import ... | getModule: | file://:0:0:0:0 | import | getNumberOfMembers: | 0 | isExported: | no | hasImportedModule: | yes | getNumberOfDeclarations: | 1 | +| import.swift:1:1:1:8 | import ... | getModule: | file://:0:0:0:0 | import | isExported: | no | +| import.swift:2:1:2:24 | import ... | getModule: | file://:0:0:0:0 | import | isExported: | no | +| import.swift:3:12:3:32 | import ... | getModule: | file://:0:0:0:0 | import | isExported: | yes | +| import.swift:4:1:4:19 | import ... | getModule: | file://:0:0:0:0 | import | isExported: | no | +| import.swift:5:1:5:23 | import ... | getModule: | file://:0:0:0:0 | import | isExported: | no | getMember getImportedModule | import.swift:1:1:1:8 | import ... | file://:0:0:0:0 | Swift | diff --git a/swift/ql/test/extractor-tests/generated/decl/ImportDecl/ImportDecl.ql b/swift/ql/test/extractor-tests/generated/decl/ImportDecl/ImportDecl.ql index 247e10d9fa4..505c5f820a7 100644 --- a/swift/ql/test/extractor-tests/generated/decl/ImportDecl/ImportDecl.ql +++ b/swift/ql/test/extractor-tests/generated/decl/ImportDecl/ImportDecl.ql @@ -3,23 +3,15 @@ import codeql.swift.elements import TestUtils query predicate instances( - ImportDecl x, string getModule__label, ModuleDecl getModule, string getNumberOfMembers__label, - int getNumberOfMembers, string isExported__label, string isExported, - string hasImportedModule__label, string hasImportedModule, string getNumberOfDeclarations__label, - int getNumberOfDeclarations + ImportDecl x, string getModule__label, ModuleDecl getModule, string isExported__label, + string isExported ) { toBeTested(x) and not x.isUnknown() and getModule__label = "getModule:" and getModule = x.getModule() and - getNumberOfMembers__label = "getNumberOfMembers:" and - getNumberOfMembers = x.getNumberOfMembers() and isExported__label = "isExported:" and - (if x.isExported() then isExported = "yes" else isExported = "no") and - hasImportedModule__label = "hasImportedModule:" and - (if x.hasImportedModule() then hasImportedModule = "yes" else hasImportedModule = "no") and - getNumberOfDeclarations__label = "getNumberOfDeclarations:" and - getNumberOfDeclarations = x.getNumberOfDeclarations() + if x.isExported() then isExported = "yes" else isExported = "no" } query predicate getMember(ImportDecl x, int index, Decl getMember) { diff --git a/swift/ql/test/extractor-tests/generated/decl/MacroDecl/MacroDecl.expected b/swift/ql/test/extractor-tests/generated/decl/MacroDecl/MacroDecl.expected index 58d9959602b..add8617f94f 100644 --- a/swift/ql/test/extractor-tests/generated/decl/MacroDecl/MacroDecl.expected +++ b/swift/ql/test/extractor-tests/generated/decl/MacroDecl/MacroDecl.expected @@ -1,7 +1,7 @@ instances -| test.swift:2:1:2:50 | MacroDecl | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | test | getNumberOfMembers: | 0 | getInterfaceType: | () -> () | getName: | A() | getNumberOfParameters: | 0 | getNumberOfRoles: | 1 | -| test.swift:4:1:4:15 | MacroDecl | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | test | getNumberOfMembers: | 0 | getInterfaceType: | () -> () | getName: | B() | getNumberOfParameters: | 0 | getNumberOfRoles: | 1 | -| test.swift:7:1:7:15 | MacroDecl | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | test | getNumberOfMembers: | 0 | getInterfaceType: | () -> () | getName: | C() | getNumberOfParameters: | 0 | getNumberOfRoles: | 2 | +| test.swift:2:1:2:50 | MacroDecl | getModule: | file://:0:0:0:0 | test | getInterfaceType: | () -> () | getName: | A() | +| test.swift:4:1:4:15 | MacroDecl | getModule: | file://:0:0:0:0 | test | getInterfaceType: | () -> () | getName: | B() | +| test.swift:7:1:7:15 | MacroDecl | getModule: | file://:0:0:0:0 | test | getInterfaceType: | () -> () | getName: | C() | getGenericTypeParam getMember getParameter diff --git a/swift/ql/test/extractor-tests/generated/decl/MacroDecl/MacroDecl.ql b/swift/ql/test/extractor-tests/generated/decl/MacroDecl/MacroDecl.ql index 0e9c8fdd337..2a675c60910 100644 --- a/swift/ql/test/extractor-tests/generated/decl/MacroDecl/MacroDecl.ql +++ b/swift/ql/test/extractor-tests/generated/decl/MacroDecl/MacroDecl.ql @@ -3,28 +3,17 @@ import codeql.swift.elements import TestUtils query predicate instances( - MacroDecl x, string getNumberOfGenericTypeParams__label, int getNumberOfGenericTypeParams, - string getModule__label, ModuleDecl getModule, string getNumberOfMembers__label, - int getNumberOfMembers, string getInterfaceType__label, Type getInterfaceType, - string getName__label, string getName, string getNumberOfParameters__label, - int getNumberOfParameters, string getNumberOfRoles__label, int getNumberOfRoles + MacroDecl x, string getModule__label, ModuleDecl getModule, string getInterfaceType__label, + Type getInterfaceType, string getName__label, string getName ) { toBeTested(x) and not x.isUnknown() and - getNumberOfGenericTypeParams__label = "getNumberOfGenericTypeParams:" and - getNumberOfGenericTypeParams = x.getNumberOfGenericTypeParams() and getModule__label = "getModule:" and getModule = x.getModule() and - getNumberOfMembers__label = "getNumberOfMembers:" and - getNumberOfMembers = x.getNumberOfMembers() and getInterfaceType__label = "getInterfaceType:" and getInterfaceType = x.getInterfaceType() and getName__label = "getName:" and - getName = x.getName() and - getNumberOfParameters__label = "getNumberOfParameters:" and - getNumberOfParameters = x.getNumberOfParameters() and - getNumberOfRoles__label = "getNumberOfRoles:" and - getNumberOfRoles = x.getNumberOfRoles() + getName = x.getName() } query predicate getGenericTypeParam(MacroDecl x, int index, GenericTypeParamDecl getGenericTypeParam) { diff --git a/swift/ql/test/extractor-tests/generated/decl/MacroDecl/MacroRole.expected b/swift/ql/test/extractor-tests/generated/decl/MacroDecl/MacroRole.expected index 31f4cfbf929..eca30375b24 100644 --- a/swift/ql/test/extractor-tests/generated/decl/MacroDecl/MacroRole.expected +++ b/swift/ql/test/extractor-tests/generated/decl/MacroDecl/MacroRole.expected @@ -1,24 +1,24 @@ instances -| file://:0:0:0:0 | #freestanding(declaration) | getKind: | 2 | getMacroSyntax: | 0 | getNumberOfConformances: | 0 | getNumberOfNames: | 0 | -| file://:0:0:0:0 | #freestanding(declaration) | getKind: | 2 | getMacroSyntax: | 0 | getNumberOfConformances: | 0 | getNumberOfNames: | 0 | -| file://:0:0:0:0 | #freestanding(expression) | getKind: | 1 | getMacroSyntax: | 0 | getNumberOfConformances: | 0 | getNumberOfNames: | 0 | -| file://:0:0:0:0 | #freestanding(expression) | getKind: | 1 | getMacroSyntax: | 0 | getNumberOfConformances: | 0 | getNumberOfNames: | 0 | -| file://:0:0:0:0 | #freestanding(expression) | getKind: | 1 | getMacroSyntax: | 0 | getNumberOfConformances: | 0 | getNumberOfNames: | 0 | -| file://:0:0:0:0 | #freestanding(expression) | getKind: | 1 | getMacroSyntax: | 0 | getNumberOfConformances: | 0 | getNumberOfNames: | 0 | -| file://:0:0:0:0 | #freestanding(expression) | getKind: | 1 | getMacroSyntax: | 0 | getNumberOfConformances: | 0 | getNumberOfNames: | 0 | -| file://:0:0:0:0 | #freestanding(expression) | getKind: | 1 | getMacroSyntax: | 0 | getNumberOfConformances: | 0 | getNumberOfNames: | 0 | -| file://:0:0:0:0 | #freestanding(expression) | getKind: | 1 | getMacroSyntax: | 0 | getNumberOfConformances: | 0 | getNumberOfNames: | 0 | -| file://:0:0:0:0 | #freestanding(expression) | getKind: | 1 | getMacroSyntax: | 0 | getNumberOfConformances: | 0 | getNumberOfNames: | 0 | -| file://:0:0:0:0 | #freestanding(expression) | getKind: | 1 | getMacroSyntax: | 0 | getNumberOfConformances: | 0 | getNumberOfNames: | 0 | -| file://:0:0:0:0 | @attached(accessor) | getKind: | 4 | getMacroSyntax: | 1 | getNumberOfConformances: | 0 | getNumberOfNames: | 0 | -| file://:0:0:0:0 | @attached(member) | getKind: | 16 | getMacroSyntax: | 1 | getNumberOfConformances: | 0 | getNumberOfNames: | 0 | -| file://:0:0:0:0 | @attached(memberAttribute) | getKind: | 8 | getMacroSyntax: | 1 | getNumberOfConformances: | 0 | getNumberOfNames: | 0 | -| file://:0:0:0:0 | @attached(peer) | getKind: | 32 | getMacroSyntax: | 1 | getNumberOfConformances: | 0 | getNumberOfNames: | 1 | -| file://:0:0:0:0 | @attached(peer) | getKind: | 32 | getMacroSyntax: | 1 | getNumberOfConformances: | 0 | getNumberOfNames: | 1 | -| test.swift:1:2:1:26 | #freestanding(declaration) | getKind: | 2 | getMacroSyntax: | 0 | getNumberOfConformances: | 0 | getNumberOfNames: | 0 | -| test.swift:3:2:3:25 | #freestanding(expression) | getKind: | 1 | getMacroSyntax: | 0 | getNumberOfConformances: | 0 | getNumberOfNames: | 0 | -| test.swift:5:2:5:17 | @attached(member) | getKind: | 16 | getMacroSyntax: | 1 | getNumberOfConformances: | 0 | getNumberOfNames: | 0 | -| test.swift:6:2:6:20 | @attached(extension) | getKind: | 256 | getMacroSyntax: | 1 | getNumberOfConformances: | 0 | getNumberOfNames: | 0 | +| file://:0:0:0:0 | #freestanding(declaration) | getKind: | 2 | getMacroSyntax: | 0 | +| file://:0:0:0:0 | #freestanding(declaration) | getKind: | 2 | getMacroSyntax: | 0 | +| file://:0:0:0:0 | #freestanding(expression) | getKind: | 1 | getMacroSyntax: | 0 | +| file://:0:0:0:0 | #freestanding(expression) | getKind: | 1 | getMacroSyntax: | 0 | +| file://:0:0:0:0 | #freestanding(expression) | getKind: | 1 | getMacroSyntax: | 0 | +| file://:0:0:0:0 | #freestanding(expression) | getKind: | 1 | getMacroSyntax: | 0 | +| file://:0:0:0:0 | #freestanding(expression) | getKind: | 1 | getMacroSyntax: | 0 | +| file://:0:0:0:0 | #freestanding(expression) | getKind: | 1 | getMacroSyntax: | 0 | +| file://:0:0:0:0 | #freestanding(expression) | getKind: | 1 | getMacroSyntax: | 0 | +| file://:0:0:0:0 | #freestanding(expression) | getKind: | 1 | getMacroSyntax: | 0 | +| file://:0:0:0:0 | #freestanding(expression) | getKind: | 1 | getMacroSyntax: | 0 | +| file://:0:0:0:0 | @attached(accessor) | getKind: | 4 | getMacroSyntax: | 1 | +| file://:0:0:0:0 | @attached(member) | getKind: | 16 | getMacroSyntax: | 1 | +| file://:0:0:0:0 | @attached(memberAttribute) | getKind: | 8 | getMacroSyntax: | 1 | +| file://:0:0:0:0 | @attached(peer) | getKind: | 32 | getMacroSyntax: | 1 | +| file://:0:0:0:0 | @attached(peer) | getKind: | 32 | getMacroSyntax: | 1 | +| test.swift:1:2:1:26 | #freestanding(declaration) | getKind: | 2 | getMacroSyntax: | 0 | +| test.swift:3:2:3:25 | #freestanding(expression) | getKind: | 1 | getMacroSyntax: | 0 | +| test.swift:5:2:5:17 | @attached(member) | getKind: | 16 | getMacroSyntax: | 1 | +| test.swift:6:2:6:20 | @attached(extension) | getKind: | 256 | getMacroSyntax: | 1 | getConformance getName | file://:0:0:0:0 | @attached(peer) | 0 | $() | diff --git a/swift/ql/test/extractor-tests/generated/decl/MacroDecl/MacroRole.ql b/swift/ql/test/extractor-tests/generated/decl/MacroDecl/MacroRole.ql index 0b8c8b53113..5edff519fb8 100644 --- a/swift/ql/test/extractor-tests/generated/decl/MacroDecl/MacroRole.ql +++ b/swift/ql/test/extractor-tests/generated/decl/MacroDecl/MacroRole.ql @@ -3,20 +3,14 @@ import codeql.swift.elements import TestUtils query predicate instances( - MacroRole x, string getKind__label, int getKind, string getMacroSyntax__label, int getMacroSyntax, - string getNumberOfConformances__label, int getNumberOfConformances, - string getNumberOfNames__label, int getNumberOfNames + MacroRole x, string getKind__label, int getKind, string getMacroSyntax__label, int getMacroSyntax ) { toBeTested(x) and not x.isUnknown() and getKind__label = "getKind:" and getKind = x.getKind() and getMacroSyntax__label = "getMacroSyntax:" and - getMacroSyntax = x.getMacroSyntax() and - getNumberOfConformances__label = "getNumberOfConformances:" and - getNumberOfConformances = x.getNumberOfConformances() and - getNumberOfNames__label = "getNumberOfNames:" and - getNumberOfNames = x.getNumberOfNames() + getMacroSyntax = x.getMacroSyntax() } query predicate getConformance(MacroRole x, int index, Expr getConformance) { diff --git a/swift/ql/test/extractor-tests/generated/decl/ModuleDecl/ModuleDecl.expected b/swift/ql/test/extractor-tests/generated/decl/ModuleDecl/ModuleDecl.expected index da5bfd2898f..42d051d0a4f 100644 --- a/swift/ql/test/extractor-tests/generated/decl/ModuleDecl/ModuleDecl.expected +++ b/swift/ql/test/extractor-tests/generated/decl/ModuleDecl/ModuleDecl.expected @@ -1,7 +1,7 @@ instances -| file://:0:0:0:0 | Foo | getModule: | file://:0:0:0:0 | Foo | getNumberOfMembers: | 0 | getInterfaceType: | module | getName: | Foo | getNumberOfInheritedTypes: | 0 | isBuiltinModule: | no | isSystemModule: | no | getNumberOfImportedModules: | 5 | getNumberOfExportedModules: | 1 | -| file://:0:0:0:0 | __ObjC | getModule: | file://:0:0:0:0 | __ObjC | getNumberOfMembers: | 0 | getInterfaceType: | module<__ObjC> | getName: | __ObjC | getNumberOfInheritedTypes: | 0 | isBuiltinModule: | no | isSystemModule: | no | getNumberOfImportedModules: | 1 | getNumberOfExportedModules: | 0 | -| file://:0:0:0:0 | default_module_name | getModule: | file://:0:0:0:0 | default_module_name | getNumberOfMembers: | 0 | getInterfaceType: | module | getName: | default_module_name | getNumberOfInheritedTypes: | 0 | isBuiltinModule: | no | isSystemModule: | no | getNumberOfImportedModules: | 5 | getNumberOfExportedModules: | 0 | +| file://:0:0:0:0 | Foo | getModule: | file://:0:0:0:0 | Foo | getInterfaceType: | module | getName: | Foo | isBuiltinModule: | no | isSystemModule: | no | +| file://:0:0:0:0 | __ObjC | getModule: | file://:0:0:0:0 | __ObjC | getInterfaceType: | module<__ObjC> | getName: | __ObjC | isBuiltinModule: | no | isSystemModule: | no | +| file://:0:0:0:0 | default_module_name | getModule: | file://:0:0:0:0 | default_module_name | getInterfaceType: | module | getName: | default_module_name | isBuiltinModule: | no | isSystemModule: | no | getMember getInheritedType getAnImportedModule diff --git a/swift/ql/test/extractor-tests/generated/decl/ModuleDecl/ModuleDecl.ql b/swift/ql/test/extractor-tests/generated/decl/ModuleDecl/ModuleDecl.ql index d6224946d4b..911474839d4 100644 --- a/swift/ql/test/extractor-tests/generated/decl/ModuleDecl/ModuleDecl.ql +++ b/swift/ql/test/extractor-tests/generated/decl/ModuleDecl/ModuleDecl.ql @@ -3,34 +3,22 @@ import codeql.swift.elements import TestUtils query predicate instances( - ModuleDecl x, string getModule__label, ModuleDecl getModule, string getNumberOfMembers__label, - int getNumberOfMembers, string getInterfaceType__label, Type getInterfaceType, - string getName__label, string getName, string getNumberOfInheritedTypes__label, - int getNumberOfInheritedTypes, string isBuiltinModule__label, string isBuiltinModule, - string isSystemModule__label, string isSystemModule, string getNumberOfImportedModules__label, - int getNumberOfImportedModules, string getNumberOfExportedModules__label, - int getNumberOfExportedModules + ModuleDecl x, string getModule__label, ModuleDecl getModule, string getInterfaceType__label, + Type getInterfaceType, string getName__label, string getName, string isBuiltinModule__label, + string isBuiltinModule, string isSystemModule__label, string isSystemModule ) { toBeTested(x) and not x.isUnknown() and getModule__label = "getModule:" and getModule = x.getModule() and - getNumberOfMembers__label = "getNumberOfMembers:" and - getNumberOfMembers = x.getNumberOfMembers() and getInterfaceType__label = "getInterfaceType:" and getInterfaceType = x.getInterfaceType() and getName__label = "getName:" and getName = x.getName() and - getNumberOfInheritedTypes__label = "getNumberOfInheritedTypes:" and - getNumberOfInheritedTypes = x.getNumberOfInheritedTypes() and isBuiltinModule__label = "isBuiltinModule:" and (if x.isBuiltinModule() then isBuiltinModule = "yes" else isBuiltinModule = "no") and isSystemModule__label = "isSystemModule:" and - (if x.isSystemModule() then isSystemModule = "yes" else isSystemModule = "no") and - getNumberOfImportedModules__label = "getNumberOfImportedModules:" and - getNumberOfImportedModules = x.getNumberOfImportedModules() and - getNumberOfExportedModules__label = "getNumberOfExportedModules:" and - getNumberOfExportedModules = x.getNumberOfExportedModules() + if x.isSystemModule() then isSystemModule = "yes" else isSystemModule = "no" } query predicate getMember(ModuleDecl x, int index, Decl getMember) { diff --git a/swift/ql/test/extractor-tests/generated/decl/NamedFunction/NamedFunction.expected b/swift/ql/test/extractor-tests/generated/decl/NamedFunction/NamedFunction.expected index cfb439d0246..df6bc9c9761 100644 --- a/swift/ql/test/extractor-tests/generated/decl/NamedFunction/NamedFunction.expected +++ b/swift/ql/test/extractor-tests/generated/decl/NamedFunction/NamedFunction.expected @@ -1,9 +1,9 @@ instances -| functions.swift:1:1:3:1 | foo() | hasName: | yes | hasSelfParam: | no | getNumberOfParams: | 0 | hasBody: | yes | getNumberOfCaptures: | 0 | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | functions | getNumberOfMembers: | 0 | getInterfaceType: | () -> Int | -| functions.swift:5:1:7:1 | bar(_:d:) | hasName: | yes | hasSelfParam: | no | getNumberOfParams: | 2 | hasBody: | yes | getNumberOfCaptures: | 0 | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | functions | getNumberOfMembers: | 0 | getInterfaceType: | (Int, Double) -> Int | -| functions.swift:10:5:10:28 | noBody(x:) | hasName: | yes | hasSelfParam: | yes | getNumberOfParams: | 1 | hasBody: | no | getNumberOfCaptures: | 0 | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | functions | getNumberOfMembers: | 0 | getInterfaceType: | (Self) -> (Int) -> Int | -| functions.swift:13:1:15:1 | variadic(_:) | hasName: | yes | hasSelfParam: | no | getNumberOfParams: | 1 | hasBody: | yes | getNumberOfCaptures: | 0 | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | functions | getNumberOfMembers: | 0 | getInterfaceType: | (Int...) -> () | -| functions.swift:17:1:19:1 | generic(x:y:) | hasName: | yes | hasSelfParam: | no | getNumberOfParams: | 2 | hasBody: | yes | getNumberOfCaptures: | 0 | getNumberOfGenericTypeParams: | 2 | getModule: | file://:0:0:0:0 | functions | getNumberOfMembers: | 0 | getInterfaceType: | (X, Y) -> () | +| functions.swift:1:1:3:1 | foo() | getModule: | file://:0:0:0:0 | functions | getInterfaceType: | () -> Int | +| functions.swift:5:1:7:1 | bar(_:d:) | getModule: | file://:0:0:0:0 | functions | getInterfaceType: | (Int, Double) -> Int | +| functions.swift:10:5:10:28 | noBody(x:) | getModule: | file://:0:0:0:0 | functions | getInterfaceType: | (Self) -> (Int) -> Int | +| functions.swift:13:1:15:1 | variadic(_:) | getModule: | file://:0:0:0:0 | functions | getInterfaceType: | (Int...) -> () | +| functions.swift:17:1:19:1 | generic(x:y:) | getModule: | file://:0:0:0:0 | functions | getInterfaceType: | (X, Y) -> () | getName | functions.swift:1:1:3:1 | foo() | foo() | | functions.swift:5:1:7:1 | bar(_:d:) | bar(_:d:) | diff --git a/swift/ql/test/extractor-tests/generated/decl/NamedFunction/NamedFunction.ql b/swift/ql/test/extractor-tests/generated/decl/NamedFunction/NamedFunction.ql index ce58d119f3c..ef59d8da5d6 100644 --- a/swift/ql/test/extractor-tests/generated/decl/NamedFunction/NamedFunction.ql +++ b/swift/ql/test/extractor-tests/generated/decl/NamedFunction/NamedFunction.ql @@ -3,31 +3,13 @@ import codeql.swift.elements import TestUtils query predicate instances( - NamedFunction x, string hasName__label, string hasName, string hasSelfParam__label, - string hasSelfParam, string getNumberOfParams__label, int getNumberOfParams, - string hasBody__label, string hasBody, string getNumberOfCaptures__label, int getNumberOfCaptures, - string getNumberOfGenericTypeParams__label, int getNumberOfGenericTypeParams, - string getModule__label, ModuleDecl getModule, string getNumberOfMembers__label, - int getNumberOfMembers, string getInterfaceType__label, Type getInterfaceType + NamedFunction x, string getModule__label, ModuleDecl getModule, string getInterfaceType__label, + Type getInterfaceType ) { toBeTested(x) and not x.isUnknown() and - hasName__label = "hasName:" and - (if x.hasName() then hasName = "yes" else hasName = "no") and - hasSelfParam__label = "hasSelfParam:" and - (if x.hasSelfParam() then hasSelfParam = "yes" else hasSelfParam = "no") and - getNumberOfParams__label = "getNumberOfParams:" and - getNumberOfParams = x.getNumberOfParams() and - hasBody__label = "hasBody:" and - (if x.hasBody() then hasBody = "yes" else hasBody = "no") and - getNumberOfCaptures__label = "getNumberOfCaptures:" and - getNumberOfCaptures = x.getNumberOfCaptures() and - getNumberOfGenericTypeParams__label = "getNumberOfGenericTypeParams:" and - getNumberOfGenericTypeParams = x.getNumberOfGenericTypeParams() and getModule__label = "getModule:" and getModule = x.getModule() and - getNumberOfMembers__label = "getNumberOfMembers:" and - getNumberOfMembers = x.getNumberOfMembers() and getInterfaceType__label = "getInterfaceType:" and getInterfaceType = x.getInterfaceType() } diff --git a/swift/ql/test/extractor-tests/generated/decl/OpaqueTypeDecl/OpaqueTypeDecl.expected b/swift/ql/test/extractor-tests/generated/decl/OpaqueTypeDecl/OpaqueTypeDecl.expected index 1e73472bcfe..8a5d39063f5 100644 --- a/swift/ql/test/extractor-tests/generated/decl/OpaqueTypeDecl/OpaqueTypeDecl.expected +++ b/swift/ql/test/extractor-tests/generated/decl/OpaqueTypeDecl/OpaqueTypeDecl.expected @@ -1,8 +1,8 @@ instances -| file://:0:0:0:0 | _ | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | opaque_types | getNumberOfMembers: | 0 | getInterfaceType: | (some Base).Type | getName: | _ | getNumberOfInheritedTypes: | 0 | getNamingDeclaration: | opaque_types.swift:9:1:9:51 | baz(_:) | getNumberOfOpaqueGenericParams: | 1 | -| file://:0:0:0:0 | _ | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | opaque_types | getNumberOfMembers: | 0 | getInterfaceType: | (some P).Type | getName: | _ | getNumberOfInheritedTypes: | 0 | getNamingDeclaration: | opaque_types.swift:5:1:5:45 | bar(_:) | getNumberOfOpaqueGenericParams: | 1 | -| file://:0:0:0:0 | _ | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | opaque_types | getNumberOfMembers: | 0 | getInterfaceType: | (some P).Type | getName: | _ | getNumberOfInheritedTypes: | 0 | getNamingDeclaration: | opaque_types.swift:13:1:13:59 | bazz() | getNumberOfOpaqueGenericParams: | 1 | -| file://:0:0:0:0 | _ | getNumberOfGenericTypeParams: | 0 | getModule: | file://:0:0:0:0 | opaque_types | getNumberOfMembers: | 0 | getInterfaceType: | (some SignedInteger).Type | getName: | _ | getNumberOfInheritedTypes: | 0 | getNamingDeclaration: | opaque_types.swift:1:1:1:45 | foo() | getNumberOfOpaqueGenericParams: | 1 | +| file://:0:0:0:0 | _ | getModule: | file://:0:0:0:0 | opaque_types | getInterfaceType: | (some Base).Type | getName: | _ | getNamingDeclaration: | opaque_types.swift:9:1:9:51 | baz(_:) | +| file://:0:0:0:0 | _ | getModule: | file://:0:0:0:0 | opaque_types | getInterfaceType: | (some P).Type | getName: | _ | getNamingDeclaration: | opaque_types.swift:5:1:5:45 | bar(_:) | +| file://:0:0:0:0 | _ | getModule: | file://:0:0:0:0 | opaque_types | getInterfaceType: | (some P).Type | getName: | _ | getNamingDeclaration: | opaque_types.swift:13:1:13:59 | bazz() | +| file://:0:0:0:0 | _ | getModule: | file://:0:0:0:0 | opaque_types | getInterfaceType: | (some SignedInteger).Type | getName: | _ | getNamingDeclaration: | opaque_types.swift:1:1:1:45 | foo() | getGenericTypeParam getMember getInheritedType diff --git a/swift/ql/test/extractor-tests/generated/decl/OpaqueTypeDecl/OpaqueTypeDecl.ql b/swift/ql/test/extractor-tests/generated/decl/OpaqueTypeDecl/OpaqueTypeDecl.ql index a959441a79b..64b9149c1d0 100644 --- a/swift/ql/test/extractor-tests/generated/decl/OpaqueTypeDecl/OpaqueTypeDecl.ql +++ b/swift/ql/test/extractor-tests/generated/decl/OpaqueTypeDecl/OpaqueTypeDecl.ql @@ -3,31 +3,20 @@ import codeql.swift.elements import TestUtils query predicate instances( - OpaqueTypeDecl x, string getNumberOfGenericTypeParams__label, int getNumberOfGenericTypeParams, - string getModule__label, ModuleDecl getModule, string getNumberOfMembers__label, - int getNumberOfMembers, string getInterfaceType__label, Type getInterfaceType, - string getName__label, string getName, string getNumberOfInheritedTypes__label, - int getNumberOfInheritedTypes, string getNamingDeclaration__label, ValueDecl getNamingDeclaration, - string getNumberOfOpaqueGenericParams__label, int getNumberOfOpaqueGenericParams + OpaqueTypeDecl x, string getModule__label, ModuleDecl getModule, string getInterfaceType__label, + Type getInterfaceType, string getName__label, string getName, string getNamingDeclaration__label, + ValueDecl getNamingDeclaration ) { toBeTested(x) and not x.isUnknown() and - getNumberOfGenericTypeParams__label = "getNumberOfGenericTypeParams:" and - getNumberOfGenericTypeParams = x.getNumberOfGenericTypeParams() and getModule__label = "getModule:" and getModule = x.getModule() and - getNumberOfMembers__label = "getNumberOfMembers:" and - getNumberOfMembers = x.getNumberOfMembers() and getInterfaceType__label = "getInterfaceType:" and getInterfaceType = x.getInterfaceType() and getName__label = "getName:" and getName = x.getName() and - getNumberOfInheritedTypes__label = "getNumberOfInheritedTypes:" and - getNumberOfInheritedTypes = x.getNumberOfInheritedTypes() and getNamingDeclaration__label = "getNamingDeclaration:" and - getNamingDeclaration = x.getNamingDeclaration() and - getNumberOfOpaqueGenericParams__label = "getNumberOfOpaqueGenericParams:" and - getNumberOfOpaqueGenericParams = x.getNumberOfOpaqueGenericParams() + getNamingDeclaration = x.getNamingDeclaration() } query predicate getGenericTypeParam( diff --git a/swift/ql/test/extractor-tests/generated/decl/ParamDecl/ParamDecl.expected b/swift/ql/test/extractor-tests/generated/decl/ParamDecl/ParamDecl.expected index 558f987e504..f67d25dc31b 100644 --- a/swift/ql/test/extractor-tests/generated/decl/ParamDecl/ParamDecl.expected +++ b/swift/ql/test/extractor-tests/generated/decl/ParamDecl/ParamDecl.expected @@ -1,63 +1,63 @@ instances -| file://:0:0:0:0 | x | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | Int | getNumberOfAccessors: | 0 | getName: | x | getType: | Int | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | no | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| file://:0:0:0:0 | y | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | Int | getNumberOfAccessors: | 0 | getName: | y | getType: | Int | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | no | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:1:10:1:13 | _ | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | Int | getNumberOfAccessors: | 0 | getName: | _ | getType: | Int | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | no | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:1:18:1:29 | y | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | Double | getNumberOfAccessors: | 0 | getName: | y | getType: | Double | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | yes | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:2:10:2:13 | _ | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | Int | getNumberOfAccessors: | 0 | getName: | _ | getType: | Int | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | no | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:2:18:2:29 | y | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | Double | getNumberOfAccessors: | 0 | getName: | y | getType: | Double | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | yes | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:4:8:4:8 | self | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | S | getNumberOfAccessors: | 0 | getName: | self | getType: | S | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | yes | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:5:5:5:5 | self | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | S | getNumberOfAccessors: | 0 | getName: | self | getType: | S | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | yes | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:5:15:5:15 | x | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | Int | getNumberOfAccessors: | 0 | getName: | x | getType: | Int | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | no | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:5:15:5:15 | x | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | Int | getNumberOfAccessors: | 0 | getName: | x | getType: | Int | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | no | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:5:15:5:18 | x | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | Int | getNumberOfAccessors: | 0 | getName: | x | getType: | Int | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | no | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:5:23:5:23 | y | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | Int | getNumberOfAccessors: | 0 | getName: | y | getType: | Int | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | no | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:5:23:5:23 | y | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | Int | getNumberOfAccessors: | 0 | getName: | y | getType: | Int | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | no | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:5:23:5:26 | y | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | Int | getNumberOfAccessors: | 0 | getName: | y | getType: | Int | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | no | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:6:9:6:9 | self | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | S | getNumberOfAccessors: | 0 | getName: | self | getType: | S | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | no | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:7:9:7:9 | newValue | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | Int? | getNumberOfAccessors: | 0 | getName: | newValue | getType: | Int? | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | no | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:7:9:7:9 | self | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | S | getNumberOfAccessors: | 0 | getName: | self | getType: | S | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | yes | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:12:13:12:22 | s | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | String | getNumberOfAccessors: | 0 | getName: | s | getType: | String | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | yes | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:13:13:13:22 | s | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | String | getNumberOfAccessors: | 0 | getName: | s | getType: | String | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | yes | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:14:26:14:26 | $0 | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | Int | getNumberOfAccessors: | 0 | getName: | $0 | getType: | Int | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | no | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:17:25:17:25 | self | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | Wrapper | getNumberOfAccessors: | 0 | getName: | self | getType: | Wrapper | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | yes | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:17:25:17:25 | self | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | Wrapper | getNumberOfAccessors: | 0 | getName: | self | getType: | Wrapper | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | yes | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:17:25:17:25 | wrappedValue | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | Int | getNumberOfAccessors: | 0 | getName: | wrappedValue | getType: | Int | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | no | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:18:9:18:9 | self | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | Wrapper | getNumberOfAccessors: | 0 | getName: | self | getType: | Wrapper | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | no | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:18:9:18:9 | self | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | Wrapper | getNumberOfAccessors: | 0 | getName: | self | getType: | Wrapper | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | yes | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:18:9:18:9 | self | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | Wrapper | getNumberOfAccessors: | 0 | getName: | self | getType: | Wrapper | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | yes | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:18:9:18:9 | value | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | Int | getNumberOfAccessors: | 0 | getName: | value | getType: | Int | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | no | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:22:9:22:9 | self | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | WrapperWithInit | getNumberOfAccessors: | 0 | getName: | self | getType: | WrapperWithInit | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | no | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:22:9:22:9 | self | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | WrapperWithInit | getNumberOfAccessors: | 0 | getName: | self | getType: | WrapperWithInit | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | yes | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:22:9:22:9 | self | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | WrapperWithInit | getNumberOfAccessors: | 0 | getName: | self | getType: | WrapperWithInit | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | yes | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:22:9:22:9 | value | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | Int | getNumberOfAccessors: | 0 | getName: | value | getType: | Int | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | no | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:24:5:24:5 | self | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | WrapperWithInit | getNumberOfAccessors: | 0 | getName: | self | getType: | WrapperWithInit | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | yes | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:24:10:24:24 | wrappedValue | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | Int | getNumberOfAccessors: | 0 | getName: | wrappedValue | getType: | Int | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | no | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:27:25:27:25 | projectedValue | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | Bool | getNumberOfAccessors: | 0 | getName: | projectedValue | getType: | Bool | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | no | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:27:25:27:25 | self | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | WrapperWithProjected | getNumberOfAccessors: | 0 | getName: | self | getType: | WrapperWithProjected | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | yes | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:27:25:27:25 | self | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | WrapperWithProjected | getNumberOfAccessors: | 0 | getName: | self | getType: | WrapperWithProjected | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | yes | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:27:25:27:25 | wrappedValue | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | Int | getNumberOfAccessors: | 0 | getName: | wrappedValue | getType: | Int | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | no | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:28:9:28:9 | self | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | WrapperWithProjected | getNumberOfAccessors: | 0 | getName: | self | getType: | WrapperWithProjected | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | no | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:28:9:28:9 | self | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | WrapperWithProjected | getNumberOfAccessors: | 0 | getName: | self | getType: | WrapperWithProjected | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | yes | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:28:9:28:9 | self | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | WrapperWithProjected | getNumberOfAccessors: | 0 | getName: | self | getType: | WrapperWithProjected | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | yes | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:28:9:28:9 | value | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | Int | getNumberOfAccessors: | 0 | getName: | value | getType: | Int | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | no | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:29:9:29:9 | self | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | WrapperWithProjected | getNumberOfAccessors: | 0 | getName: | self | getType: | WrapperWithProjected | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | no | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:29:9:29:9 | self | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | WrapperWithProjected | getNumberOfAccessors: | 0 | getName: | self | getType: | WrapperWithProjected | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | yes | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:29:9:29:9 | self | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | WrapperWithProjected | getNumberOfAccessors: | 0 | getName: | self | getType: | WrapperWithProjected | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | yes | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:29:9:29:9 | value | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | Bool | getNumberOfAccessors: | 0 | getName: | value | getType: | Bool | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | no | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:33:9:33:9 | self | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | WrapperWithProjectedAndInit | getNumberOfAccessors: | 0 | getName: | self | getType: | WrapperWithProjectedAndInit | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | no | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:33:9:33:9 | self | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | WrapperWithProjectedAndInit | getNumberOfAccessors: | 0 | getName: | self | getType: | WrapperWithProjectedAndInit | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | yes | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:33:9:33:9 | self | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | WrapperWithProjectedAndInit | getNumberOfAccessors: | 0 | getName: | self | getType: | WrapperWithProjectedAndInit | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | yes | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:33:9:33:9 | value | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | Int | getNumberOfAccessors: | 0 | getName: | value | getType: | Int | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | no | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:34:9:34:9 | self | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | WrapperWithProjectedAndInit | getNumberOfAccessors: | 0 | getName: | self | getType: | WrapperWithProjectedAndInit | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | no | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:34:9:34:9 | self | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | WrapperWithProjectedAndInit | getNumberOfAccessors: | 0 | getName: | self | getType: | WrapperWithProjectedAndInit | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | yes | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:34:9:34:9 | self | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | WrapperWithProjectedAndInit | getNumberOfAccessors: | 0 | getName: | self | getType: | WrapperWithProjectedAndInit | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | yes | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:34:9:34:9 | value | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | Bool | getNumberOfAccessors: | 0 | getName: | value | getType: | Bool | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | no | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:36:5:36:5 | self | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | WrapperWithProjectedAndInit | getNumberOfAccessors: | 0 | getName: | self | getType: | WrapperWithProjectedAndInit | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | yes | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:36:10:36:24 | wrappedValue | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | Int | getNumberOfAccessors: | 0 | getName: | wrappedValue | getType: | Int | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | no | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:41:5:41:5 | self | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | WrapperWithProjectedAndInit | getNumberOfAccessors: | 0 | getName: | self | getType: | WrapperWithProjectedAndInit | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | yes | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:41:10:41:26 | projectedValue | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | Bool | getNumberOfAccessors: | 0 | getName: | projectedValue | getType: | Bool | hasAttachedPropertyWrapperType: | no | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | no | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | no | -| param_decls.swift:48:18:48:22 | p1 | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | Int | getNumberOfAccessors: | 0 | getName: | p1 | getType: | Int | hasAttachedPropertyWrapperType: | yes | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | yes | hasPropertyWrapperBackingVar: | yes | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | no | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | yes | -| param_decls.swift:49:26:49:30 | p2 | getModule: | file://:0:0:0:0 | param_decls | getNumberOfMembers: | 0 | getInterfaceType: | Int | getNumberOfAccessors: | 0 | getName: | p2 | getType: | Int | hasAttachedPropertyWrapperType: | yes | hasParentPattern: | no | hasParentInitializer: | no | hasPropertyWrapperBackingVarBinding: | yes | hasPropertyWrapperBackingVar: | yes | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | isInout: | no | hasPropertyWrapperLocalWrappedVarBinding: | no | hasPropertyWrapperLocalWrappedVar: | yes | +| file://:0:0:0:0 | x | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | Int | getName: | x | getType: | Int | isInout: | no | +| file://:0:0:0:0 | y | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | Int | getName: | y | getType: | Int | isInout: | no | +| param_decls.swift:1:10:1:13 | _ | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | Int | getName: | _ | getType: | Int | isInout: | no | +| param_decls.swift:1:18:1:29 | y | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | Double | getName: | y | getType: | Double | isInout: | yes | +| param_decls.swift:2:10:2:13 | _ | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | Int | getName: | _ | getType: | Int | isInout: | no | +| param_decls.swift:2:18:2:29 | y | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | Double | getName: | y | getType: | Double | isInout: | yes | +| param_decls.swift:4:8:4:8 | self | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | S | getName: | self | getType: | S | isInout: | yes | +| param_decls.swift:5:5:5:5 | self | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | S | getName: | self | getType: | S | isInout: | yes | +| param_decls.swift:5:15:5:15 | x | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | Int | getName: | x | getType: | Int | isInout: | no | +| param_decls.swift:5:15:5:15 | x | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | Int | getName: | x | getType: | Int | isInout: | no | +| param_decls.swift:5:15:5:18 | x | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | Int | getName: | x | getType: | Int | isInout: | no | +| param_decls.swift:5:23:5:23 | y | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | Int | getName: | y | getType: | Int | isInout: | no | +| param_decls.swift:5:23:5:23 | y | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | Int | getName: | y | getType: | Int | isInout: | no | +| param_decls.swift:5:23:5:26 | y | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | Int | getName: | y | getType: | Int | isInout: | no | +| param_decls.swift:6:9:6:9 | self | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | S | getName: | self | getType: | S | isInout: | no | +| param_decls.swift:7:9:7:9 | newValue | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | Int? | getName: | newValue | getType: | Int? | isInout: | no | +| param_decls.swift:7:9:7:9 | self | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | S | getName: | self | getType: | S | isInout: | yes | +| param_decls.swift:12:13:12:22 | s | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | String | getName: | s | getType: | String | isInout: | yes | +| param_decls.swift:13:13:13:22 | s | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | String | getName: | s | getType: | String | isInout: | yes | +| param_decls.swift:14:26:14:26 | $0 | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | Int | getName: | $0 | getType: | Int | isInout: | no | +| param_decls.swift:17:25:17:25 | self | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | Wrapper | getName: | self | getType: | Wrapper | isInout: | yes | +| param_decls.swift:17:25:17:25 | self | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | Wrapper | getName: | self | getType: | Wrapper | isInout: | yes | +| param_decls.swift:17:25:17:25 | wrappedValue | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | Int | getName: | wrappedValue | getType: | Int | isInout: | no | +| param_decls.swift:18:9:18:9 | self | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | Wrapper | getName: | self | getType: | Wrapper | isInout: | no | +| param_decls.swift:18:9:18:9 | self | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | Wrapper | getName: | self | getType: | Wrapper | isInout: | yes | +| param_decls.swift:18:9:18:9 | self | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | Wrapper | getName: | self | getType: | Wrapper | isInout: | yes | +| param_decls.swift:18:9:18:9 | value | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | Int | getName: | value | getType: | Int | isInout: | no | +| param_decls.swift:22:9:22:9 | self | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | WrapperWithInit | getName: | self | getType: | WrapperWithInit | isInout: | no | +| param_decls.swift:22:9:22:9 | self | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | WrapperWithInit | getName: | self | getType: | WrapperWithInit | isInout: | yes | +| param_decls.swift:22:9:22:9 | self | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | WrapperWithInit | getName: | self | getType: | WrapperWithInit | isInout: | yes | +| param_decls.swift:22:9:22:9 | value | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | Int | getName: | value | getType: | Int | isInout: | no | +| param_decls.swift:24:5:24:5 | self | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | WrapperWithInit | getName: | self | getType: | WrapperWithInit | isInout: | yes | +| param_decls.swift:24:10:24:24 | wrappedValue | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | Int | getName: | wrappedValue | getType: | Int | isInout: | no | +| param_decls.swift:27:25:27:25 | projectedValue | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | Bool | getName: | projectedValue | getType: | Bool | isInout: | no | +| param_decls.swift:27:25:27:25 | self | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | WrapperWithProjected | getName: | self | getType: | WrapperWithProjected | isInout: | yes | +| param_decls.swift:27:25:27:25 | self | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | WrapperWithProjected | getName: | self | getType: | WrapperWithProjected | isInout: | yes | +| param_decls.swift:27:25:27:25 | wrappedValue | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | Int | getName: | wrappedValue | getType: | Int | isInout: | no | +| param_decls.swift:28:9:28:9 | self | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | WrapperWithProjected | getName: | self | getType: | WrapperWithProjected | isInout: | no | +| param_decls.swift:28:9:28:9 | self | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | WrapperWithProjected | getName: | self | getType: | WrapperWithProjected | isInout: | yes | +| param_decls.swift:28:9:28:9 | self | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | WrapperWithProjected | getName: | self | getType: | WrapperWithProjected | isInout: | yes | +| param_decls.swift:28:9:28:9 | value | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | Int | getName: | value | getType: | Int | isInout: | no | +| param_decls.swift:29:9:29:9 | self | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | WrapperWithProjected | getName: | self | getType: | WrapperWithProjected | isInout: | no | +| param_decls.swift:29:9:29:9 | self | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | WrapperWithProjected | getName: | self | getType: | WrapperWithProjected | isInout: | yes | +| param_decls.swift:29:9:29:9 | self | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | WrapperWithProjected | getName: | self | getType: | WrapperWithProjected | isInout: | yes | +| param_decls.swift:29:9:29:9 | value | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | Bool | getName: | value | getType: | Bool | isInout: | no | +| param_decls.swift:33:9:33:9 | self | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | WrapperWithProjectedAndInit | getName: | self | getType: | WrapperWithProjectedAndInit | isInout: | no | +| param_decls.swift:33:9:33:9 | self | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | WrapperWithProjectedAndInit | getName: | self | getType: | WrapperWithProjectedAndInit | isInout: | yes | +| param_decls.swift:33:9:33:9 | self | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | WrapperWithProjectedAndInit | getName: | self | getType: | WrapperWithProjectedAndInit | isInout: | yes | +| param_decls.swift:33:9:33:9 | value | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | Int | getName: | value | getType: | Int | isInout: | no | +| param_decls.swift:34:9:34:9 | self | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | WrapperWithProjectedAndInit | getName: | self | getType: | WrapperWithProjectedAndInit | isInout: | no | +| param_decls.swift:34:9:34:9 | self | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | WrapperWithProjectedAndInit | getName: | self | getType: | WrapperWithProjectedAndInit | isInout: | yes | +| param_decls.swift:34:9:34:9 | self | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | WrapperWithProjectedAndInit | getName: | self | getType: | WrapperWithProjectedAndInit | isInout: | yes | +| param_decls.swift:34:9:34:9 | value | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | Bool | getName: | value | getType: | Bool | isInout: | no | +| param_decls.swift:36:5:36:5 | self | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | WrapperWithProjectedAndInit | getName: | self | getType: | WrapperWithProjectedAndInit | isInout: | yes | +| param_decls.swift:36:10:36:24 | wrappedValue | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | Int | getName: | wrappedValue | getType: | Int | isInout: | no | +| param_decls.swift:41:5:41:5 | self | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | WrapperWithProjectedAndInit | getName: | self | getType: | WrapperWithProjectedAndInit | isInout: | yes | +| param_decls.swift:41:10:41:26 | projectedValue | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | Bool | getName: | projectedValue | getType: | Bool | isInout: | no | +| param_decls.swift:48:18:48:22 | p1 | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | Int | getName: | p1 | getType: | Int | isInout: | no | +| param_decls.swift:49:26:49:30 | p2 | getModule: | file://:0:0:0:0 | param_decls | getInterfaceType: | Int | getName: | p2 | getType: | Int | isInout: | no | getMember getAccessor getAttachedPropertyWrapperType diff --git a/swift/ql/test/extractor-tests/generated/decl/ParamDecl/ParamDecl.ql b/swift/ql/test/extractor-tests/generated/decl/ParamDecl/ParamDecl.ql index a308ceb3fc8..1af06c1a464 100644 --- a/swift/ql/test/extractor-tests/generated/decl/ParamDecl/ParamDecl.ql +++ b/swift/ql/test/extractor-tests/generated/decl/ParamDecl/ParamDecl.ql @@ -3,81 +3,22 @@ import codeql.swift.elements import TestUtils query predicate instances( - ParamDecl x, string getModule__label, ModuleDecl getModule, string getNumberOfMembers__label, - int getNumberOfMembers, string getInterfaceType__label, Type getInterfaceType, - string getNumberOfAccessors__label, int getNumberOfAccessors, string getName__label, - string getName, string getType__label, Type getType, string hasAttachedPropertyWrapperType__label, - string hasAttachedPropertyWrapperType, string hasParentPattern__label, string hasParentPattern, - string hasParentInitializer__label, string hasParentInitializer, - string hasPropertyWrapperBackingVarBinding__label, string hasPropertyWrapperBackingVarBinding, - string hasPropertyWrapperBackingVar__label, string hasPropertyWrapperBackingVar, - string hasPropertyWrapperProjectionVarBinding__label, - string hasPropertyWrapperProjectionVarBinding, string hasPropertyWrapperProjectionVar__label, - string hasPropertyWrapperProjectionVar, string isInout__label, string isInout, - string hasPropertyWrapperLocalWrappedVarBinding__label, - string hasPropertyWrapperLocalWrappedVarBinding, string hasPropertyWrapperLocalWrappedVar__label, - string hasPropertyWrapperLocalWrappedVar + ParamDecl x, string getModule__label, ModuleDecl getModule, string getInterfaceType__label, + Type getInterfaceType, string getName__label, string getName, string getType__label, Type getType, + string isInout__label, string isInout ) { toBeTested(x) and not x.isUnknown() and getModule__label = "getModule:" and getModule = x.getModule() and - getNumberOfMembers__label = "getNumberOfMembers:" and - getNumberOfMembers = x.getNumberOfMembers() and getInterfaceType__label = "getInterfaceType:" and getInterfaceType = x.getInterfaceType() and - getNumberOfAccessors__label = "getNumberOfAccessors:" and - getNumberOfAccessors = x.getNumberOfAccessors() and getName__label = "getName:" and getName = x.getName() and getType__label = "getType:" and getType = x.getType() and - hasAttachedPropertyWrapperType__label = "hasAttachedPropertyWrapperType:" and - ( - if x.hasAttachedPropertyWrapperType() - then hasAttachedPropertyWrapperType = "yes" - else hasAttachedPropertyWrapperType = "no" - ) and - hasParentPattern__label = "hasParentPattern:" and - (if x.hasParentPattern() then hasParentPattern = "yes" else hasParentPattern = "no") and - hasParentInitializer__label = "hasParentInitializer:" and - (if x.hasParentInitializer() then hasParentInitializer = "yes" else hasParentInitializer = "no") and - hasPropertyWrapperBackingVarBinding__label = "hasPropertyWrapperBackingVarBinding:" and - ( - if x.hasPropertyWrapperBackingVarBinding() - then hasPropertyWrapperBackingVarBinding = "yes" - else hasPropertyWrapperBackingVarBinding = "no" - ) and - hasPropertyWrapperBackingVar__label = "hasPropertyWrapperBackingVar:" and - ( - if x.hasPropertyWrapperBackingVar() - then hasPropertyWrapperBackingVar = "yes" - else hasPropertyWrapperBackingVar = "no" - ) and - hasPropertyWrapperProjectionVarBinding__label = "hasPropertyWrapperProjectionVarBinding:" and - ( - if x.hasPropertyWrapperProjectionVarBinding() - then hasPropertyWrapperProjectionVarBinding = "yes" - else hasPropertyWrapperProjectionVarBinding = "no" - ) and - hasPropertyWrapperProjectionVar__label = "hasPropertyWrapperProjectionVar:" and - ( - if x.hasPropertyWrapperProjectionVar() - then hasPropertyWrapperProjectionVar = "yes" - else hasPropertyWrapperProjectionVar = "no" - ) and isInout__label = "isInout:" and - (if x.isInout() then isInout = "yes" else isInout = "no") and - hasPropertyWrapperLocalWrappedVarBinding__label = "hasPropertyWrapperLocalWrappedVarBinding:" and - ( - if x.hasPropertyWrapperLocalWrappedVarBinding() - then hasPropertyWrapperLocalWrappedVarBinding = "yes" - else hasPropertyWrapperLocalWrappedVarBinding = "no" - ) and - hasPropertyWrapperLocalWrappedVar__label = "hasPropertyWrapperLocalWrappedVar:" and - if x.hasPropertyWrapperLocalWrappedVar() - then hasPropertyWrapperLocalWrappedVar = "yes" - else hasPropertyWrapperLocalWrappedVar = "no" + if x.isInout() then isInout = "yes" else isInout = "no" } query predicate getMember(ParamDecl x, int index, Decl getMember) { diff --git a/swift/ql/test/extractor-tests/generated/decl/PoundDiagnosticDecl/PoundDiagnosticDecl.expected b/swift/ql/test/extractor-tests/generated/decl/PoundDiagnosticDecl/PoundDiagnosticDecl.expected index baca0687415..aaa3b31e23e 100644 --- a/swift/ql/test/extractor-tests/generated/decl/PoundDiagnosticDecl/PoundDiagnosticDecl.expected +++ b/swift/ql/test/extractor-tests/generated/decl/PoundDiagnosticDecl/PoundDiagnosticDecl.expected @@ -1,4 +1,4 @@ instances -| diagnostics.swift:2:1:2:25 | #warning(...) | getModule: | file://:0:0:0:0 | diagnostics | getNumberOfMembers: | 0 | getKind: | 2 | getMessage: | diagnostics.swift:2:10:2:10 | I'm a warning | -| diagnostics.swift:3:1:3:26 | #error(...) | getModule: | file://:0:0:0:0 | diagnostics | getNumberOfMembers: | 0 | getKind: | 1 | getMessage: | diagnostics.swift:3:8:3:8 | And I'm an error | +| diagnostics.swift:2:1:2:25 | #warning(...) | getModule: | file://:0:0:0:0 | diagnostics | getKind: | 2 | getMessage: | diagnostics.swift:2:10:2:10 | I'm a warning | +| diagnostics.swift:3:1:3:26 | #error(...) | getModule: | file://:0:0:0:0 | diagnostics | getKind: | 1 | getMessage: | diagnostics.swift:3:8:3:8 | And I'm an error | getMember diff --git a/swift/ql/test/extractor-tests/generated/decl/PoundDiagnosticDecl/PoundDiagnosticDecl.ql b/swift/ql/test/extractor-tests/generated/decl/PoundDiagnosticDecl/PoundDiagnosticDecl.ql index 438cb255468..acfb7f037da 100644 --- a/swift/ql/test/extractor-tests/generated/decl/PoundDiagnosticDecl/PoundDiagnosticDecl.ql +++ b/swift/ql/test/extractor-tests/generated/decl/PoundDiagnosticDecl/PoundDiagnosticDecl.ql @@ -3,16 +3,13 @@ import codeql.swift.elements import TestUtils query predicate instances( - PoundDiagnosticDecl x, string getModule__label, ModuleDecl getModule, - string getNumberOfMembers__label, int getNumberOfMembers, string getKind__label, int getKind, - string getMessage__label, StringLiteralExpr getMessage + PoundDiagnosticDecl x, string getModule__label, ModuleDecl getModule, string getKind__label, + int getKind, string getMessage__label, StringLiteralExpr getMessage ) { toBeTested(x) and not x.isUnknown() and getModule__label = "getModule:" and getModule = x.getModule() and - getNumberOfMembers__label = "getNumberOfMembers:" and - getNumberOfMembers = x.getNumberOfMembers() and getKind__label = "getKind:" and getKind = x.getKind() and getMessage__label = "getMessage:" and diff --git a/swift/ql/test/extractor-tests/generated/expr/AppliedPropertyWrapperExpr/AppliedPropertyWrapperExpr.ql b/swift/ql/test/extractor-tests/generated/expr/AppliedPropertyWrapperExpr/AppliedPropertyWrapperExpr.ql index ecbbcb102eb..863c0dfe647 100644 --- a/swift/ql/test/extractor-tests/generated/expr/AppliedPropertyWrapperExpr/AppliedPropertyWrapperExpr.ql +++ b/swift/ql/test/extractor-tests/generated/expr/AppliedPropertyWrapperExpr/AppliedPropertyWrapperExpr.ql @@ -3,13 +3,11 @@ import codeql.swift.elements import TestUtils query predicate instances( - AppliedPropertyWrapperExpr x, string hasType__label, string hasType, string getKind__label, - int getKind, string getValue__label, Expr getValue, string getParam__label, ParamDecl getParam + AppliedPropertyWrapperExpr x, string getKind__label, int getKind, string getValue__label, + Expr getValue, string getParam__label, ParamDecl getParam ) { toBeTested(x) and not x.isUnknown() and - hasType__label = "hasType:" and - (if x.hasType() then hasType = "yes" else hasType = "no") and getKind__label = "getKind:" and getKind = x.getKind() and getValue__label = "getValue:" and diff --git a/swift/ql/test/extractor-tests/generated/expr/CopyExpr/ConsumeExpr.expected b/swift/ql/test/extractor-tests/generated/expr/CopyExpr/ConsumeExpr.expected index 383f4260b52..6d51478c433 100644 --- a/swift/ql/test/extractor-tests/generated/expr/CopyExpr/ConsumeExpr.expected +++ b/swift/ql/test/extractor-tests/generated/expr/CopyExpr/ConsumeExpr.expected @@ -1,4 +1,4 @@ instances -| move_semantics.swift:5:9:5:17 | ConsumeExpr | hasType: | yes | getSubExpr: | move_semantics.swift:5:17:5:17 | x | +| move_semantics.swift:5:9:5:17 | ConsumeExpr | getSubExpr: | move_semantics.swift:5:17:5:17 | x | getType | move_semantics.swift:5:9:5:17 | ConsumeExpr | Int | diff --git a/swift/ql/test/extractor-tests/generated/expr/CopyExpr/ConsumeExpr.ql b/swift/ql/test/extractor-tests/generated/expr/CopyExpr/ConsumeExpr.ql index b52718a1511..1521b525991 100644 --- a/swift/ql/test/extractor-tests/generated/expr/CopyExpr/ConsumeExpr.ql +++ b/swift/ql/test/extractor-tests/generated/expr/CopyExpr/ConsumeExpr.ql @@ -2,13 +2,9 @@ import codeql.swift.elements import TestUtils -query predicate instances( - ConsumeExpr x, string hasType__label, string hasType, string getSubExpr__label, Expr getSubExpr -) { +query predicate instances(ConsumeExpr x, string getSubExpr__label, Expr getSubExpr) { toBeTested(x) and not x.isUnknown() and - hasType__label = "hasType:" and - (if x.hasType() then hasType = "yes" else hasType = "no") and getSubExpr__label = "getSubExpr:" and getSubExpr = x.getSubExpr() } diff --git a/swift/ql/test/extractor-tests/generated/expr/CopyExpr/CopyExpr.expected b/swift/ql/test/extractor-tests/generated/expr/CopyExpr/CopyExpr.expected index 8355a090082..79797b15ae6 100644 --- a/swift/ql/test/extractor-tests/generated/expr/CopyExpr/CopyExpr.expected +++ b/swift/ql/test/extractor-tests/generated/expr/CopyExpr/CopyExpr.expected @@ -1,4 +1,4 @@ instances -| move_semantics.swift:4:9:4:14 | CopyExpr | hasType: | yes | getSubExpr: | move_semantics.swift:4:14:4:14 | x | +| move_semantics.swift:4:9:4:14 | CopyExpr | getSubExpr: | move_semantics.swift:4:14:4:14 | x | getType | move_semantics.swift:4:9:4:14 | CopyExpr | Int | diff --git a/swift/ql/test/extractor-tests/generated/expr/CopyExpr/CopyExpr.ql b/swift/ql/test/extractor-tests/generated/expr/CopyExpr/CopyExpr.ql index 8cd71d590a6..ab58e99444e 100644 --- a/swift/ql/test/extractor-tests/generated/expr/CopyExpr/CopyExpr.ql +++ b/swift/ql/test/extractor-tests/generated/expr/CopyExpr/CopyExpr.ql @@ -2,13 +2,9 @@ import codeql.swift.elements import TestUtils -query predicate instances( - CopyExpr x, string hasType__label, string hasType, string getSubExpr__label, Expr getSubExpr -) { +query predicate instances(CopyExpr x, string getSubExpr__label, Expr getSubExpr) { toBeTested(x) and not x.isUnknown() and - hasType__label = "hasType:" and - (if x.hasType() then hasType = "yes" else hasType = "no") and getSubExpr__label = "getSubExpr:" and getSubExpr = x.getSubExpr() } diff --git a/swift/ql/test/extractor-tests/generated/expr/DotSyntaxCallExpr/DotSyntaxCallExpr.ql b/swift/ql/test/extractor-tests/generated/expr/DotSyntaxCallExpr/DotSyntaxCallExpr.ql index ca06b579a22..276fa0a9aef 100644 --- a/swift/ql/test/extractor-tests/generated/expr/DotSyntaxCallExpr/DotSyntaxCallExpr.ql +++ b/swift/ql/test/extractor-tests/generated/expr/DotSyntaxCallExpr/DotSyntaxCallExpr.ql @@ -3,18 +3,13 @@ import codeql.swift.elements import TestUtils query predicate instances( - DotSyntaxCallExpr x, string hasType__label, string hasType, string getFunction__label, - Expr getFunction, string getNumberOfArguments__label, int getNumberOfArguments, - string getBase__label, Expr getBase + DotSyntaxCallExpr x, string getFunction__label, Expr getFunction, string getBase__label, + Expr getBase ) { toBeTested(x) and not x.isUnknown() and - hasType__label = "hasType:" and - (if x.hasType() then hasType = "yes" else hasType = "no") and getFunction__label = "getFunction:" and getFunction = x.getFunction() and - getNumberOfArguments__label = "getNumberOfArguments:" and - getNumberOfArguments = x.getNumberOfArguments() and getBase__label = "getBase:" and getBase = x.getBase() } diff --git a/swift/ql/test/extractor-tests/generated/expr/DynamicLookupExpr/DynamicLookupExpr.expected b/swift/ql/test/extractor-tests/generated/expr/DynamicLookupExpr/DynamicLookupExpr.expected index ffb84297c49..2460a1e34fd 100644 --- a/swift/ql/test/extractor-tests/generated/expr/DynamicLookupExpr/DynamicLookupExpr.expected +++ b/swift/ql/test/extractor-tests/generated/expr/DynamicLookupExpr/DynamicLookupExpr.expected @@ -1,6 +1,6 @@ instances -| dynamic_lookup.swift:15:1:15:3 | .foo(_:) | DynamicMemberRefExpr | hasType: | yes | getBase: | dynamic_lookup.swift:15:1:15:1 | OpaqueValueExpr | hasMember: | yes | -| dynamic_lookup.swift:16:5:16:9 | subscript ...[...] | DynamicSubscriptExpr | hasType: | yes | getBase: | dynamic_lookup.swift:16:5:16:5 | OpaqueValueExpr | hasMember: | yes | +| dynamic_lookup.swift:15:1:15:3 | .foo(_:) | DynamicMemberRefExpr | getBase: | dynamic_lookup.swift:15:1:15:1 | OpaqueValueExpr | +| dynamic_lookup.swift:16:5:16:9 | subscript ...[...] | DynamicSubscriptExpr | getBase: | dynamic_lookup.swift:16:5:16:5 | OpaqueValueExpr | getType | dynamic_lookup.swift:15:1:15:3 | .foo(_:) | ((Int) -> ())? | | dynamic_lookup.swift:16:5:16:9 | subscript ...[...] | Int? | diff --git a/swift/ql/test/extractor-tests/generated/expr/DynamicLookupExpr/DynamicLookupExpr.ql b/swift/ql/test/extractor-tests/generated/expr/DynamicLookupExpr/DynamicLookupExpr.ql index 02c7cd23191..79480f25f1e 100644 --- a/swift/ql/test/extractor-tests/generated/expr/DynamicLookupExpr/DynamicLookupExpr.ql +++ b/swift/ql/test/extractor-tests/generated/expr/DynamicLookupExpr/DynamicLookupExpr.ql @@ -3,18 +3,13 @@ import codeql.swift.elements import TestUtils query predicate instances( - DynamicLookupExpr x, string primaryQlClasses, string hasType__label, string hasType, - string getBase__label, Expr getBase, string hasMember__label, string hasMember + DynamicLookupExpr x, string primaryQlClasses, string getBase__label, Expr getBase ) { toBeTested(x) and not x.isUnknown() and primaryQlClasses = x.getPrimaryQlClasses() and - hasType__label = "hasType:" and - (if x.hasType() then hasType = "yes" else hasType = "no") and getBase__label = "getBase:" and - getBase = x.getBase() and - hasMember__label = "hasMember:" and - if x.hasMember() then hasMember = "yes" else hasMember = "no" + getBase = x.getBase() } query predicate getType(DynamicLookupExpr x, Type getType) { diff --git a/swift/ql/test/extractor-tests/generated/expr/EnumIsCaseExpr/EnumIsCaseExpr.expected b/swift/ql/test/extractor-tests/generated/expr/EnumIsCaseExpr/EnumIsCaseExpr.expected index e428b7e7502..55e4538dc28 100644 --- a/swift/ql/test/extractor-tests/generated/expr/EnumIsCaseExpr/EnumIsCaseExpr.expected +++ b/swift/ql/test/extractor-tests/generated/expr/EnumIsCaseExpr/EnumIsCaseExpr.expected @@ -1,14 +1,14 @@ instances -| enum_is_case.swift:4:1:4:17 | ... is some | hasType: | yes | getSubExpr: | enum_is_case.swift:4:1:4:17 | OptionalEvaluationExpr | getElement: | file://:0:0:0:0 | some | -| enum_is_case.swift:5:1:5:32 | ... is some | hasType: | yes | getSubExpr: | enum_is_case.swift:5:1:5:32 | OptionalEvaluationExpr | getElement: | file://:0:0:0:0 | some | -| enum_is_case.swift:6:1:6:1 | ... is some | hasType: | yes | getSubExpr: | enum_is_case.swift:6:1:6:1 | 42 | getElement: | file://:0:0:0:0 | some | -| enum_is_case.swift:7:1:7:1 | ... is some | hasType: | yes | getSubExpr: | enum_is_case.swift:7:1:7:1 | 42 | getElement: | file://:0:0:0:0 | some | -| enum_is_case.swift:9:1:9:19 | ... is some | hasType: | yes | getSubExpr: | enum_is_case.swift:9:1:9:19 | [...] | getElement: | file://:0:0:0:0 | some | -| enum_is_case.swift:19:1:19:18 | ... is some | hasType: | yes | getSubExpr: | enum_is_case.swift:19:1:19:18 | OptionalEvaluationExpr | getElement: | file://:0:0:0:0 | some | -| enum_is_case.swift:21:1:21:5 | ... is some | hasType: | yes | getSubExpr: | enum_is_case.swift:21:1:21:5 | [...] | getElement: | file://:0:0:0:0 | some | -| enum_is_case.swift:22:1:22:10 | ... is some | hasType: | yes | getSubExpr: | enum_is_case.swift:22:1:22:10 | [...] | getElement: | file://:0:0:0:0 | some | -| enum_is_case.swift:23:1:23:10 | ... is some | hasType: | yes | getSubExpr: | enum_is_case.swift:23:1:23:10 | [...] | getElement: | file://:0:0:0:0 | some | -| enum_is_case.swift:24:1:24:8 | ... is some | hasType: | yes | getSubExpr: | enum_is_case.swift:24:1:24:8 | call to Set.init() | getElement: | file://:0:0:0:0 | some | +| enum_is_case.swift:4:1:4:17 | ... is some | getSubExpr: | enum_is_case.swift:4:1:4:17 | OptionalEvaluationExpr | getElement: | file://:0:0:0:0 | some | +| enum_is_case.swift:5:1:5:32 | ... is some | getSubExpr: | enum_is_case.swift:5:1:5:32 | OptionalEvaluationExpr | getElement: | file://:0:0:0:0 | some | +| enum_is_case.swift:6:1:6:1 | ... is some | getSubExpr: | enum_is_case.swift:6:1:6:1 | 42 | getElement: | file://:0:0:0:0 | some | +| enum_is_case.swift:7:1:7:1 | ... is some | getSubExpr: | enum_is_case.swift:7:1:7:1 | 42 | getElement: | file://:0:0:0:0 | some | +| enum_is_case.swift:9:1:9:19 | ... is some | getSubExpr: | enum_is_case.swift:9:1:9:19 | [...] | getElement: | file://:0:0:0:0 | some | +| enum_is_case.swift:19:1:19:18 | ... is some | getSubExpr: | enum_is_case.swift:19:1:19:18 | OptionalEvaluationExpr | getElement: | file://:0:0:0:0 | some | +| enum_is_case.swift:21:1:21:5 | ... is some | getSubExpr: | enum_is_case.swift:21:1:21:5 | [...] | getElement: | file://:0:0:0:0 | some | +| enum_is_case.swift:22:1:22:10 | ... is some | getSubExpr: | enum_is_case.swift:22:1:22:10 | [...] | getElement: | file://:0:0:0:0 | some | +| enum_is_case.swift:23:1:23:10 | ... is some | getSubExpr: | enum_is_case.swift:23:1:23:10 | [...] | getElement: | file://:0:0:0:0 | some | +| enum_is_case.swift:24:1:24:8 | ... is some | getSubExpr: | enum_is_case.swift:24:1:24:8 | call to Set.init() | getElement: | file://:0:0:0:0 | some | getType | enum_is_case.swift:4:1:4:17 | ... is some | Bool | | enum_is_case.swift:5:1:5:32 | ... is some | Bool | diff --git a/swift/ql/test/extractor-tests/generated/expr/EnumIsCaseExpr/EnumIsCaseExpr.ql b/swift/ql/test/extractor-tests/generated/expr/EnumIsCaseExpr/EnumIsCaseExpr.ql index 804bf908fc5..b60785e57cc 100644 --- a/swift/ql/test/extractor-tests/generated/expr/EnumIsCaseExpr/EnumIsCaseExpr.ql +++ b/swift/ql/test/extractor-tests/generated/expr/EnumIsCaseExpr/EnumIsCaseExpr.ql @@ -3,13 +3,11 @@ import codeql.swift.elements import TestUtils query predicate instances( - EnumIsCaseExpr x, string hasType__label, string hasType, string getSubExpr__label, - Expr getSubExpr, string getElement__label, EnumElementDecl getElement + EnumIsCaseExpr x, string getSubExpr__label, Expr getSubExpr, string getElement__label, + EnumElementDecl getElement ) { toBeTested(x) and not x.isUnknown() and - hasType__label = "hasType:" and - (if x.hasType() then hasType = "yes" else hasType = "no") and getSubExpr__label = "getSubExpr:" and getSubExpr = x.getSubExpr() and getElement__label = "getElement:" and diff --git a/swift/ql/test/extractor-tests/generated/expr/ExtractFunctionIsolationExpr/ExtractFunctionIsolationExpr.expected b/swift/ql/test/extractor-tests/generated/expr/ExtractFunctionIsolationExpr/ExtractFunctionIsolationExpr.expected index bf8aef3f595..ebd8475067d 100644 --- a/swift/ql/test/extractor-tests/generated/expr/ExtractFunctionIsolationExpr/ExtractFunctionIsolationExpr.expected +++ b/swift/ql/test/extractor-tests/generated/expr/ExtractFunctionIsolationExpr/ExtractFunctionIsolationExpr.expected @@ -1,4 +1,4 @@ instances -| extract_function_isolation.swift:2:21:2:23 | ExtractFunctionIsolationExpr | hasType: | yes | getFunctionExpr: | extract_function_isolation.swift:2:21:2:21 | x | +| extract_function_isolation.swift:2:21:2:23 | ExtractFunctionIsolationExpr | getFunctionExpr: | extract_function_isolation.swift:2:21:2:21 | x | getType | extract_function_isolation.swift:2:21:2:23 | ExtractFunctionIsolationExpr | (any Actor)? | diff --git a/swift/ql/test/extractor-tests/generated/expr/ExtractFunctionIsolationExpr/ExtractFunctionIsolationExpr.ql b/swift/ql/test/extractor-tests/generated/expr/ExtractFunctionIsolationExpr/ExtractFunctionIsolationExpr.ql index 5128cab6a05..6e434d297c3 100644 --- a/swift/ql/test/extractor-tests/generated/expr/ExtractFunctionIsolationExpr/ExtractFunctionIsolationExpr.ql +++ b/swift/ql/test/extractor-tests/generated/expr/ExtractFunctionIsolationExpr/ExtractFunctionIsolationExpr.ql @@ -3,13 +3,10 @@ import codeql.swift.elements import TestUtils query predicate instances( - ExtractFunctionIsolationExpr x, string hasType__label, string hasType, - string getFunctionExpr__label, Expr getFunctionExpr + ExtractFunctionIsolationExpr x, string getFunctionExpr__label, Expr getFunctionExpr ) { toBeTested(x) and not x.isUnknown() and - hasType__label = "hasType:" and - (if x.hasType() then hasType = "yes" else hasType = "no") and getFunctionExpr__label = "getFunctionExpr:" and getFunctionExpr = x.getFunctionExpr() } diff --git a/swift/ql/test/extractor-tests/generated/expr/IdentityExpr/IdentityExpr.expected b/swift/ql/test/extractor-tests/generated/expr/IdentityExpr/IdentityExpr.expected index 57a2f657242..8eb957d6089 100644 --- a/swift/ql/test/extractor-tests/generated/expr/IdentityExpr/IdentityExpr.expected +++ b/swift/ql/test/extractor-tests/generated/expr/IdentityExpr/IdentityExpr.expected @@ -1,13 +1,13 @@ instances -| identity_expressions.swift:5:9:5:14 | .self | DotSelfExpr | hasType: | yes | getSubExpr: | identity_expressions.swift:5:9:5:9 | self | -| identity_expressions.swift:5:9:5:21 | .self | DotSelfExpr | hasType: | yes | getSubExpr: | identity_expressions.swift:5:9:5:19 | .x | -| identity_expressions.swift:5:28:5:31 | (...) | ParenExpr | hasType: | yes | getSubExpr: | identity_expressions.swift:5:29:5:29 | 42 | -| identity_expressions.swift:9:5:9:9 | (...) | ParenExpr | hasType: | yes | getSubExpr: | identity_expressions.swift:9:6:9:8 | call to A.init() | -| identity_expressions.swift:12:28:12:43 | (...) | ParenExpr | hasType: | yes | getSubExpr: | identity_expressions.swift:12:29:12:42 | await ... | -| identity_expressions.swift:12:29:12:42 | await ... | AwaitExpr | hasType: | yes | getSubExpr: | identity_expressions.swift:12:35:12:42 | call to create() | -| identity_expressions.swift:15:5:15:21 | await ... | AwaitExpr | hasType: | yes | getSubExpr: | identity_expressions.swift:15:11:15:21 | call to process() | -| identity_expressions.swift:15:11:15:19 | (...) | ParenExpr | hasType: | yes | getSubExpr: | identity_expressions.swift:15:12:15:12 | process() | -| identity_expressions.swift:18:9:18:17 | BorrowExpr | BorrowExpr | hasType: | yes | getSubExpr: | identity_expressions.swift:18:17:18:17 | x | +| identity_expressions.swift:5:9:5:14 | .self | DotSelfExpr | getSubExpr: | identity_expressions.swift:5:9:5:9 | self | +| identity_expressions.swift:5:9:5:21 | .self | DotSelfExpr | getSubExpr: | identity_expressions.swift:5:9:5:19 | .x | +| identity_expressions.swift:5:28:5:31 | (...) | ParenExpr | getSubExpr: | identity_expressions.swift:5:29:5:29 | 42 | +| identity_expressions.swift:9:5:9:9 | (...) | ParenExpr | getSubExpr: | identity_expressions.swift:9:6:9:8 | call to A.init() | +| identity_expressions.swift:12:28:12:43 | (...) | ParenExpr | getSubExpr: | identity_expressions.swift:12:29:12:42 | await ... | +| identity_expressions.swift:12:29:12:42 | await ... | AwaitExpr | getSubExpr: | identity_expressions.swift:12:35:12:42 | call to create() | +| identity_expressions.swift:15:5:15:21 | await ... | AwaitExpr | getSubExpr: | identity_expressions.swift:15:11:15:21 | call to process() | +| identity_expressions.swift:15:11:15:19 | (...) | ParenExpr | getSubExpr: | identity_expressions.swift:15:12:15:12 | process() | +| identity_expressions.swift:18:9:18:17 | BorrowExpr | BorrowExpr | getSubExpr: | identity_expressions.swift:18:17:18:17 | x | getType | identity_expressions.swift:5:9:5:14 | .self | A | | identity_expressions.swift:5:9:5:21 | .self | @lvalue Int | diff --git a/swift/ql/test/extractor-tests/generated/expr/IdentityExpr/IdentityExpr.ql b/swift/ql/test/extractor-tests/generated/expr/IdentityExpr/IdentityExpr.ql index 4753f00c190..67a23147b3b 100644 --- a/swift/ql/test/extractor-tests/generated/expr/IdentityExpr/IdentityExpr.ql +++ b/swift/ql/test/extractor-tests/generated/expr/IdentityExpr/IdentityExpr.ql @@ -3,14 +3,11 @@ import codeql.swift.elements import TestUtils query predicate instances( - IdentityExpr x, string primaryQlClasses, string hasType__label, string hasType, - string getSubExpr__label, Expr getSubExpr + IdentityExpr x, string primaryQlClasses, string getSubExpr__label, Expr getSubExpr ) { toBeTested(x) and not x.isUnknown() and primaryQlClasses = x.getPrimaryQlClasses() and - hasType__label = "hasType:" and - (if x.hasType() then hasType = "yes" else hasType = "no") and getSubExpr__label = "getSubExpr:" and getSubExpr = x.getSubExpr() } diff --git a/swift/ql/test/extractor-tests/generated/expr/ImplicitConversionExpr/ImplicitConversionExpr.expected b/swift/ql/test/extractor-tests/generated/expr/ImplicitConversionExpr/ImplicitConversionExpr.expected index a1d053485a8..23713cba5cd 100644 --- a/swift/ql/test/extractor-tests/generated/expr/ImplicitConversionExpr/ImplicitConversionExpr.expected +++ b/swift/ql/test/extractor-tests/generated/expr/ImplicitConversionExpr/ImplicitConversionExpr.expected @@ -1,11 +1,11 @@ instances -| implicit_conversions.swift:2:3:2:3 | (UnsafePointer) ... | StringToPointerExpr | hasType: | yes | getSubExpr: | implicit_conversions.swift:2:3:2:3 | Hello | -| implicit_conversions.swift:4:16:4:16 | (Int?) ... | InjectIntoOptionalExpr | hasType: | yes | getSubExpr: | implicit_conversions.swift:4:16:4:16 | 42 | -| implicit_conversions.swift:5:25:5:25 | (any Equatable) ... | ErasureExpr | hasType: | yes | getSubExpr: | implicit_conversions.swift:5:25:5:25 | 42 | -| implicit_conversions.swift:12:3:12:5 | (@lvalue (() -> Void)?) ... | AbiSafeConversionExpr | hasType: | yes | getSubExpr: | implicit_conversions.swift:12:3:12:5 | .b | -| implicit_conversions.swift:12:9:12:10 | ((() -> Void)?) ... | InjectIntoOptionalExpr | hasType: | yes | getSubExpr: | implicit_conversions.swift:12:9:12:10 | { ... } | -| implicit_conversions.swift:24:3:24:5 | (Array) ... | UnsafeCastExpr | hasType: | yes | getSubExpr: | implicit_conversions.swift:24:3:24:5 | ([any Sendable]) ... | -| implicit_conversions.swift:24:3:24:5 | ([any Sendable]) ... | LoadExpr | hasType: | yes | getSubExpr: | implicit_conversions.swift:24:3:24:5 | .a | +| implicit_conversions.swift:2:3:2:3 | (UnsafePointer) ... | StringToPointerExpr | getSubExpr: | implicit_conversions.swift:2:3:2:3 | Hello | +| implicit_conversions.swift:4:16:4:16 | (Int?) ... | InjectIntoOptionalExpr | getSubExpr: | implicit_conversions.swift:4:16:4:16 | 42 | +| implicit_conversions.swift:5:25:5:25 | (any Equatable) ... | ErasureExpr | getSubExpr: | implicit_conversions.swift:5:25:5:25 | 42 | +| implicit_conversions.swift:12:3:12:5 | (@lvalue (() -> Void)?) ... | AbiSafeConversionExpr | getSubExpr: | implicit_conversions.swift:12:3:12:5 | .b | +| implicit_conversions.swift:12:9:12:10 | ((() -> Void)?) ... | InjectIntoOptionalExpr | getSubExpr: | implicit_conversions.swift:12:9:12:10 | { ... } | +| implicit_conversions.swift:24:3:24:5 | (Array) ... | UnsafeCastExpr | getSubExpr: | implicit_conversions.swift:24:3:24:5 | ([any Sendable]) ... | +| implicit_conversions.swift:24:3:24:5 | ([any Sendable]) ... | LoadExpr | getSubExpr: | implicit_conversions.swift:24:3:24:5 | .a | getType | implicit_conversions.swift:2:3:2:3 | (UnsafePointer) ... | UnsafePointer | | implicit_conversions.swift:4:16:4:16 | (Int?) ... | Int? | diff --git a/swift/ql/test/extractor-tests/generated/expr/ImplicitConversionExpr/ImplicitConversionExpr.ql b/swift/ql/test/extractor-tests/generated/expr/ImplicitConversionExpr/ImplicitConversionExpr.ql index 962f5bf0f1d..5861080be05 100644 --- a/swift/ql/test/extractor-tests/generated/expr/ImplicitConversionExpr/ImplicitConversionExpr.ql +++ b/swift/ql/test/extractor-tests/generated/expr/ImplicitConversionExpr/ImplicitConversionExpr.ql @@ -3,14 +3,11 @@ import codeql.swift.elements import TestUtils query predicate instances( - ImplicitConversionExpr x, string primaryQlClasses, string hasType__label, string hasType, - string getSubExpr__label, Expr getSubExpr + ImplicitConversionExpr x, string primaryQlClasses, string getSubExpr__label, Expr getSubExpr ) { toBeTested(x) and not x.isUnknown() and primaryQlClasses = x.getPrimaryQlClasses() and - hasType__label = "hasType:" and - (if x.hasType() then hasType = "yes" else hasType = "no") and getSubExpr__label = "getSubExpr:" and getSubExpr = x.getSubExpr() } diff --git a/swift/ql/test/extractor-tests/generated/expr/InitializerRefCallExpr/InitializerRefCallExpr.ql b/swift/ql/test/extractor-tests/generated/expr/InitializerRefCallExpr/InitializerRefCallExpr.ql index ab687383b32..190b919a498 100644 --- a/swift/ql/test/extractor-tests/generated/expr/InitializerRefCallExpr/InitializerRefCallExpr.ql +++ b/swift/ql/test/extractor-tests/generated/expr/InitializerRefCallExpr/InitializerRefCallExpr.ql @@ -3,18 +3,13 @@ import codeql.swift.elements import TestUtils query predicate instances( - InitializerRefCallExpr x, string hasType__label, string hasType, string getFunction__label, - Expr getFunction, string getNumberOfArguments__label, int getNumberOfArguments, - string getBase__label, Expr getBase + InitializerRefCallExpr x, string getFunction__label, Expr getFunction, string getBase__label, + Expr getBase ) { toBeTested(x) and not x.isUnknown() and - hasType__label = "hasType:" and - (if x.hasType() then hasType = "yes" else hasType = "no") and getFunction__label = "getFunction:" and getFunction = x.getFunction() and - getNumberOfArguments__label = "getNumberOfArguments:" and - getNumberOfArguments = x.getNumberOfArguments() and getBase__label = "getBase:" and getBase = x.getBase() } diff --git a/swift/ql/test/extractor-tests/generated/expr/KeyPathExpr/KeyPathExpr.expected b/swift/ql/test/extractor-tests/generated/expr/KeyPathExpr/KeyPathExpr.expected index af54b35d8e1..69318676c73 100644 --- a/swift/ql/test/extractor-tests/generated/expr/KeyPathExpr/KeyPathExpr.expected +++ b/swift/ql/test/extractor-tests/generated/expr/KeyPathExpr/KeyPathExpr.expected @@ -1,12 +1,12 @@ instances -| key_path_expr.swift:11:12:11:17 | #keyPath(...) | hasType: | yes | hasRoot: | yes | getNumberOfComponents: | 1 | -| key_path_expr.swift:12:18:12:26 | #keyPath(...) | hasType: | yes | hasRoot: | yes | getNumberOfComponents: | 1 | -| key_path_expr.swift:13:19:13:38 | #keyPath(...) | hasType: | yes | hasRoot: | yes | getNumberOfComponents: | 1 | -| key_path_expr.swift:14:16:14:35 | #keyPath(...) | hasType: | yes | hasRoot: | yes | getNumberOfComponents: | 2 | -| key_path_expr.swift:15:16:15:26 | #keyPath(...) | hasType: | yes | hasRoot: | yes | getNumberOfComponents: | 3 | -| key_path_expr.swift:16:20:16:30 | #keyPath(...) | hasType: | yes | hasRoot: | yes | getNumberOfComponents: | 4 | -| key_path_expr.swift:17:11:17:16 | #keyPath(...) | hasType: | yes | hasRoot: | yes | getNumberOfComponents: | 1 | -| key_path_expr.swift:18:20:18:32 | #keyPath(...) | hasType: | yes | hasRoot: | yes | getNumberOfComponents: | 1 | +| key_path_expr.swift:11:12:11:17 | #keyPath(...) | +| key_path_expr.swift:12:18:12:26 | #keyPath(...) | +| key_path_expr.swift:13:19:13:38 | #keyPath(...) | +| key_path_expr.swift:14:16:14:35 | #keyPath(...) | +| key_path_expr.swift:15:16:15:26 | #keyPath(...) | +| key_path_expr.swift:16:20:16:30 | #keyPath(...) | +| key_path_expr.swift:17:11:17:16 | #keyPath(...) | +| key_path_expr.swift:18:20:18:32 | #keyPath(...) | getType | key_path_expr.swift:11:12:11:17 | #keyPath(...) | WritableKeyPath | | key_path_expr.swift:12:18:12:26 | #keyPath(...) | WritableKeyPath<[Int], Int> | diff --git a/swift/ql/test/extractor-tests/generated/expr/KeyPathExpr/KeyPathExpr.ql b/swift/ql/test/extractor-tests/generated/expr/KeyPathExpr/KeyPathExpr.ql index 781ca756dfe..67ca30250cf 100644 --- a/swift/ql/test/extractor-tests/generated/expr/KeyPathExpr/KeyPathExpr.ql +++ b/swift/ql/test/extractor-tests/generated/expr/KeyPathExpr/KeyPathExpr.ql @@ -2,19 +2,7 @@ import codeql.swift.elements import TestUtils -query predicate instances( - KeyPathExpr x, string hasType__label, string hasType, string hasRoot__label, string hasRoot, - string getNumberOfComponents__label, int getNumberOfComponents -) { - toBeTested(x) and - not x.isUnknown() and - hasType__label = "hasType:" and - (if x.hasType() then hasType = "yes" else hasType = "no") and - hasRoot__label = "hasRoot:" and - (if x.hasRoot() then hasRoot = "yes" else hasRoot = "no") and - getNumberOfComponents__label = "getNumberOfComponents:" and - getNumberOfComponents = x.getNumberOfComponents() -} +query predicate instances(KeyPathExpr x) { toBeTested(x) and not x.isUnknown() } query predicate getType(KeyPathExpr x, Type getType) { toBeTested(x) and not x.isUnknown() and getType = x.getType() diff --git a/swift/ql/test/extractor-tests/generated/expr/MethodLookupExpr/MethodLookupExpr.expected b/swift/ql/test/extractor-tests/generated/expr/MethodLookupExpr/MethodLookupExpr.expected index 6154c2a7958..66837f972f2 100644 --- a/swift/ql/test/extractor-tests/generated/expr/MethodLookupExpr/MethodLookupExpr.expected +++ b/swift/ql/test/extractor-tests/generated/expr/MethodLookupExpr/MethodLookupExpr.expected @@ -1,33 +1,33 @@ instances -| file://:0:0:0:0 | UnownedSerialExecutor.init(_:) | hasType: | yes | getBase: | file://:0:0:0:0 | UnownedSerialExecutor.Type | hasMember: | yes | getMethodRef: | file://:0:0:0:0 | UnownedSerialExecutor.init(_:) | -| method_lookups.swift:7:13:7:13 | (no string representation) | hasType: | yes | getBase: | method_lookups.swift:7:13:7:13 | self | hasMember: | no | getMethodRef: | method_lookups.swift:7:13:7:13 | { ... } | -| method_lookups.swift:7:13:7:13 | .baz(_:) | hasType: | yes | getBase: | file://:0:0:0:0 | self | hasMember: | yes | getMethodRef: | method_lookups.swift:7:13:7:13 | baz(_:) | -| method_lookups.swift:16:13:16:13 | (no string representation) | hasType: | yes | getBase: | method_lookups.swift:16:13:16:13 | self | hasMember: | no | getMethodRef: | method_lookups.swift:16:13:16:13 | { ... } | -| method_lookups.swift:16:13:16:13 | .baz(_:) | hasType: | yes | getBase: | file://:0:0:0:0 | self | hasMember: | yes | getMethodRef: | method_lookups.swift:16:13:16:13 | baz(_:) | -| method_lookups.swift:27:13:27:13 | (no string representation) | hasType: | yes | getBase: | method_lookups.swift:27:13:27:13 | self | hasMember: | no | getMethodRef: | method_lookups.swift:27:13:27:13 | { ... } | -| method_lookups.swift:27:13:27:13 | .baz(_:) | hasType: | yes | getBase: | file://:0:0:0:0 | self | hasMember: | yes | getMethodRef: | method_lookups.swift:27:13:27:13 | baz(_:) | -| method_lookups.swift:32:3:32:5 | .foo(_:_:) | hasType: | yes | getBase: | method_lookups.swift:32:3:32:3 | X.Type | hasMember: | yes | getMethodRef: | method_lookups.swift:32:5:32:5 | foo(_:_:) | -| method_lookups.swift:33:3:33:5 | .bar() | hasType: | yes | getBase: | method_lookups.swift:33:3:33:3 | X.Type | hasMember: | yes | getMethodRef: | method_lookups.swift:33:5:33:5 | bar() | -| method_lookups.swift:34:3:34:3 | X.init() | hasType: | yes | getBase: | method_lookups.swift:34:3:34:3 | X.Type | hasMember: | yes | getMethodRef: | method_lookups.swift:34:3:34:3 | X.init() | -| method_lookups.swift:34:3:34:7 | .baz(_:) | hasType: | yes | getBase: | method_lookups.swift:34:3:34:5 | call to X.init() | hasMember: | yes | getMethodRef: | method_lookups.swift:34:7:34:7 | baz(_:) | -| method_lookups.swift:36:11:36:13 | .bar() | hasType: | yes | getBase: | method_lookups.swift:36:11:36:11 | X.Type | hasMember: | yes | getMethodRef: | method_lookups.swift:36:13:36:13 | bar() | -| method_lookups.swift:37:11:37:11 | X.init() | hasType: | yes | getBase: | method_lookups.swift:37:11:37:11 | X.Type | hasMember: | yes | getMethodRef: | method_lookups.swift:37:11:37:11 | X.init() | -| method_lookups.swift:37:11:37:15 | (no string representation) | hasType: | yes | getBase: | method_lookups.swift:37:11:37:13 | call to X.init() | hasMember: | no | getMethodRef: | method_lookups.swift:37:15:37:15 | { ... } | -| method_lookups.swift:37:15:37:15 | .baz(_:) | hasType: | yes | getBase: | file://:0:0:0:0 | self | hasMember: | yes | getMethodRef: | method_lookups.swift:37:15:37:15 | baz(_:) | -| method_lookups.swift:40:1:40:1 | Task.init(priority:operation:) | hasType: | yes | getBase: | method_lookups.swift:40:1:40:1 | Task<(), Never>.Type | hasMember: | yes | getMethodRef: | method_lookups.swift:40:1:40:1 | Task.init(priority:operation:) | -| method_lookups.swift:41:3:41:5 | .foo(_:_:) | hasType: | yes | getBase: | method_lookups.swift:41:3:41:3 | Y.Type | hasMember: | yes | getMethodRef: | method_lookups.swift:41:5:41:5 | foo(_:_:) | -| method_lookups.swift:42:9:42:9 | Y.init() | hasType: | yes | getBase: | method_lookups.swift:42:9:42:9 | Y.Type | hasMember: | yes | getMethodRef: | method_lookups.swift:42:9:42:9 | Y.init() | -| method_lookups.swift:42:9:42:13 | .baz(_:) | hasType: | yes | getBase: | method_lookups.swift:42:9:42:11 | call to Y.init() | hasMember: | yes | getMethodRef: | method_lookups.swift:42:13:42:13 | baz(_:) | -| method_lookups.swift:44:11:44:13 | .foo(_:_:) | hasType: | yes | getBase: | method_lookups.swift:44:11:44:11 | Y.Type | hasMember: | yes | getMethodRef: | method_lookups.swift:44:13:44:13 | foo(_:_:) | -| method_lookups.swift:47:1:47:1 | Task.init(priority:operation:) | hasType: | yes | getBase: | method_lookups.swift:47:1:47:1 | Task<(), Never>.Type | hasMember: | yes | getMethodRef: | method_lookups.swift:47:1:47:1 | Task.init(priority:operation:) | -| method_lookups.swift:48:9:48:11 | .foo(_:_:) | hasType: | yes | getBase: | method_lookups.swift:48:9:48:9 | Z.Type | hasMember: | yes | getMethodRef: | method_lookups.swift:48:11:48:11 | foo(_:_:) | -| method_lookups.swift:49:9:49:11 | .bar() | hasType: | yes | getBase: | method_lookups.swift:49:9:49:9 | Z.Type | hasMember: | yes | getMethodRef: | method_lookups.swift:49:11:49:11 | bar() | -| method_lookups.swift:50:9:50:9 | Z.init() | hasType: | yes | getBase: | method_lookups.swift:50:9:50:9 | Z.Type | hasMember: | yes | getMethodRef: | method_lookups.swift:50:9:50:9 | Z.init() | -| method_lookups.swift:50:9:50:13 | .baz(_:) | hasType: | yes | getBase: | method_lookups.swift:50:9:50:11 | call to Z.init() | hasMember: | yes | getMethodRef: | method_lookups.swift:50:13:50:13 | baz(_:) | -| method_lookups.swift:52:11:52:13 | .bar() | hasType: | yes | getBase: | method_lookups.swift:52:11:52:11 | Z.Type | hasMember: | yes | getMethodRef: | method_lookups.swift:52:13:52:13 | bar() | -| method_lookups.swift:53:11:53:23 | (no string representation) | hasType: | yes | getBase: | method_lookups.swift:53:18:53:20 | call to Z.init() | hasMember: | no | getMethodRef: | method_lookups.swift:53:23:53:23 | { ... } | -| method_lookups.swift:53:18:53:18 | Z.init() | hasType: | yes | getBase: | method_lookups.swift:53:18:53:18 | Z.Type | hasMember: | yes | getMethodRef: | method_lookups.swift:53:18:53:18 | Z.init() | -| method_lookups.swift:53:23:53:23 | .baz(_:) | hasType: | yes | getBase: | file://:0:0:0:0 | self | hasMember: | yes | getMethodRef: | method_lookups.swift:53:23:53:23 | baz(_:) | +| file://:0:0:0:0 | UnownedSerialExecutor.init(_:) | getBase: | file://:0:0:0:0 | UnownedSerialExecutor.Type | getMethodRef: | file://:0:0:0:0 | UnownedSerialExecutor.init(_:) | +| method_lookups.swift:7:13:7:13 | (no string representation) | getBase: | method_lookups.swift:7:13:7:13 | self | getMethodRef: | method_lookups.swift:7:13:7:13 | { ... } | +| method_lookups.swift:7:13:7:13 | .baz(_:) | getBase: | file://:0:0:0:0 | self | getMethodRef: | method_lookups.swift:7:13:7:13 | baz(_:) | +| method_lookups.swift:16:13:16:13 | (no string representation) | getBase: | method_lookups.swift:16:13:16:13 | self | getMethodRef: | method_lookups.swift:16:13:16:13 | { ... } | +| method_lookups.swift:16:13:16:13 | .baz(_:) | getBase: | file://:0:0:0:0 | self | getMethodRef: | method_lookups.swift:16:13:16:13 | baz(_:) | +| method_lookups.swift:27:13:27:13 | (no string representation) | getBase: | method_lookups.swift:27:13:27:13 | self | getMethodRef: | method_lookups.swift:27:13:27:13 | { ... } | +| method_lookups.swift:27:13:27:13 | .baz(_:) | getBase: | file://:0:0:0:0 | self | getMethodRef: | method_lookups.swift:27:13:27:13 | baz(_:) | +| method_lookups.swift:32:3:32:5 | .foo(_:_:) | getBase: | method_lookups.swift:32:3:32:3 | X.Type | getMethodRef: | method_lookups.swift:32:5:32:5 | foo(_:_:) | +| method_lookups.swift:33:3:33:5 | .bar() | getBase: | method_lookups.swift:33:3:33:3 | X.Type | getMethodRef: | method_lookups.swift:33:5:33:5 | bar() | +| method_lookups.swift:34:3:34:3 | X.init() | getBase: | method_lookups.swift:34:3:34:3 | X.Type | getMethodRef: | method_lookups.swift:34:3:34:3 | X.init() | +| method_lookups.swift:34:3:34:7 | .baz(_:) | getBase: | method_lookups.swift:34:3:34:5 | call to X.init() | getMethodRef: | method_lookups.swift:34:7:34:7 | baz(_:) | +| method_lookups.swift:36:11:36:13 | .bar() | getBase: | method_lookups.swift:36:11:36:11 | X.Type | getMethodRef: | method_lookups.swift:36:13:36:13 | bar() | +| method_lookups.swift:37:11:37:11 | X.init() | getBase: | method_lookups.swift:37:11:37:11 | X.Type | getMethodRef: | method_lookups.swift:37:11:37:11 | X.init() | +| method_lookups.swift:37:11:37:15 | (no string representation) | getBase: | method_lookups.swift:37:11:37:13 | call to X.init() | getMethodRef: | method_lookups.swift:37:15:37:15 | { ... } | +| method_lookups.swift:37:15:37:15 | .baz(_:) | getBase: | file://:0:0:0:0 | self | getMethodRef: | method_lookups.swift:37:15:37:15 | baz(_:) | +| method_lookups.swift:40:1:40:1 | Task.init(priority:operation:) | getBase: | method_lookups.swift:40:1:40:1 | Task<(), Never>.Type | getMethodRef: | method_lookups.swift:40:1:40:1 | Task.init(priority:operation:) | +| method_lookups.swift:41:3:41:5 | .foo(_:_:) | getBase: | method_lookups.swift:41:3:41:3 | Y.Type | getMethodRef: | method_lookups.swift:41:5:41:5 | foo(_:_:) | +| method_lookups.swift:42:9:42:9 | Y.init() | getBase: | method_lookups.swift:42:9:42:9 | Y.Type | getMethodRef: | method_lookups.swift:42:9:42:9 | Y.init() | +| method_lookups.swift:42:9:42:13 | .baz(_:) | getBase: | method_lookups.swift:42:9:42:11 | call to Y.init() | getMethodRef: | method_lookups.swift:42:13:42:13 | baz(_:) | +| method_lookups.swift:44:11:44:13 | .foo(_:_:) | getBase: | method_lookups.swift:44:11:44:11 | Y.Type | getMethodRef: | method_lookups.swift:44:13:44:13 | foo(_:_:) | +| method_lookups.swift:47:1:47:1 | Task.init(priority:operation:) | getBase: | method_lookups.swift:47:1:47:1 | Task<(), Never>.Type | getMethodRef: | method_lookups.swift:47:1:47:1 | Task.init(priority:operation:) | +| method_lookups.swift:48:9:48:11 | .foo(_:_:) | getBase: | method_lookups.swift:48:9:48:9 | Z.Type | getMethodRef: | method_lookups.swift:48:11:48:11 | foo(_:_:) | +| method_lookups.swift:49:9:49:11 | .bar() | getBase: | method_lookups.swift:49:9:49:9 | Z.Type | getMethodRef: | method_lookups.swift:49:11:49:11 | bar() | +| method_lookups.swift:50:9:50:9 | Z.init() | getBase: | method_lookups.swift:50:9:50:9 | Z.Type | getMethodRef: | method_lookups.swift:50:9:50:9 | Z.init() | +| method_lookups.swift:50:9:50:13 | .baz(_:) | getBase: | method_lookups.swift:50:9:50:11 | call to Z.init() | getMethodRef: | method_lookups.swift:50:13:50:13 | baz(_:) | +| method_lookups.swift:52:11:52:13 | .bar() | getBase: | method_lookups.swift:52:11:52:11 | Z.Type | getMethodRef: | method_lookups.swift:52:13:52:13 | bar() | +| method_lookups.swift:53:11:53:23 | (no string representation) | getBase: | method_lookups.swift:53:18:53:20 | call to Z.init() | getMethodRef: | method_lookups.swift:53:23:53:23 | { ... } | +| method_lookups.swift:53:18:53:18 | Z.init() | getBase: | method_lookups.swift:53:18:53:18 | Z.Type | getMethodRef: | method_lookups.swift:53:18:53:18 | Z.init() | +| method_lookups.swift:53:23:53:23 | .baz(_:) | getBase: | file://:0:0:0:0 | self | getMethodRef: | method_lookups.swift:53:23:53:23 | baz(_:) | getType | file://:0:0:0:0 | UnownedSerialExecutor.init(_:) | (Builtin.Executor) -> UnownedSerialExecutor | | method_lookups.swift:7:13:7:13 | (no string representation) | (Int) -> () | diff --git a/swift/ql/test/extractor-tests/generated/expr/MethodLookupExpr/MethodLookupExpr.ql b/swift/ql/test/extractor-tests/generated/expr/MethodLookupExpr/MethodLookupExpr.ql index 42847d62bd5..d2006d3bc81 100644 --- a/swift/ql/test/extractor-tests/generated/expr/MethodLookupExpr/MethodLookupExpr.ql +++ b/swift/ql/test/extractor-tests/generated/expr/MethodLookupExpr/MethodLookupExpr.ql @@ -3,17 +3,13 @@ import codeql.swift.elements import TestUtils query predicate instances( - MethodLookupExpr x, string hasType__label, string hasType, string getBase__label, Expr getBase, - string hasMember__label, string hasMember, string getMethodRef__label, Expr getMethodRef + MethodLookupExpr x, string getBase__label, Expr getBase, string getMethodRef__label, + Expr getMethodRef ) { toBeTested(x) and not x.isUnknown() and - hasType__label = "hasType:" and - (if x.hasType() then hasType = "yes" else hasType = "no") and getBase__label = "getBase:" and getBase = x.getBase() and - hasMember__label = "hasMember:" and - (if x.hasMember() then hasMember = "yes" else hasMember = "no") and getMethodRef__label = "getMethodRef:" and getMethodRef = x.getMethodRef() } diff --git a/swift/ql/test/extractor-tests/generated/expr/ObjectLiteralExpr/ObjectLiteralExpr.expected b/swift/ql/test/extractor-tests/generated/expr/ObjectLiteralExpr/ObjectLiteralExpr.expected index 74d12295b90..abf317e5a3b 100644 --- a/swift/ql/test/extractor-tests/generated/expr/ObjectLiteralExpr/ObjectLiteralExpr.expected +++ b/swift/ql/test/extractor-tests/generated/expr/ObjectLiteralExpr/ObjectLiteralExpr.expected @@ -1,7 +1,7 @@ instances -| object_literals.swift:5:5:5:42 | #fileLiteral(...) | hasType: | yes | getKind: | 0 | getNumberOfArguments: | 1 | -| object_literals.swift:6:5:6:61 | #colorLiteral(...) | hasType: | yes | getKind: | 2 | getNumberOfArguments: | 4 | -| object_literals.swift:7:5:7:44 | #imageLiteral(...) | hasType: | yes | getKind: | 1 | getNumberOfArguments: | 1 | +| object_literals.swift:5:5:5:42 | #fileLiteral(...) | getKind: | 0 | +| object_literals.swift:6:5:6:61 | #colorLiteral(...) | getKind: | 2 | +| object_literals.swift:7:5:7:44 | #imageLiteral(...) | getKind: | 1 | getType | object_literals.swift:5:5:5:42 | #fileLiteral(...) | <> | | object_literals.swift:6:5:6:61 | #colorLiteral(...) | <> | diff --git a/swift/ql/test/extractor-tests/generated/expr/ObjectLiteralExpr/ObjectLiteralExpr.ql b/swift/ql/test/extractor-tests/generated/expr/ObjectLiteralExpr/ObjectLiteralExpr.ql index c4c48c022b0..f84367ab3bb 100644 --- a/swift/ql/test/extractor-tests/generated/expr/ObjectLiteralExpr/ObjectLiteralExpr.ql +++ b/swift/ql/test/extractor-tests/generated/expr/ObjectLiteralExpr/ObjectLiteralExpr.ql @@ -2,18 +2,11 @@ import codeql.swift.elements import TestUtils -query predicate instances( - ObjectLiteralExpr x, string hasType__label, string hasType, string getKind__label, int getKind, - string getNumberOfArguments__label, int getNumberOfArguments -) { +query predicate instances(ObjectLiteralExpr x, string getKind__label, int getKind) { toBeTested(x) and not x.isUnknown() and - hasType__label = "hasType:" and - (if x.hasType() then hasType = "yes" else hasType = "no") and getKind__label = "getKind:" and - getKind = x.getKind() and - getNumberOfArguments__label = "getNumberOfArguments:" and - getNumberOfArguments = x.getNumberOfArguments() + getKind = x.getKind() } query predicate getType(ObjectLiteralExpr x, Type getType) { diff --git a/swift/ql/test/extractor-tests/generated/expr/OpenExistentialExpr/OpenExistentialExpr.expected b/swift/ql/test/extractor-tests/generated/expr/OpenExistentialExpr/OpenExistentialExpr.expected index bddb0fdef4c..14fd43b8fd5 100644 --- a/swift/ql/test/extractor-tests/generated/expr/OpenExistentialExpr/OpenExistentialExpr.expected +++ b/swift/ql/test/extractor-tests/generated/expr/OpenExistentialExpr/OpenExistentialExpr.expected @@ -1,4 +1,4 @@ instances -| open_existentials.swift:14:5:14:19 | OpenExistentialExpr | hasType: | yes | getSubExpr: | open_existentials.swift:14:5:14:19 | call to foo() | getExistential: | open_existentials.swift:14:5:14:13 | call to createP() | getOpaqueExpr: | open_existentials.swift:14:5:14:13 | OpaqueValueExpr | +| open_existentials.swift:14:5:14:19 | OpenExistentialExpr | getSubExpr: | open_existentials.swift:14:5:14:19 | call to foo() | getExistential: | open_existentials.swift:14:5:14:13 | call to createP() | getOpaqueExpr: | open_existentials.swift:14:5:14:13 | OpaqueValueExpr | getType | open_existentials.swift:14:5:14:19 | OpenExistentialExpr | () | diff --git a/swift/ql/test/extractor-tests/generated/expr/OpenExistentialExpr/OpenExistentialExpr.ql b/swift/ql/test/extractor-tests/generated/expr/OpenExistentialExpr/OpenExistentialExpr.ql index 26f8e8e9eaa..c94f907c4e9 100644 --- a/swift/ql/test/extractor-tests/generated/expr/OpenExistentialExpr/OpenExistentialExpr.ql +++ b/swift/ql/test/extractor-tests/generated/expr/OpenExistentialExpr/OpenExistentialExpr.ql @@ -3,14 +3,11 @@ import codeql.swift.elements import TestUtils query predicate instances( - OpenExistentialExpr x, string hasType__label, string hasType, string getSubExpr__label, - Expr getSubExpr, string getExistential__label, Expr getExistential, string getOpaqueExpr__label, - OpaqueValueExpr getOpaqueExpr + OpenExistentialExpr x, string getSubExpr__label, Expr getSubExpr, string getExistential__label, + Expr getExistential, string getOpaqueExpr__label, OpaqueValueExpr getOpaqueExpr ) { toBeTested(x) and not x.isUnknown() and - hasType__label = "hasType:" and - (if x.hasType() then hasType = "yes" else hasType = "no") and getSubExpr__label = "getSubExpr:" and getSubExpr = x.getSubExpr() and getExistential__label = "getExistential:" and diff --git a/swift/ql/test/extractor-tests/generated/expr/PackExpansionExpr/MaterializePackExpr.ql b/swift/ql/test/extractor-tests/generated/expr/PackExpansionExpr/MaterializePackExpr.ql index 51d3a87b1ac..1863b6090b9 100644 --- a/swift/ql/test/extractor-tests/generated/expr/PackExpansionExpr/MaterializePackExpr.ql +++ b/swift/ql/test/extractor-tests/generated/expr/PackExpansionExpr/MaterializePackExpr.ql @@ -2,14 +2,9 @@ import codeql.swift.elements import TestUtils -query predicate instances( - MaterializePackExpr x, string hasType__label, string hasType, string getSubExpr__label, - Expr getSubExpr -) { +query predicate instances(MaterializePackExpr x, string getSubExpr__label, Expr getSubExpr) { toBeTested(x) and not x.isUnknown() and - hasType__label = "hasType:" and - (if x.hasType() then hasType = "yes" else hasType = "no") and getSubExpr__label = "getSubExpr:" and getSubExpr = x.getSubExpr() } diff --git a/swift/ql/test/extractor-tests/generated/expr/PackExpansionExpr/PackElementExpr.expected b/swift/ql/test/extractor-tests/generated/expr/PackExpansionExpr/PackElementExpr.expected index 4f4eb6cd416..d970fe07944 100644 --- a/swift/ql/test/extractor-tests/generated/expr/PackExpansionExpr/PackElementExpr.expected +++ b/swift/ql/test/extractor-tests/generated/expr/PackExpansionExpr/PackElementExpr.expected @@ -1,4 +1,4 @@ instances -| test.swift:2:18:2:23 | PackElementExpr | hasType: | yes | getSubExpr: | test.swift:2:23:2:23 | t | +| test.swift:2:18:2:23 | PackElementExpr | getSubExpr: | test.swift:2:23:2:23 | t | getType | test.swift:2:18:2:23 | PackElementExpr | \u03c4_1_0 | diff --git a/swift/ql/test/extractor-tests/generated/expr/PackExpansionExpr/PackElementExpr.ql b/swift/ql/test/extractor-tests/generated/expr/PackExpansionExpr/PackElementExpr.ql index 11c6fe8d1b4..a9f6532242f 100644 --- a/swift/ql/test/extractor-tests/generated/expr/PackExpansionExpr/PackElementExpr.ql +++ b/swift/ql/test/extractor-tests/generated/expr/PackExpansionExpr/PackElementExpr.ql @@ -2,14 +2,9 @@ import codeql.swift.elements import TestUtils -query predicate instances( - PackElementExpr x, string hasType__label, string hasType, string getSubExpr__label, - Expr getSubExpr -) { +query predicate instances(PackElementExpr x, string getSubExpr__label, Expr getSubExpr) { toBeTested(x) and not x.isUnknown() and - hasType__label = "hasType:" and - (if x.hasType() then hasType = "yes" else hasType = "no") and getSubExpr__label = "getSubExpr:" and getSubExpr = x.getSubExpr() } diff --git a/swift/ql/test/extractor-tests/generated/expr/PackExpansionExpr/PackExpansionExpr.expected b/swift/ql/test/extractor-tests/generated/expr/PackExpansionExpr/PackExpansionExpr.expected index fc1acfc68c9..9815b9396c7 100644 --- a/swift/ql/test/extractor-tests/generated/expr/PackExpansionExpr/PackExpansionExpr.expected +++ b/swift/ql/test/extractor-tests/generated/expr/PackExpansionExpr/PackExpansionExpr.expected @@ -1,4 +1,4 @@ instances -| test.swift:2:11:2:23 | PackExpansionExpr | hasType: | yes | getPatternExpr: | test.swift:2:18:2:23 | PackElementExpr | +| test.swift:2:11:2:23 | PackExpansionExpr | getPatternExpr: | test.swift:2:18:2:23 | PackElementExpr | getType | test.swift:2:11:2:23 | PackExpansionExpr | repeat each T | diff --git a/swift/ql/test/extractor-tests/generated/expr/PackExpansionExpr/PackExpansionExpr.ql b/swift/ql/test/extractor-tests/generated/expr/PackExpansionExpr/PackExpansionExpr.ql index 13b78136f54..2ef41d1f244 100644 --- a/swift/ql/test/extractor-tests/generated/expr/PackExpansionExpr/PackExpansionExpr.ql +++ b/swift/ql/test/extractor-tests/generated/expr/PackExpansionExpr/PackExpansionExpr.ql @@ -2,14 +2,9 @@ import codeql.swift.elements import TestUtils -query predicate instances( - PackExpansionExpr x, string hasType__label, string hasType, string getPatternExpr__label, - Expr getPatternExpr -) { +query predicate instances(PackExpansionExpr x, string getPatternExpr__label, Expr getPatternExpr) { toBeTested(x) and not x.isUnknown() and - hasType__label = "hasType:" and - (if x.hasType() then hasType = "yes" else hasType = "no") and getPatternExpr__label = "getPatternExpr:" and getPatternExpr = x.getPatternExpr() } diff --git a/swift/ql/test/extractor-tests/generated/expr/PostfixUnaryExpr/PostfixUnaryExpr.expected b/swift/ql/test/extractor-tests/generated/expr/PostfixUnaryExpr/PostfixUnaryExpr.expected index 9a52e0a25c8..33f82610039 100644 --- a/swift/ql/test/extractor-tests/generated/expr/PostfixUnaryExpr/PostfixUnaryExpr.expected +++ b/swift/ql/test/extractor-tests/generated/expr/PostfixUnaryExpr/PostfixUnaryExpr.expected @@ -1,6 +1,6 @@ instances -| postfix.swift:1:5:1:6 | call to ...(_:) | hasType: | yes | getFunction: | postfix.swift:1:6:1:6 | ....(_:) | getNumberOfArguments: | 1 | -| postfix.swift:7:1:7:2 | call to **(_:) | hasType: | yes | getFunction: | postfix.swift:7:2:7:2 | **(_:) | getNumberOfArguments: | 1 | +| postfix.swift:1:5:1:6 | call to ...(_:) | getFunction: | postfix.swift:1:6:1:6 | ....(_:) | +| postfix.swift:7:1:7:2 | call to **(_:) | getFunction: | postfix.swift:7:2:7:2 | **(_:) | getType | postfix.swift:1:5:1:6 | call to ...(_:) | PartialRangeFrom | | postfix.swift:7:1:7:2 | call to **(_:) | () | diff --git a/swift/ql/test/extractor-tests/generated/expr/PostfixUnaryExpr/PostfixUnaryExpr.ql b/swift/ql/test/extractor-tests/generated/expr/PostfixUnaryExpr/PostfixUnaryExpr.ql index 6df8be9a8a6..101048cb5c1 100644 --- a/swift/ql/test/extractor-tests/generated/expr/PostfixUnaryExpr/PostfixUnaryExpr.ql +++ b/swift/ql/test/extractor-tests/generated/expr/PostfixUnaryExpr/PostfixUnaryExpr.ql @@ -2,18 +2,11 @@ import codeql.swift.elements import TestUtils -query predicate instances( - PostfixUnaryExpr x, string hasType__label, string hasType, string getFunction__label, - Expr getFunction, string getNumberOfArguments__label, int getNumberOfArguments -) { +query predicate instances(PostfixUnaryExpr x, string getFunction__label, Expr getFunction) { toBeTested(x) and not x.isUnknown() and - hasType__label = "hasType:" and - (if x.hasType() then hasType = "yes" else hasType = "no") and getFunction__label = "getFunction:" and - getFunction = x.getFunction() and - getNumberOfArguments__label = "getNumberOfArguments:" and - getNumberOfArguments = x.getNumberOfArguments() + getFunction = x.getFunction() } query predicate getType(PostfixUnaryExpr x, Type getType) { diff --git a/swift/ql/test/extractor-tests/generated/expr/PropertyWrapperValuePlaceholderExpr/PropertyWrapperValuePlaceholderExpr.expected b/swift/ql/test/extractor-tests/generated/expr/PropertyWrapperValuePlaceholderExpr/PropertyWrapperValuePlaceholderExpr.expected index 54cba7a2a04..9276038c719 100644 --- a/swift/ql/test/extractor-tests/generated/expr/PropertyWrapperValuePlaceholderExpr/PropertyWrapperValuePlaceholderExpr.expected +++ b/swift/ql/test/extractor-tests/generated/expr/PropertyWrapperValuePlaceholderExpr/PropertyWrapperValuePlaceholderExpr.expected @@ -1,5 +1,5 @@ instances -| property_wrapper_value_placeholder.swift:12:26:12:26 | PropertyWrapperValuePlaceholderExpr | hasType: | yes | hasWrappedValue: | yes | getPlaceholder: | property_wrapper_value_placeholder.swift:12:26:12:26 | OpaqueValueExpr | +| property_wrapper_value_placeholder.swift:12:26:12:26 | PropertyWrapperValuePlaceholderExpr | getPlaceholder: | property_wrapper_value_placeholder.swift:12:26:12:26 | OpaqueValueExpr | getType | property_wrapper_value_placeholder.swift:12:26:12:26 | PropertyWrapperValuePlaceholderExpr | Int | getWrappedValue diff --git a/swift/ql/test/extractor-tests/generated/expr/PropertyWrapperValuePlaceholderExpr/PropertyWrapperValuePlaceholderExpr.ql b/swift/ql/test/extractor-tests/generated/expr/PropertyWrapperValuePlaceholderExpr/PropertyWrapperValuePlaceholderExpr.ql index 5bb768043f8..bdd44df47b6 100644 --- a/swift/ql/test/extractor-tests/generated/expr/PropertyWrapperValuePlaceholderExpr/PropertyWrapperValuePlaceholderExpr.ql +++ b/swift/ql/test/extractor-tests/generated/expr/PropertyWrapperValuePlaceholderExpr/PropertyWrapperValuePlaceholderExpr.ql @@ -3,16 +3,11 @@ import codeql.swift.elements import TestUtils query predicate instances( - PropertyWrapperValuePlaceholderExpr x, string hasType__label, string hasType, - string hasWrappedValue__label, string hasWrappedValue, string getPlaceholder__label, + PropertyWrapperValuePlaceholderExpr x, string getPlaceholder__label, OpaqueValueExpr getPlaceholder ) { toBeTested(x) and not x.isUnknown() and - hasType__label = "hasType:" and - (if x.hasType() then hasType = "yes" else hasType = "no") and - hasWrappedValue__label = "hasWrappedValue:" and - (if x.hasWrappedValue() then hasWrappedValue = "yes" else hasWrappedValue = "no") and getPlaceholder__label = "getPlaceholder:" and getPlaceholder = x.getPlaceholder() } diff --git a/swift/ql/test/extractor-tests/generated/expr/SingleValueStmtExpr/SingleValueStmtExpr.expected b/swift/ql/test/extractor-tests/generated/expr/SingleValueStmtExpr/SingleValueStmtExpr.expected index a25d72d1157..a76ec56151d 100644 --- a/swift/ql/test/extractor-tests/generated/expr/SingleValueStmtExpr/SingleValueStmtExpr.expected +++ b/swift/ql/test/extractor-tests/generated/expr/SingleValueStmtExpr/SingleValueStmtExpr.expected @@ -1,6 +1,6 @@ instances -| test.swift:2:3:7:3 | SingleValueStmtExpr | hasType: | yes | getStmt: | test.swift:2:3:7:3 | switch x { ... } | -| test.swift:11:3:11:30 | SingleValueStmtExpr | hasType: | yes | getStmt: | test.swift:11:3:11:30 | if ... then { ... } else { ... } | +| test.swift:2:3:7:3 | SingleValueStmtExpr | getStmt: | test.swift:2:3:7:3 | switch x { ... } | +| test.swift:11:3:11:30 | SingleValueStmtExpr | getStmt: | test.swift:11:3:11:30 | if ... then { ... } else { ... } | getType | test.swift:2:3:7:3 | SingleValueStmtExpr | Int | | test.swift:11:3:11:30 | SingleValueStmtExpr | Int | diff --git a/swift/ql/test/extractor-tests/generated/expr/SingleValueStmtExpr/SingleValueStmtExpr.ql b/swift/ql/test/extractor-tests/generated/expr/SingleValueStmtExpr/SingleValueStmtExpr.ql index 1ce8d70b9d1..a6093558118 100644 --- a/swift/ql/test/extractor-tests/generated/expr/SingleValueStmtExpr/SingleValueStmtExpr.ql +++ b/swift/ql/test/extractor-tests/generated/expr/SingleValueStmtExpr/SingleValueStmtExpr.ql @@ -2,13 +2,9 @@ import codeql.swift.elements import TestUtils -query predicate instances( - SingleValueStmtExpr x, string hasType__label, string hasType, string getStmt__label, Stmt getStmt -) { +query predicate instances(SingleValueStmtExpr x, string getStmt__label, Stmt getStmt) { toBeTested(x) and not x.isUnknown() and - hasType__label = "hasType:" and - (if x.hasType() then hasType = "yes" else hasType = "no") and getStmt__label = "getStmt:" and getStmt = x.getStmt() } diff --git a/swift/ql/test/extractor-tests/generated/expr/TypeValueExpr/TypeValueExpr.expected b/swift/ql/test/extractor-tests/generated/expr/TypeValueExpr/TypeValueExpr.expected index b141bd02461..a495d6d72d8 100644 --- a/swift/ql/test/extractor-tests/generated/expr/TypeValueExpr/TypeValueExpr.expected +++ b/swift/ql/test/extractor-tests/generated/expr/TypeValueExpr/TypeValueExpr.expected @@ -1,6 +1,6 @@ instances -| type_value_exprs.swift:4:13:4:13 | TypeValueExpr | hasType: | yes | getTypeRepr: | type_value_exprs.swift:4:13:4:13 | N | -| type_value_exprs.swift:5:13:5:13 | TypeValueExpr | hasType: | yes | getTypeRepr: | type_value_exprs.swift:5:13:5:13 | N | +| type_value_exprs.swift:4:13:4:13 | TypeValueExpr | getTypeRepr: | type_value_exprs.swift:4:13:4:13 | N | +| type_value_exprs.swift:5:13:5:13 | TypeValueExpr | getTypeRepr: | type_value_exprs.swift:5:13:5:13 | N | getType | type_value_exprs.swift:4:13:4:13 | TypeValueExpr | Int | | type_value_exprs.swift:5:13:5:13 | TypeValueExpr | Int | diff --git a/swift/ql/test/extractor-tests/generated/expr/TypeValueExpr/TypeValueExpr.ql b/swift/ql/test/extractor-tests/generated/expr/TypeValueExpr/TypeValueExpr.ql index 7d8d93de33d..a8f3d7163fd 100644 --- a/swift/ql/test/extractor-tests/generated/expr/TypeValueExpr/TypeValueExpr.ql +++ b/swift/ql/test/extractor-tests/generated/expr/TypeValueExpr/TypeValueExpr.ql @@ -2,14 +2,9 @@ import codeql.swift.elements import TestUtils -query predicate instances( - TypeValueExpr x, string hasType__label, string hasType, string getTypeRepr__label, - TypeRepr getTypeRepr -) { +query predicate instances(TypeValueExpr x, string getTypeRepr__label, TypeRepr getTypeRepr) { toBeTested(x) and not x.isUnknown() and - hasType__label = "hasType:" and - (if x.hasType() then hasType = "yes" else hasType = "no") and getTypeRepr__label = "getTypeRepr:" and getTypeRepr = x.getTypeRepr() } diff --git a/swift/ql/test/extractor-tests/generated/stmt/ForEachStmt/ForEachStmt.expected b/swift/ql/test/extractor-tests/generated/stmt/ForEachStmt/ForEachStmt.expected index e31e88b4abb..55fc86a8fdb 100644 --- a/swift/ql/test/extractor-tests/generated/stmt/ForEachStmt/ForEachStmt.expected +++ b/swift/ql/test/extractor-tests/generated/stmt/ForEachStmt/ForEachStmt.expected @@ -1,7 +1,7 @@ instances -| for.swift:4:5:6:5 | for ... in ... where ... { ... } | hasLabel: | no | getNumberOfVariables: | 2 | getPattern: | for.swift:4:9:4:9 | x | hasWhere: | yes | hasIteratorVar: | yes | hasNextCall: | yes | getBody: | for.swift:4:32:6:5 | { ... } | -| for.swift:7:5:9:5 | for ... in ... { ... } | hasLabel: | no | getNumberOfVariables: | 2 | getPattern: | for.swift:7:9:7:9 | s | hasWhere: | no | hasIteratorVar: | yes | hasNextCall: | yes | getBody: | for.swift:7:23:9:5 | { ... } | -| for.swift:13:5:17:5 | for ... in ... { ... } | hasLabel: | no | getNumberOfVariables: | 1 | getPattern: | for.swift:13:9:13:9 | x | hasWhere: | no | hasIteratorVar: | no | hasNextCall: | no | getBody: | for.swift:13:32:17:5 | { ... } | +| for.swift:4:5:6:5 | for ... in ... where ... { ... } | getPattern: | for.swift:4:9:4:9 | x | getBody: | for.swift:4:32:6:5 | { ... } | +| for.swift:7:5:9:5 | for ... in ... { ... } | getPattern: | for.swift:7:9:7:9 | s | getBody: | for.swift:7:23:9:5 | { ... } | +| for.swift:13:5:17:5 | for ... in ... { ... } | getPattern: | for.swift:13:9:13:9 | x | getBody: | for.swift:13:32:17:5 | { ... } | getLabel getVariable | for.swift:4:5:6:5 | for ... in ... where ... { ... } | 0 | for.swift:4:9:4:9 | x | diff --git a/swift/ql/test/extractor-tests/generated/stmt/ForEachStmt/ForEachStmt.ql b/swift/ql/test/extractor-tests/generated/stmt/ForEachStmt/ForEachStmt.ql index 043e77e5e45..8b9bcabc816 100644 --- a/swift/ql/test/extractor-tests/generated/stmt/ForEachStmt/ForEachStmt.ql +++ b/swift/ql/test/extractor-tests/generated/stmt/ForEachStmt/ForEachStmt.ql @@ -3,25 +3,13 @@ import codeql.swift.elements import TestUtils query predicate instances( - ForEachStmt x, string hasLabel__label, string hasLabel, string getNumberOfVariables__label, - int getNumberOfVariables, string getPattern__label, Pattern getPattern, string hasWhere__label, - string hasWhere, string hasIteratorVar__label, string hasIteratorVar, string hasNextCall__label, - string hasNextCall, string getBody__label, BraceStmt getBody + ForEachStmt x, string getPattern__label, Pattern getPattern, string getBody__label, + BraceStmt getBody ) { toBeTested(x) and not x.isUnknown() and - hasLabel__label = "hasLabel:" and - (if x.hasLabel() then hasLabel = "yes" else hasLabel = "no") and - getNumberOfVariables__label = "getNumberOfVariables:" and - getNumberOfVariables = x.getNumberOfVariables() and getPattern__label = "getPattern:" and getPattern = x.getPattern() and - hasWhere__label = "hasWhere:" and - (if x.hasWhere() then hasWhere = "yes" else hasWhere = "no") and - hasIteratorVar__label = "hasIteratorVar:" and - (if x.hasIteratorVar() then hasIteratorVar = "yes" else hasIteratorVar = "no") and - hasNextCall__label = "hasNextCall:" and - (if x.hasNextCall() then hasNextCall = "yes" else hasNextCall = "no") and getBody__label = "getBody:" and getBody = x.getBody() } diff --git a/swift/ql/test/extractor-tests/generated/stmt/SwitchStmt/CaseLabelItem.expected b/swift/ql/test/extractor-tests/generated/stmt/SwitchStmt/CaseLabelItem.expected index 5f8b4bd6e34..981203c520d 100644 --- a/swift/ql/test/extractor-tests/generated/stmt/SwitchStmt/CaseLabelItem.expected +++ b/swift/ql/test/extractor-tests/generated/stmt/SwitchStmt/CaseLabelItem.expected @@ -1,17 +1,17 @@ instances -| switch.swift:3:9:3:9 | =~ ... | getPattern: | switch.swift:3:9:3:9 | =~ ... | hasGuard: | no | -| switch.swift:6:9:6:9 | =~ ... | getPattern: | switch.swift:6:9:6:9 | =~ ... | hasGuard: | no | -| switch.swift:6:12:6:12 | =~ ... | getPattern: | switch.swift:6:12:6:12 | =~ ... | hasGuard: | no | -| switch.swift:8:9:8:26 | x where ... | getPattern: | switch.swift:8:13:8:13 | x | hasGuard: | yes | -| switch.swift:10:4:10:4 | _ | getPattern: | switch.swift:10:4:10:4 | _ | hasGuard: | no | -| switch.swift:22:8:22:9 | .one | getPattern: | switch.swift:22:8:22:9 | .one | hasGuard: | no | -| switch.swift:24:8:24:40 | .two(...) where ... | getPattern: | switch.swift:24:8:24:25 | .two(...) | hasGuard: | yes | -| switch.swift:26:8:26:25 | .two(...) | getPattern: | switch.swift:26:8:26:25 | .two(...) | hasGuard: | no | -| switch.swift:28:8:28:23 | .three(...) | getPattern: | switch.swift:28:8:28:23 | .three(...) | hasGuard: | no | -| switch.swift:33:8:33:21 | .two(...) | getPattern: | switch.swift:33:8:33:21 | .two(...) | hasGuard: | no | -| switch.swift:35:13:35:13 | =~ ... | getPattern: | switch.swift:35:13:35:13 | =~ ... | hasGuard: | no | -| switch.swift:37:8:37:8 | _ | getPattern: | switch.swift:37:8:37:8 | _ | hasGuard: | no | -| switch.swift:40:3:40:3 | _ | getPattern: | switch.swift:40:3:40:3 | _ | hasGuard: | no | +| switch.swift:3:9:3:9 | =~ ... | getPattern: | switch.swift:3:9:3:9 | =~ ... | +| switch.swift:6:9:6:9 | =~ ... | getPattern: | switch.swift:6:9:6:9 | =~ ... | +| switch.swift:6:12:6:12 | =~ ... | getPattern: | switch.swift:6:12:6:12 | =~ ... | +| switch.swift:8:9:8:26 | x where ... | getPattern: | switch.swift:8:13:8:13 | x | +| switch.swift:10:4:10:4 | _ | getPattern: | switch.swift:10:4:10:4 | _ | +| switch.swift:22:8:22:9 | .one | getPattern: | switch.swift:22:8:22:9 | .one | +| switch.swift:24:8:24:40 | .two(...) where ... | getPattern: | switch.swift:24:8:24:25 | .two(...) | +| switch.swift:26:8:26:25 | .two(...) | getPattern: | switch.swift:26:8:26:25 | .two(...) | +| switch.swift:28:8:28:23 | .three(...) | getPattern: | switch.swift:28:8:28:23 | .three(...) | +| switch.swift:33:8:33:21 | .two(...) | getPattern: | switch.swift:33:8:33:21 | .two(...) | +| switch.swift:35:13:35:13 | =~ ... | getPattern: | switch.swift:35:13:35:13 | =~ ... | +| switch.swift:37:8:37:8 | _ | getPattern: | switch.swift:37:8:37:8 | _ | +| switch.swift:40:3:40:3 | _ | getPattern: | switch.swift:40:3:40:3 | _ | getGuard | switch.swift:8:9:8:26 | x where ... | switch.swift:8:21:8:26 | ... .>=(_:_:) ... | | switch.swift:24:8:24:40 | .two(...) where ... | switch.swift:24:33:24:40 | ... .==(_:_:) ... | diff --git a/swift/ql/test/extractor-tests/generated/stmt/SwitchStmt/CaseLabelItem.ql b/swift/ql/test/extractor-tests/generated/stmt/SwitchStmt/CaseLabelItem.ql index 9c4f6e85dde..6838d62dbae 100644 --- a/swift/ql/test/extractor-tests/generated/stmt/SwitchStmt/CaseLabelItem.ql +++ b/swift/ql/test/extractor-tests/generated/stmt/SwitchStmt/CaseLabelItem.ql @@ -2,16 +2,11 @@ import codeql.swift.elements import TestUtils -query predicate instances( - CaseLabelItem x, string getPattern__label, Pattern getPattern, string hasGuard__label, - string hasGuard -) { +query predicate instances(CaseLabelItem x, string getPattern__label, Pattern getPattern) { toBeTested(x) and not x.isUnknown() and getPattern__label = "getPattern:" and - getPattern = x.getPattern() and - hasGuard__label = "hasGuard:" and - if x.hasGuard() then hasGuard = "yes" else hasGuard = "no" + getPattern = x.getPattern() } query predicate getGuard(CaseLabelItem x, Expr getGuard) { diff --git a/swift/ql/test/extractor-tests/generated/stmt/SwitchStmt/CaseStmt.expected b/swift/ql/test/extractor-tests/generated/stmt/SwitchStmt/CaseStmt.expected index c00a1ba287d..52dd5204487 100644 --- a/swift/ql/test/extractor-tests/generated/stmt/SwitchStmt/CaseStmt.expected +++ b/swift/ql/test/extractor-tests/generated/stmt/SwitchStmt/CaseStmt.expected @@ -1,16 +1,16 @@ instances -| switch.swift:3:4:5:7 | case ... | getNumberOfLabels: | 1 | getNumberOfVariables: | 0 | getBody: | switch.swift:4:7:5:7 | { ... } | -| switch.swift:6:4:7:20 | case ... | getNumberOfLabels: | 2 | getNumberOfVariables: | 0 | getBody: | switch.swift:7:7:7:20 | { ... } | -| switch.swift:8:4:9:18 | case ... | getNumberOfLabels: | 1 | getNumberOfVariables: | 1 | getBody: | switch.swift:9:7:9:18 | { ... } | -| switch.swift:10:4:11:22 | case ... | getNumberOfLabels: | 1 | getNumberOfVariables: | 0 | getBody: | switch.swift:11:7:11:22 | { ... } | -| switch.swift:22:3:23:5 | case ... | getNumberOfLabels: | 1 | getNumberOfVariables: | 0 | getBody: | switch.swift:23:5:23:5 | { ... } | -| switch.swift:24:3:25:5 | case ... | getNumberOfLabels: | 1 | getNumberOfVariables: | 2 | getBody: | switch.swift:25:5:25:5 | { ... } | -| switch.swift:26:3:27:5 | case ... | getNumberOfLabels: | 1 | getNumberOfVariables: | 2 | getBody: | switch.swift:27:5:27:5 | { ... } | -| switch.swift:28:3:29:5 | case ... | getNumberOfLabels: | 1 | getNumberOfVariables: | 1 | getBody: | switch.swift:29:5:29:5 | { ... } | -| switch.swift:33:3:39:5 | case ... | getNumberOfLabels: | 1 | getNumberOfVariables: | 1 | getBody: | switch.swift:34:5:39:5 | { ... } | -| switch.swift:35:8:36:16 | case ... | getNumberOfLabels: | 1 | getNumberOfVariables: | 0 | getBody: | switch.swift:36:10:36:16 | { ... } | -| switch.swift:37:8:38:16 | case ... | getNumberOfLabels: | 1 | getNumberOfVariables: | 0 | getBody: | switch.swift:38:10:38:16 | { ... } | -| switch.swift:40:3:41:5 | case ... | getNumberOfLabels: | 1 | getNumberOfVariables: | 0 | getBody: | switch.swift:41:5:41:5 | { ... } | +| switch.swift:3:4:5:7 | case ... | getBody: | switch.swift:4:7:5:7 | { ... } | +| switch.swift:6:4:7:20 | case ... | getBody: | switch.swift:7:7:7:20 | { ... } | +| switch.swift:8:4:9:18 | case ... | getBody: | switch.swift:9:7:9:18 | { ... } | +| switch.swift:10:4:11:22 | case ... | getBody: | switch.swift:11:7:11:22 | { ... } | +| switch.swift:22:3:23:5 | case ... | getBody: | switch.swift:23:5:23:5 | { ... } | +| switch.swift:24:3:25:5 | case ... | getBody: | switch.swift:25:5:25:5 | { ... } | +| switch.swift:26:3:27:5 | case ... | getBody: | switch.swift:27:5:27:5 | { ... } | +| switch.swift:28:3:29:5 | case ... | getBody: | switch.swift:29:5:29:5 | { ... } | +| switch.swift:33:3:39:5 | case ... | getBody: | switch.swift:34:5:39:5 | { ... } | +| switch.swift:35:8:36:16 | case ... | getBody: | switch.swift:36:10:36:16 | { ... } | +| switch.swift:37:8:38:16 | case ... | getBody: | switch.swift:38:10:38:16 | { ... } | +| switch.swift:40:3:41:5 | case ... | getBody: | switch.swift:41:5:41:5 | { ... } | getLabel | switch.swift:3:4:5:7 | case ... | 0 | switch.swift:3:9:3:9 | =~ ... | | switch.swift:6:4:7:20 | case ... | 0 | switch.swift:6:9:6:9 | =~ ... | diff --git a/swift/ql/test/extractor-tests/generated/stmt/SwitchStmt/CaseStmt.ql b/swift/ql/test/extractor-tests/generated/stmt/SwitchStmt/CaseStmt.ql index e1b30f7ec9b..b248ecf3840 100644 --- a/swift/ql/test/extractor-tests/generated/stmt/SwitchStmt/CaseStmt.ql +++ b/swift/ql/test/extractor-tests/generated/stmt/SwitchStmt/CaseStmt.ql @@ -2,16 +2,9 @@ import codeql.swift.elements import TestUtils -query predicate instances( - CaseStmt x, string getNumberOfLabels__label, int getNumberOfLabels, - string getNumberOfVariables__label, int getNumberOfVariables, string getBody__label, Stmt getBody -) { +query predicate instances(CaseStmt x, string getBody__label, Stmt getBody) { toBeTested(x) and not x.isUnknown() and - getNumberOfLabels__label = "getNumberOfLabels:" and - getNumberOfLabels = x.getNumberOfLabels() and - getNumberOfVariables__label = "getNumberOfVariables:" and - getNumberOfVariables = x.getNumberOfVariables() and getBody__label = "getBody:" and getBody = x.getBody() } diff --git a/swift/ql/test/extractor-tests/generated/stmt/SwitchStmt/SwitchStmt.expected b/swift/ql/test/extractor-tests/generated/stmt/SwitchStmt/SwitchStmt.expected index 235550c775b..ad4fed60062 100644 --- a/swift/ql/test/extractor-tests/generated/stmt/SwitchStmt/SwitchStmt.expected +++ b/swift/ql/test/extractor-tests/generated/stmt/SwitchStmt/SwitchStmt.expected @@ -1,8 +1,8 @@ instances -| switch.swift:2:1:12:1 | switch index { ... } | hasLabel: | no | getExpr: | switch.swift:2:8:2:8 | index | getNumberOfCases: | 4 | -| switch.swift:21:1:30:1 | switch x { ... } | hasLabel: | no | getExpr: | switch.swift:21:8:21:8 | x | getNumberOfCases: | 4 | -| switch.swift:32:1:42:1 | switch x { ... } | hasLabel: | yes | getExpr: | switch.swift:32:15:32:15 | x | getNumberOfCases: | 2 | -| switch.swift:34:5:39:5 | switch a { ... } | hasLabel: | yes | getExpr: | switch.swift:34:19:34:19 | a | getNumberOfCases: | 2 | +| switch.swift:2:1:12:1 | switch index { ... } | getExpr: | switch.swift:2:8:2:8 | index | +| switch.swift:21:1:30:1 | switch x { ... } | getExpr: | switch.swift:21:8:21:8 | x | +| switch.swift:32:1:42:1 | switch x { ... } | getExpr: | switch.swift:32:15:32:15 | x | +| switch.swift:34:5:39:5 | switch a { ... } | getExpr: | switch.swift:34:19:34:19 | a | getLabel | switch.swift:32:1:42:1 | switch x { ... } | outer | | switch.swift:34:5:39:5 | switch a { ... } | inner | diff --git a/swift/ql/test/extractor-tests/generated/stmt/SwitchStmt/SwitchStmt.ql b/swift/ql/test/extractor-tests/generated/stmt/SwitchStmt/SwitchStmt.ql index ebc79dacf4e..bd817bcb416 100644 --- a/swift/ql/test/extractor-tests/generated/stmt/SwitchStmt/SwitchStmt.ql +++ b/swift/ql/test/extractor-tests/generated/stmt/SwitchStmt/SwitchStmt.ql @@ -2,18 +2,11 @@ import codeql.swift.elements import TestUtils -query predicate instances( - SwitchStmt x, string hasLabel__label, string hasLabel, string getExpr__label, Expr getExpr, - string getNumberOfCases__label, int getNumberOfCases -) { +query predicate instances(SwitchStmt x, string getExpr__label, Expr getExpr) { toBeTested(x) and not x.isUnknown() and - hasLabel__label = "hasLabel:" and - (if x.hasLabel() then hasLabel = "yes" else hasLabel = "no") and getExpr__label = "getExpr:" and - getExpr = x.getExpr() and - getNumberOfCases__label = "getNumberOfCases:" and - getNumberOfCases = x.getNumberOfCases() + getExpr = x.getExpr() } query predicate getLabel(SwitchStmt x, string getLabel) { diff --git a/swift/ql/test/extractor-tests/generated/type/BuiltinIntegerType/BuiltinIntegerType.expected b/swift/ql/test/extractor-tests/generated/type/BuiltinIntegerType/BuiltinIntegerType.expected index db9d4a652c5..7bc36b2f4e0 100644 --- a/swift/ql/test/extractor-tests/generated/type/BuiltinIntegerType/BuiltinIntegerType.expected +++ b/swift/ql/test/extractor-tests/generated/type/BuiltinIntegerType/BuiltinIntegerType.expected @@ -1,9 +1,9 @@ instances -| Builtin.Int8 | getName: | Int8 | getCanonicalType: | Builtin.Int8 | hasWidth: | yes | -| Builtin.Int16 | getName: | Int16 | getCanonicalType: | Builtin.Int16 | hasWidth: | yes | -| Builtin.Int32 | getName: | Int32 | getCanonicalType: | Builtin.Int32 | hasWidth: | yes | -| Builtin.Int64 | getName: | Int64 | getCanonicalType: | Builtin.Int64 | hasWidth: | yes | -| Builtin.Word | getName: | Word | getCanonicalType: | Builtin.Word | hasWidth: | no | +| Builtin.Int8 | getName: | Int8 | getCanonicalType: | Builtin.Int8 | +| Builtin.Int16 | getName: | Int16 | getCanonicalType: | Builtin.Int16 | +| Builtin.Int32 | getName: | Int32 | getCanonicalType: | Builtin.Int32 | +| Builtin.Int64 | getName: | Int64 | getCanonicalType: | Builtin.Int64 | +| Builtin.Word | getName: | Word | getCanonicalType: | Builtin.Word | getWidth | Builtin.Int8 | 8 | | Builtin.Int16 | 16 | diff --git a/swift/ql/test/extractor-tests/generated/type/BuiltinIntegerType/BuiltinIntegerType.ql b/swift/ql/test/extractor-tests/generated/type/BuiltinIntegerType/BuiltinIntegerType.ql index 65c78478d15..47e8d4cfe5c 100644 --- a/swift/ql/test/extractor-tests/generated/type/BuiltinIntegerType/BuiltinIntegerType.ql +++ b/swift/ql/test/extractor-tests/generated/type/BuiltinIntegerType/BuiltinIntegerType.ql @@ -4,16 +4,14 @@ import TestUtils query predicate instances( BuiltinIntegerType x, string getName__label, string getName, string getCanonicalType__label, - Type getCanonicalType, string hasWidth__label, string hasWidth + Type getCanonicalType ) { toBeTested(x) and not x.isUnknown() and getName__label = "getName:" and getName = x.getName() and getCanonicalType__label = "getCanonicalType:" and - getCanonicalType = x.getCanonicalType() and - hasWidth__label = "hasWidth:" and - if x.hasWidth() then hasWidth = "yes" else hasWidth = "no" + getCanonicalType = x.getCanonicalType() } query predicate getWidth(BuiltinIntegerType x, int getWidth) { diff --git a/swift/ql/test/extractor-tests/generated/type/OpaqueTypeArchetypeType/OpaqueTypeArchetypeType.expected b/swift/ql/test/extractor-tests/generated/type/OpaqueTypeArchetypeType/OpaqueTypeArchetypeType.expected index c700d4be751..27dbc0ef445 100644 --- a/swift/ql/test/extractor-tests/generated/type/OpaqueTypeArchetypeType/OpaqueTypeArchetypeType.expected +++ b/swift/ql/test/extractor-tests/generated/type/OpaqueTypeArchetypeType/OpaqueTypeArchetypeType.expected @@ -1,8 +1,8 @@ instances -| some Base | getName: | some Base | getCanonicalType: | some Base | getInterfaceType: | \u03c4_1_0 | hasSuperclass: | yes | getNumberOfProtocols: | 0 | getDeclaration: | file://:0:0:0:0 | _ | -| some P | getName: | some P | getCanonicalType: | some P | getInterfaceType: | \u03c4_1_0 | hasSuperclass: | no | getNumberOfProtocols: | 1 | getDeclaration: | file://:0:0:0:0 | _ | -| some P | getName: | some P | getCanonicalType: | some P | getInterfaceType: | \u03c4_1_0 | hasSuperclass: | no | getNumberOfProtocols: | 1 | getDeclaration: | file://:0:0:0:0 | _ | -| some SignedInteger | getName: | some SignedInteger | getCanonicalType: | some SignedInteger | getInterfaceType: | \u03c4_0_0 | hasSuperclass: | no | getNumberOfProtocols: | 1 | getDeclaration: | file://:0:0:0:0 | _ | +| some Base | getName: | some Base | getCanonicalType: | some Base | getInterfaceType: | \u03c4_1_0 | getDeclaration: | file://:0:0:0:0 | _ | +| some P | getName: | some P | getCanonicalType: | some P | getInterfaceType: | \u03c4_1_0 | getDeclaration: | file://:0:0:0:0 | _ | +| some P | getName: | some P | getCanonicalType: | some P | getInterfaceType: | \u03c4_1_0 | getDeclaration: | file://:0:0:0:0 | _ | +| some SignedInteger | getName: | some SignedInteger | getCanonicalType: | some SignedInteger | getInterfaceType: | \u03c4_0_0 | getDeclaration: | file://:0:0:0:0 | _ | getSuperclass | some Base | Base | getProtocol diff --git a/swift/ql/test/extractor-tests/generated/type/OpaqueTypeArchetypeType/OpaqueTypeArchetypeType.ql b/swift/ql/test/extractor-tests/generated/type/OpaqueTypeArchetypeType/OpaqueTypeArchetypeType.ql index 9e5aae9eeba..a3a9f5f8411 100644 --- a/swift/ql/test/extractor-tests/generated/type/OpaqueTypeArchetypeType/OpaqueTypeArchetypeType.ql +++ b/swift/ql/test/extractor-tests/generated/type/OpaqueTypeArchetypeType/OpaqueTypeArchetypeType.ql @@ -5,8 +5,7 @@ import TestUtils query predicate instances( OpaqueTypeArchetypeType x, string getName__label, string getName, string getCanonicalType__label, Type getCanonicalType, string getInterfaceType__label, Type getInterfaceType, - string hasSuperclass__label, string hasSuperclass, string getNumberOfProtocols__label, - int getNumberOfProtocols, string getDeclaration__label, OpaqueTypeDecl getDeclaration + string getDeclaration__label, OpaqueTypeDecl getDeclaration ) { toBeTested(x) and not x.isUnknown() and @@ -16,10 +15,6 @@ query predicate instances( getCanonicalType = x.getCanonicalType() and getInterfaceType__label = "getInterfaceType:" and getInterfaceType = x.getInterfaceType() and - hasSuperclass__label = "hasSuperclass:" and - (if x.hasSuperclass() then hasSuperclass = "yes" else hasSuperclass = "no") and - getNumberOfProtocols__label = "getNumberOfProtocols:" and - getNumberOfProtocols = x.getNumberOfProtocols() and getDeclaration__label = "getDeclaration:" and getDeclaration = x.getDeclaration() } diff --git a/swift/ql/test/extractor-tests/generated/type/OpenedArchetypeType/OpenedArchetypeType.expected b/swift/ql/test/extractor-tests/generated/type/OpenedArchetypeType/OpenedArchetypeType.expected index 88adae3da25..3400ffa5fdc 100644 --- a/swift/ql/test/extractor-tests/generated/type/OpenedArchetypeType/OpenedArchetypeType.expected +++ b/swift/ql/test/extractor-tests/generated/type/OpenedArchetypeType/OpenedArchetypeType.expected @@ -1,5 +1,5 @@ instances -| any C & P1 & P2 | getName: | any C & P1 & P2 | getCanonicalType: | any C & P1 & P2 | getInterfaceType: | \u03c4_0_0 | hasSuperclass: | yes | getNumberOfProtocols: | 2 | +| any C & P1 & P2 | getName: | any C & P1 & P2 | getCanonicalType: | any C & P1 & P2 | getInterfaceType: | \u03c4_0_0 | getSuperclass | any C & P1 & P2 | C | getProtocol diff --git a/swift/ql/test/extractor-tests/generated/type/OpenedArchetypeType/OpenedArchetypeType.ql b/swift/ql/test/extractor-tests/generated/type/OpenedArchetypeType/OpenedArchetypeType.ql index c17fe10d5a4..2d5f19580a7 100644 --- a/swift/ql/test/extractor-tests/generated/type/OpenedArchetypeType/OpenedArchetypeType.ql +++ b/swift/ql/test/extractor-tests/generated/type/OpenedArchetypeType/OpenedArchetypeType.ql @@ -4,9 +4,7 @@ import TestUtils query predicate instances( OpenedArchetypeType x, string getName__label, string getName, string getCanonicalType__label, - Type getCanonicalType, string getInterfaceType__label, Type getInterfaceType, - string hasSuperclass__label, string hasSuperclass, string getNumberOfProtocols__label, - int getNumberOfProtocols + Type getCanonicalType, string getInterfaceType__label, Type getInterfaceType ) { toBeTested(x) and not x.isUnknown() and @@ -15,11 +13,7 @@ query predicate instances( getCanonicalType__label = "getCanonicalType:" and getCanonicalType = x.getCanonicalType() and getInterfaceType__label = "getInterfaceType:" and - getInterfaceType = x.getInterfaceType() and - hasSuperclass__label = "hasSuperclass:" and - (if x.hasSuperclass() then hasSuperclass = "yes" else hasSuperclass = "no") and - getNumberOfProtocols__label = "getNumberOfProtocols:" and - getNumberOfProtocols = x.getNumberOfProtocols() + getInterfaceType = x.getInterfaceType() } query predicate getSuperclass(OpenedArchetypeType x, Type getSuperclass) { diff --git a/swift/ql/test/extractor-tests/generated/type/PackType/ElementArchetypeType.expected b/swift/ql/test/extractor-tests/generated/type/PackType/ElementArchetypeType.expected index 4b4b7087b89..de765f97081 100644 --- a/swift/ql/test/extractor-tests/generated/type/PackType/ElementArchetypeType.expected +++ b/swift/ql/test/extractor-tests/generated/type/PackType/ElementArchetypeType.expected @@ -1,5 +1,5 @@ instances -| \u03c4_1_0 | getName: | \u03c4_1_0 | getCanonicalType: | \u03c4_1_0 | getInterfaceType: | \u03c4_1_0 | hasSuperclass: | no | getNumberOfProtocols: | 2 | +| \u03c4_1_0 | getName: | \u03c4_1_0 | getCanonicalType: | \u03c4_1_0 | getInterfaceType: | \u03c4_1_0 | getSuperclass getProtocol | \u03c4_1_0 | 0 | file://:0:0:0:0 | Copyable | diff --git a/swift/ql/test/extractor-tests/generated/type/PackType/ElementArchetypeType.ql b/swift/ql/test/extractor-tests/generated/type/PackType/ElementArchetypeType.ql index 25aff50f211..fb8b5e0f02e 100644 --- a/swift/ql/test/extractor-tests/generated/type/PackType/ElementArchetypeType.ql +++ b/swift/ql/test/extractor-tests/generated/type/PackType/ElementArchetypeType.ql @@ -4,9 +4,7 @@ import TestUtils query predicate instances( ElementArchetypeType x, string getName__label, string getName, string getCanonicalType__label, - Type getCanonicalType, string getInterfaceType__label, Type getInterfaceType, - string hasSuperclass__label, string hasSuperclass, string getNumberOfProtocols__label, - int getNumberOfProtocols + Type getCanonicalType, string getInterfaceType__label, Type getInterfaceType ) { toBeTested(x) and not x.isUnknown() and @@ -15,11 +13,7 @@ query predicate instances( getCanonicalType__label = "getCanonicalType:" and getCanonicalType = x.getCanonicalType() and getInterfaceType__label = "getInterfaceType:" and - getInterfaceType = x.getInterfaceType() and - hasSuperclass__label = "hasSuperclass:" and - (if x.hasSuperclass() then hasSuperclass = "yes" else hasSuperclass = "no") and - getNumberOfProtocols__label = "getNumberOfProtocols:" and - getNumberOfProtocols = x.getNumberOfProtocols() + getInterfaceType = x.getInterfaceType() } query predicate getSuperclass(ElementArchetypeType x, Type getSuperclass) { diff --git a/swift/ql/test/extractor-tests/generated/type/PackType/PackArchetypeType.expected b/swift/ql/test/extractor-tests/generated/type/PackType/PackArchetypeType.expected index 3bfdff36c41..564700dd68d 100644 --- a/swift/ql/test/extractor-tests/generated/type/PackType/PackArchetypeType.expected +++ b/swift/ql/test/extractor-tests/generated/type/PackType/PackArchetypeType.expected @@ -1,6 +1,6 @@ instances -| each Arg | getName: | each Arg | getCanonicalType: | each Arg | getInterfaceType: | each Arg | hasSuperclass: | no | getNumberOfProtocols: | 2 | -| each T | getName: | each T | getCanonicalType: | each T | getInterfaceType: | each T | hasSuperclass: | no | getNumberOfProtocols: | 2 | +| each Arg | getName: | each Arg | getCanonicalType: | each Arg | getInterfaceType: | each Arg | +| each T | getName: | each T | getCanonicalType: | each T | getInterfaceType: | each T | getSuperclass getProtocol | each Arg | 0 | file://:0:0:0:0 | Copyable | diff --git a/swift/ql/test/extractor-tests/generated/type/PackType/PackArchetypeType.ql b/swift/ql/test/extractor-tests/generated/type/PackType/PackArchetypeType.ql index 279d7f1bba0..e66b73e0f77 100644 --- a/swift/ql/test/extractor-tests/generated/type/PackType/PackArchetypeType.ql +++ b/swift/ql/test/extractor-tests/generated/type/PackType/PackArchetypeType.ql @@ -4,9 +4,7 @@ import TestUtils query predicate instances( PackArchetypeType x, string getName__label, string getName, string getCanonicalType__label, - Type getCanonicalType, string getInterfaceType__label, Type getInterfaceType, - string hasSuperclass__label, string hasSuperclass, string getNumberOfProtocols__label, - int getNumberOfProtocols + Type getCanonicalType, string getInterfaceType__label, Type getInterfaceType ) { toBeTested(x) and not x.isUnknown() and @@ -15,11 +13,7 @@ query predicate instances( getCanonicalType__label = "getCanonicalType:" and getCanonicalType = x.getCanonicalType() and getInterfaceType__label = "getInterfaceType:" and - getInterfaceType = x.getInterfaceType() and - hasSuperclass__label = "hasSuperclass:" and - (if x.hasSuperclass() then hasSuperclass = "yes" else hasSuperclass = "no") and - getNumberOfProtocols__label = "getNumberOfProtocols:" and - getNumberOfProtocols = x.getNumberOfProtocols() + getInterfaceType = x.getInterfaceType() } query predicate getSuperclass(PackArchetypeType x, Type getSuperclass) { diff --git a/swift/ql/test/extractor-tests/generated/type/PackType/PackType.expected b/swift/ql/test/extractor-tests/generated/type/PackType/PackType.expected index 17c5639053f..96fc0c165bb 100644 --- a/swift/ql/test/extractor-tests/generated/type/PackType/PackType.expected +++ b/swift/ql/test/extractor-tests/generated/type/PackType/PackType.expected @@ -1,5 +1,5 @@ instances -| Pack{String, Int} | getName: | Pack{String, Int} | getCanonicalType: | Pack{String, Int} | getNumberOfElements: | 2 | +| Pack{String, Int} | getName: | Pack{String, Int} | getCanonicalType: | Pack{String, Int} | getElement | Pack{String, Int} | 0 | String | | Pack{String, Int} | 1 | Int | diff --git a/swift/ql/test/extractor-tests/generated/type/PackType/PackType.ql b/swift/ql/test/extractor-tests/generated/type/PackType/PackType.ql index 26a787908f6..bbdd989ed59 100644 --- a/swift/ql/test/extractor-tests/generated/type/PackType/PackType.ql +++ b/swift/ql/test/extractor-tests/generated/type/PackType/PackType.ql @@ -4,16 +4,14 @@ import TestUtils query predicate instances( PackType x, string getName__label, string getName, string getCanonicalType__label, - Type getCanonicalType, string getNumberOfElements__label, int getNumberOfElements + Type getCanonicalType ) { toBeTested(x) and not x.isUnknown() and getName__label = "getName:" and getName = x.getName() and getCanonicalType__label = "getCanonicalType:" and - getCanonicalType = x.getCanonicalType() and - getNumberOfElements__label = "getNumberOfElements:" and - getNumberOfElements = x.getNumberOfElements() + getCanonicalType = x.getCanonicalType() } query predicate getElement(PackType x, int index, Type getElement) { diff --git a/swift/ql/test/extractor-tests/generated/type/ParameterizedProtocolType/ParameterizedProtocolType.expected b/swift/ql/test/extractor-tests/generated/type/ParameterizedProtocolType/ParameterizedProtocolType.expected index efc7ef07fa2..71292b2a41d 100644 --- a/swift/ql/test/extractor-tests/generated/type/ParameterizedProtocolType/ParameterizedProtocolType.expected +++ b/swift/ql/test/extractor-tests/generated/type/ParameterizedProtocolType/ParameterizedProtocolType.expected @@ -1,21 +1,21 @@ instances -| P | getName: | P | getCanonicalType: | P | getBase: | P | getNumberOfArgs: | 2 | -| RawRepresentable | getName: | RawRepresentable | getCanonicalType: | RawRepresentable | getBase: | RawRepresentable | getNumberOfArgs: | 1 | -| RawRepresentable | getName: | RawRepresentable | getCanonicalType: | RawRepresentable | getBase: | RawRepresentable | getNumberOfArgs: | 1 | -| RawRepresentable | getName: | RawRepresentable | getCanonicalType: | RawRepresentable | getBase: | RawRepresentable | getNumberOfArgs: | 1 | -| RawRepresentable | getName: | RawRepresentable | getCanonicalType: | RawRepresentable | getBase: | RawRepresentable | getNumberOfArgs: | 1 | -| RawRepresentable | getName: | RawRepresentable | getCanonicalType: | RawRepresentable | getBase: | RawRepresentable | getNumberOfArgs: | 1 | -| RawRepresentable | getName: | RawRepresentable | getCanonicalType: | RawRepresentable | getBase: | RawRepresentable | getNumberOfArgs: | 1 | -| RawRepresentable | getName: | RawRepresentable | getCanonicalType: | RawRepresentable | getBase: | RawRepresentable | getNumberOfArgs: | 1 | -| RawRepresentable | getName: | RawRepresentable | getCanonicalType: | RawRepresentable | getBase: | RawRepresentable | getNumberOfArgs: | 1 | -| RawRepresentable | getName: | RawRepresentable | getCanonicalType: | RawRepresentable | getBase: | RawRepresentable | getNumberOfArgs: | 1 | -| RawRepresentable | getName: | RawRepresentable | getCanonicalType: | RawRepresentable | getBase: | RawRepresentable | getNumberOfArgs: | 1 | -| RawRepresentable | getName: | RawRepresentable | getCanonicalType: | RawRepresentable | getBase: | RawRepresentable | getNumberOfArgs: | 1 | -| RawRepresentable | getName: | RawRepresentable | getCanonicalType: | RawRepresentable | getBase: | RawRepresentable | getNumberOfArgs: | 1 | -| RawRepresentable | getName: | RawRepresentable | getCanonicalType: | RawRepresentable | getBase: | RawRepresentable | getNumberOfArgs: | 1 | -| RawRepresentable | getName: | RawRepresentable | getCanonicalType: | RawRepresentable | getBase: | RawRepresentable | getNumberOfArgs: | 1 | -| RawRepresentable | getName: | RawRepresentable | getCanonicalType: | RawRepresentable | getBase: | RawRepresentable | getNumberOfArgs: | 1 | -| RawRepresentable | getName: | RawRepresentable | getCanonicalType: | RawRepresentable | getBase: | RawRepresentable | getNumberOfArgs: | 1 | +| P | getName: | P | getCanonicalType: | P | getBase: | P | +| RawRepresentable | getName: | RawRepresentable | getCanonicalType: | RawRepresentable | getBase: | RawRepresentable | +| RawRepresentable | getName: | RawRepresentable | getCanonicalType: | RawRepresentable | getBase: | RawRepresentable | +| RawRepresentable | getName: | RawRepresentable | getCanonicalType: | RawRepresentable | getBase: | RawRepresentable | +| RawRepresentable | getName: | RawRepresentable | getCanonicalType: | RawRepresentable | getBase: | RawRepresentable | +| RawRepresentable | getName: | RawRepresentable | getCanonicalType: | RawRepresentable | getBase: | RawRepresentable | +| RawRepresentable | getName: | RawRepresentable | getCanonicalType: | RawRepresentable | getBase: | RawRepresentable | +| RawRepresentable | getName: | RawRepresentable | getCanonicalType: | RawRepresentable | getBase: | RawRepresentable | +| RawRepresentable | getName: | RawRepresentable | getCanonicalType: | RawRepresentable | getBase: | RawRepresentable | +| RawRepresentable | getName: | RawRepresentable | getCanonicalType: | RawRepresentable | getBase: | RawRepresentable | +| RawRepresentable | getName: | RawRepresentable | getCanonicalType: | RawRepresentable | getBase: | RawRepresentable | +| RawRepresentable | getName: | RawRepresentable | getCanonicalType: | RawRepresentable | getBase: | RawRepresentable | +| RawRepresentable | getName: | RawRepresentable | getCanonicalType: | RawRepresentable | getBase: | RawRepresentable | +| RawRepresentable | getName: | RawRepresentable | getCanonicalType: | RawRepresentable | getBase: | RawRepresentable | +| RawRepresentable | getName: | RawRepresentable | getCanonicalType: | RawRepresentable | getBase: | RawRepresentable | +| RawRepresentable | getName: | RawRepresentable | getCanonicalType: | RawRepresentable | getBase: | RawRepresentable | +| RawRepresentable | getName: | RawRepresentable | getCanonicalType: | RawRepresentable | getBase: | RawRepresentable | getArg | P | 0 | Int | | P | 1 | String | diff --git a/swift/ql/test/extractor-tests/generated/type/ParameterizedProtocolType/ParameterizedProtocolType.ql b/swift/ql/test/extractor-tests/generated/type/ParameterizedProtocolType/ParameterizedProtocolType.ql index 7bbf5794693..839b1aa9c92 100644 --- a/swift/ql/test/extractor-tests/generated/type/ParameterizedProtocolType/ParameterizedProtocolType.ql +++ b/swift/ql/test/extractor-tests/generated/type/ParameterizedProtocolType/ParameterizedProtocolType.ql @@ -4,8 +4,7 @@ import TestUtils query predicate instances( ParameterizedProtocolType x, string getName__label, string getName, - string getCanonicalType__label, Type getCanonicalType, string getBase__label, - ProtocolType getBase, string getNumberOfArgs__label, int getNumberOfArgs + string getCanonicalType__label, Type getCanonicalType, string getBase__label, ProtocolType getBase ) { toBeTested(x) and not x.isUnknown() and @@ -14,9 +13,7 @@ query predicate instances( getCanonicalType__label = "getCanonicalType:" and getCanonicalType = x.getCanonicalType() and getBase__label = "getBase:" and - getBase = x.getBase() and - getNumberOfArgs__label = "getNumberOfArgs:" and - getNumberOfArgs = x.getNumberOfArgs() + getBase = x.getBase() } query predicate getArg(ParameterizedProtocolType x, int index, Type getArg) { diff --git a/swift/ql/test/extractor-tests/generated/type/PrimaryArchetypeType/PrimaryArchetypeType.expected b/swift/ql/test/extractor-tests/generated/type/PrimaryArchetypeType/PrimaryArchetypeType.expected index 1382d4439e2..6874035ae54 100644 --- a/swift/ql/test/extractor-tests/generated/type/PrimaryArchetypeType/PrimaryArchetypeType.expected +++ b/swift/ql/test/extractor-tests/generated/type/PrimaryArchetypeType/PrimaryArchetypeType.expected @@ -1,12 +1,12 @@ instances -| Base | getName: | Base | getCanonicalType: | Base | getInterfaceType: | Base | hasSuperclass: | no | getNumberOfProtocols: | 1 | -| Base | getName: | Base | getCanonicalType: | Base | getInterfaceType: | Base | hasSuperclass: | no | getNumberOfProtocols: | 1 | -| Base | getName: | Base | getCanonicalType: | Base | getInterfaceType: | Base | hasSuperclass: | yes | getNumberOfProtocols: | 0 | -| Base | getName: | Base | getCanonicalType: | Base | getInterfaceType: | Base | hasSuperclass: | yes | getNumberOfProtocols: | 0 | -| Param | getName: | Param | getCanonicalType: | Param | getInterfaceType: | Param | hasSuperclass: | no | getNumberOfProtocols: | 2 | -| ParamWithProtocols | getName: | ParamWithProtocols | getCanonicalType: | ParamWithProtocols | getInterfaceType: | ParamWithProtocols | hasSuperclass: | no | getNumberOfProtocols: | 2 | -| ParamWithSuperclass | getName: | ParamWithSuperclass | getCanonicalType: | ParamWithSuperclass | getInterfaceType: | ParamWithSuperclass | hasSuperclass: | yes | getNumberOfProtocols: | 0 | -| ParamWithSuperclassAndProtocols | getName: | ParamWithSuperclassAndProtocols | getCanonicalType: | ParamWithSuperclassAndProtocols | getInterfaceType: | ParamWithSuperclassAndProtocols | hasSuperclass: | yes | getNumberOfProtocols: | 2 | +| Base | getName: | Base | getCanonicalType: | Base | getInterfaceType: | Base | +| Base | getName: | Base | getCanonicalType: | Base | getInterfaceType: | Base | +| Base | getName: | Base | getCanonicalType: | Base | getInterfaceType: | Base | +| Base | getName: | Base | getCanonicalType: | Base | getInterfaceType: | Base | +| Param | getName: | Param | getCanonicalType: | Param | getInterfaceType: | Param | +| ParamWithProtocols | getName: | ParamWithProtocols | getCanonicalType: | ParamWithProtocols | getInterfaceType: | ParamWithProtocols | +| ParamWithSuperclass | getName: | ParamWithSuperclass | getCanonicalType: | ParamWithSuperclass | getInterfaceType: | ParamWithSuperclass | +| ParamWithSuperclassAndProtocols | getName: | ParamWithSuperclassAndProtocols | getCanonicalType: | ParamWithSuperclassAndProtocols | getInterfaceType: | ParamWithSuperclassAndProtocols | getSuperclass | Base | S | | Base | S2 | diff --git a/swift/ql/test/extractor-tests/generated/type/PrimaryArchetypeType/PrimaryArchetypeType.ql b/swift/ql/test/extractor-tests/generated/type/PrimaryArchetypeType/PrimaryArchetypeType.ql index f91f41253e9..4d9ff951f79 100644 --- a/swift/ql/test/extractor-tests/generated/type/PrimaryArchetypeType/PrimaryArchetypeType.ql +++ b/swift/ql/test/extractor-tests/generated/type/PrimaryArchetypeType/PrimaryArchetypeType.ql @@ -4,9 +4,7 @@ import TestUtils query predicate instances( PrimaryArchetypeType x, string getName__label, string getName, string getCanonicalType__label, - Type getCanonicalType, string getInterfaceType__label, Type getInterfaceType, - string hasSuperclass__label, string hasSuperclass, string getNumberOfProtocols__label, - int getNumberOfProtocols + Type getCanonicalType, string getInterfaceType__label, Type getInterfaceType ) { toBeTested(x) and not x.isUnknown() and @@ -15,11 +13,7 @@ query predicate instances( getCanonicalType__label = "getCanonicalType:" and getCanonicalType = x.getCanonicalType() and getInterfaceType__label = "getInterfaceType:" and - getInterfaceType = x.getInterfaceType() and - hasSuperclass__label = "hasSuperclass:" and - (if x.hasSuperclass() then hasSuperclass = "yes" else hasSuperclass = "no") and - getNumberOfProtocols__label = "getNumberOfProtocols:" and - getNumberOfProtocols = x.getNumberOfProtocols() + getInterfaceType = x.getInterfaceType() } query predicate getSuperclass(PrimaryArchetypeType x, Type getSuperclass) { diff --git a/swift/ql/test/extractor-tests/generated/type/ProtocolCompositionType/ProtocolCompositionType.expected b/swift/ql/test/extractor-tests/generated/type/ProtocolCompositionType/ProtocolCompositionType.expected index 41ed05fc067..869e4caeb26 100644 --- a/swift/ql/test/extractor-tests/generated/type/ProtocolCompositionType/ProtocolCompositionType.expected +++ b/swift/ql/test/extractor-tests/generated/type/ProtocolCompositionType/ProtocolCompositionType.expected @@ -1,7 +1,7 @@ instances -| P1 & P2 & P3 | getName: | P1 & P2 & P3 | getCanonicalType: | P1 & P2 & P3 | getNumberOfMembers: | 3 | -| P1 & P23 | getName: | P1 & P23 | getCanonicalType: | P1 & P2 & P3 | getNumberOfMembers: | 2 | -| P2 & P4 | getName: | P2 & P4 | getCanonicalType: | P2 & P4 | getNumberOfMembers: | 2 | +| P1 & P2 & P3 | getName: | P1 & P2 & P3 | getCanonicalType: | P1 & P2 & P3 | +| P1 & P23 | getName: | P1 & P23 | getCanonicalType: | P1 & P2 & P3 | +| P2 & P4 | getName: | P2 & P4 | getCanonicalType: | P2 & P4 | getMember | P1 & P2 & P3 | 0 | P1 | | P1 & P2 & P3 | 1 | P2 | diff --git a/swift/ql/test/extractor-tests/generated/type/ProtocolCompositionType/ProtocolCompositionType.ql b/swift/ql/test/extractor-tests/generated/type/ProtocolCompositionType/ProtocolCompositionType.ql index 8513b85251e..6e27ea1d9a1 100644 --- a/swift/ql/test/extractor-tests/generated/type/ProtocolCompositionType/ProtocolCompositionType.ql +++ b/swift/ql/test/extractor-tests/generated/type/ProtocolCompositionType/ProtocolCompositionType.ql @@ -4,16 +4,14 @@ import TestUtils query predicate instances( ProtocolCompositionType x, string getName__label, string getName, string getCanonicalType__label, - Type getCanonicalType, string getNumberOfMembers__label, int getNumberOfMembers + Type getCanonicalType ) { toBeTested(x) and not x.isUnknown() and getName__label = "getName:" and getName = x.getName() and getCanonicalType__label = "getCanonicalType:" and - getCanonicalType = x.getCanonicalType() and - getNumberOfMembers__label = "getNumberOfMembers:" and - getNumberOfMembers = x.getNumberOfMembers() + getCanonicalType = x.getCanonicalType() } query predicate getMember(ProtocolCompositionType x, int index, Type getMember) { diff --git a/swift/ql/test/extractor-tests/generated/type/TupleType/TupleType.expected b/swift/ql/test/extractor-tests/generated/type/TupleType/TupleType.expected index 13d906d36c2..1e2b58f226d 100644 --- a/swift/ql/test/extractor-tests/generated/type/TupleType/TupleType.expected +++ b/swift/ql/test/extractor-tests/generated/type/TupleType/TupleType.expected @@ -1,10 +1,10 @@ instances -| (Builtin.IntLiteral, Builtin.IntLiteral) | getName: | (IntLiteral, IntLiteral) | getCanonicalType: | (Builtin.IntLiteral, Builtin.IntLiteral) | getNumberOfTypes: | 2 | -| (Builtin.IntLiteral, Builtin.IntLiteral) | getName: | (IntLiteral, IntLiteral) | getCanonicalType: | (Builtin.IntLiteral, Builtin.IntLiteral) | getNumberOfTypes: | 2 | -| (Int, Int, Int, Int, Int) | getName: | (Int, Int, Int, Int, Int) | getCanonicalType: | (Int, Int, Int, Int, Int) | getNumberOfTypes: | 5 | -| (Int, String, Double) | getName: | (Int, String, Double) | getCanonicalType: | (Int, String, Double) | getNumberOfTypes: | 3 | -| (Int, s: String, Double) | getName: | (Int, s: String, Double) | getCanonicalType: | (Int, s: String, Double) | getNumberOfTypes: | 3 | -| (x: Int, y: Int) | getName: | (x: Int, y: Int) | getCanonicalType: | (x: Int, y: Int) | getNumberOfTypes: | 2 | +| (Builtin.IntLiteral, Builtin.IntLiteral) | getName: | (IntLiteral, IntLiteral) | getCanonicalType: | (Builtin.IntLiteral, Builtin.IntLiteral) | +| (Builtin.IntLiteral, Builtin.IntLiteral) | getName: | (IntLiteral, IntLiteral) | getCanonicalType: | (Builtin.IntLiteral, Builtin.IntLiteral) | +| (Int, Int, Int, Int, Int) | getName: | (Int, Int, Int, Int, Int) | getCanonicalType: | (Int, Int, Int, Int, Int) | +| (Int, String, Double) | getName: | (Int, String, Double) | getCanonicalType: | (Int, String, Double) | +| (Int, s: String, Double) | getName: | (Int, s: String, Double) | getCanonicalType: | (Int, s: String, Double) | +| (x: Int, y: Int) | getName: | (x: Int, y: Int) | getCanonicalType: | (x: Int, y: Int) | getType | (Builtin.IntLiteral, Builtin.IntLiteral) | 0 | Builtin.IntLiteral | | (Builtin.IntLiteral, Builtin.IntLiteral) | 0 | Builtin.IntLiteral | diff --git a/swift/ql/test/extractor-tests/generated/type/TupleType/TupleType.ql b/swift/ql/test/extractor-tests/generated/type/TupleType/TupleType.ql index f03c545171e..9d301e217a4 100644 --- a/swift/ql/test/extractor-tests/generated/type/TupleType/TupleType.ql +++ b/swift/ql/test/extractor-tests/generated/type/TupleType/TupleType.ql @@ -4,16 +4,14 @@ import TestUtils query predicate instances( TupleType x, string getName__label, string getName, string getCanonicalType__label, - Type getCanonicalType, string getNumberOfTypes__label, int getNumberOfTypes + Type getCanonicalType ) { toBeTested(x) and not x.isUnknown() and getName__label = "getName:" and getName = x.getName() and getCanonicalType__label = "getCanonicalType:" and - getCanonicalType = x.getCanonicalType() and - getNumberOfTypes__label = "getNumberOfTypes:" and - getNumberOfTypes = x.getNumberOfTypes() + getCanonicalType = x.getCanonicalType() } query predicate getType(TupleType x, int index, Type getType) {