Skip to content

Commit f622884

Browse files
committed
ASTBridging: Encapsulate operations on BridgedLayoutConstraint
1 parent 30a8b59 commit f622884

File tree

3 files changed

+24
-32
lines changed

3 files changed

+24
-32
lines changed

include/swift/AST/ASTBridging.h

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2874,6 +2874,22 @@ class BridgedLayoutConstraint {
28742874
SWIFT_UNAVAILABLE("Use the factory methods")
28752875
BRIDGED_INLINE BridgedLayoutConstraint(swift::LayoutConstraint constraint);
28762876

2877+
BRIDGED_INLINE
2878+
SWIFT_COMPUTED_PROPERTY
2879+
bool getIsNull() const;
2880+
2881+
SWIFT_COMPUTED_PROPERTY
2882+
BridgedLayoutConstraintKind getKind() const;
2883+
2884+
BRIDGED_INLINE
2885+
SWIFT_COMPUTED_PROPERTY
2886+
bool getIsKnownLayout() const;
2887+
2888+
BRIDGED_INLINE
2889+
SWIFT_COMPUTED_PROPERTY
2890+
bool getIsTrivial() const;
2891+
2892+
SWIFT_UNAVAILABLE("Unavailable in Swift")
28772893
BRIDGED_INLINE swift::LayoutConstraint unbridged() const;
28782894
};
28792895

@@ -2894,22 +2910,6 @@ BridgedLayoutConstraint_getLayoutConstraint(BridgedASTContext cContext,
28942910
BridgedLayoutConstraintKind cKind,
28952911
size_t size, size_t alignment);
28962912

2897-
SWIFT_NAME("getter:BridgedLayoutConstraint.isNull(self:)")
2898-
BRIDGED_INLINE bool
2899-
BridgedLayoutConstraint_isNull(BridgedLayoutConstraint cConstraint);
2900-
2901-
SWIFT_NAME("getter:BridgedLayoutConstraint.kind(self:)")
2902-
BridgedLayoutConstraintKind
2903-
BridgedLayoutConstraint_getKind(BridgedLayoutConstraint cConstraint);
2904-
2905-
SWIFT_NAME("getter:BridgedLayoutConstraint.isKnownLayout(self:)")
2906-
BRIDGED_INLINE bool
2907-
BridgedLayoutConstraint_isKnownLayout(BridgedLayoutConstraint cConstraint);
2908-
2909-
SWIFT_NAME("getter:BridgedLayoutConstraint.isTrivial(self:)")
2910-
BRIDGED_INLINE bool
2911-
BridgedLayoutConstraint_isTrivial(BridgedLayoutConstraint cConstraint);
2912-
29132913
enum ENUM_EXTENSIBILITY_ATTR(open) BridgedRequirementReprKind : size_t {
29142914
BridgedRequirementReprKindTypeConstraint,
29152915
BridgedRequirementReprKindSameType,

include/swift/AST/ASTBridgingImpl.h

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -735,17 +735,14 @@ swift::LayoutConstraint BridgedLayoutConstraint::unbridged() const {
735735
return raw;
736736
}
737737

738-
bool BridgedLayoutConstraint_isNull(BridgedLayoutConstraint cConstraint) {
739-
return cConstraint.unbridged().isNull();
740-
}
738+
bool BridgedLayoutConstraint::getIsNull() const { return unbridged().isNull(); }
741739

742-
bool BridgedLayoutConstraint_isKnownLayout(
743-
BridgedLayoutConstraint cConstraint) {
744-
return cConstraint.unbridged()->isKnownLayout();
740+
bool BridgedLayoutConstraint::getIsKnownLayout() const {
741+
return unbridged()->isKnownLayout();
745742
}
746743

747-
bool BridgedLayoutConstraint_isTrivial(BridgedLayoutConstraint cConstraint) {
748-
return cConstraint.unbridged()->isTrivial();
744+
bool BridgedLayoutConstraint::getIsTrivial() const {
745+
return unbridged()->isTrivial();
749746
}
750747

751748
//===----------------------------------------------------------------------===//

lib/AST/Bridging/GenericsBridging.cpp

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// This source file is part of the Swift.org open source project
44
//
5-
// Copyright (c) 2022-2024 Apple Inc. and the Swift project authors
5+
// Copyright (c) 2022-2025 Apple Inc. and the Swift project authors
66
// Licensed under Apache License v2.0 with Runtime Library Exception
77
//
88
// See https://swift.org/LICENSE.txt for license information
@@ -217,11 +217,6 @@ BridgedLayoutConstraint_getLayoutConstraint(BridgedASTContext cContext,
217217
alignment, cContext.unbridged());
218218
}
219219

220-
BridgedLayoutConstraint BridgedLayoutConstraint_getUnknownLayout() {
221-
return LayoutConstraint::getUnknownLayout();
222-
}
223-
224-
BridgedLayoutConstraintKind
225-
BridgedLayoutConstraint_getKind(BridgedLayoutConstraint cConstraint) {
226-
return bridge(cConstraint.unbridged()->getKind());
220+
BridgedLayoutConstraintKind BridgedLayoutConstraint::getKind() const {
221+
return bridge(unbridged()->getKind());
227222
}

0 commit comments

Comments
 (0)