Bridging: Bridge swift::SourceRange directly

Author: AnthonyLatsis

include/swift/AST/ASTBridging.h

@@ -317,29 +317,6 @@ class BridgedOStream {
 
 BridgedOStream Bridged_dbgs();
 
-//===----------------------------------------------------------------------===//
-// MARK: SourceRange
-//===----------------------------------------------------------------------===//
-
-class BridgedSourceRange {
-public:
-  SWIFT_NAME("start")
-  swift::SourceLoc Start;
-
-  SWIFT_NAME("end")
-  swift::SourceLoc End;
-
-  BridgedSourceRange() : Start(), End() {}
-
-  SWIFT_NAME("init(start:end:)")
-  BridgedSourceRange(swift::SourceLoc start, swift::SourceLoc end)
-      : Start(start), End(end) {}
-
-  BRIDGED_INLINE BridgedSourceRange(swift::SourceRange range);
-
-  BRIDGED_INLINE swift::SourceRange unbridged() const;
-};
-
 //===----------------------------------------------------------------------===//
 // MARK: BridgedCharSourceRange
 //===----------------------------------------------------------------------===//

include/swift/Basic/BasicBridging.h

@@ -38,17 +38,6 @@ llvm::StringRef BridgedStringRef::unbridged() const {
 
 llvm::StringRef BridgedOwnedString::unbridgedRef() const { return llvm::StringRef(Data, Length); }
 
-//===----------------------------------------------------------------------===//
-// MARK: BridgedSourceRange
-//===----------------------------------------------------------------------===//
-
-BridgedSourceRange::BridgedSourceRange(swift::SourceRange range)
-    : Start(range.Start), End(range.End) {}
-
-swift::SourceRange BridgedSourceRange::unbridged() const {
-  return swift::SourceRange(Start, End);
-}
-
 //===----------------------------------------------------------------------===//
 // MARK: BridgedCharSourceRange
 //===----------------------------------------------------------------------===//

include/swift/Basic/BasicBridgingImpl.h

@@ -137,19 +137,24 @@ class SourceLoc {
 #endif // #ifdef NOT_COMPILED_WITH_SWIFT_PURE_BRIDGING_MODE
 };
 
-// Not imported into Swift in pure bridging mode.
-#ifdef NOT_COMPILED_WITH_SWIFT_PURE_BRIDGING_MODE
-
 /// SourceRange in swift is a pair of locations.  However, note that the end
 /// location is the start of the last token in the range, not the last character
 /// in the range.  This is unlike SMRange, so we use a distinct type to make
 /// sure that proper conversions happen where important.
 class SourceRange {
 public:
-  SourceLoc Start, End;
+  SWIFT_NAME("start")
+  SourceLoc Start;
+
+  SWIFT_NAME("end")
+  SourceLoc End;
 
   SourceRange() {}
+
+  SWIFT_NAME("init(start:)")
   SourceRange(SourceLoc Loc) : Start(Loc), End(Loc) {}
+
+  SWIFT_NAME("init(start:end:)")
   SourceRange(SourceLoc Start, SourceLoc End) : Start(Start), End(End) {
     assert(Start.isValid() == End.isValid() &&
            "Start and end should either both be valid or both be invalid!");
@@ -158,6 +163,9 @@ class SourceRange {
   bool isValid() const { return Start.isValid(); }
   bool isInvalid() const { return !isValid(); }
 
+// Not imported into Swift in pure bridging mode.
+#ifdef NOT_COMPILED_WITH_SWIFT_PURE_BRIDGING_MODE
+
   /// An explicit bool operator so one can check if a SourceRange is valid in an
   /// if statement:
   ///
@@ -215,8 +223,12 @@ class SourceRange {
     // Nothing meaningful to print.
   }
 
+#endif // #ifdef NOT_COMPILED_WITH_SWIFT_PURE_BRIDGING_MODE
 };
 
+// Not imported into Swift in pure bridging mode.
+#ifdef NOT_COMPILED_WITH_SWIFT_PURE_BRIDGING_MODE
+
 /// A half-open character-based source range.
 class CharSourceRange {
   SourceLoc Start;

include/swift/Basic/SourceLoc.h

@@ -67,10 +67,9 @@ BridgedAvailabilitySpec_createWildcard(BridgedASTContext cContext,
 
 BridgedAvailabilitySpec BridgedAvailabilitySpec_createForDomainIdentifier(
     BridgedASTContext cContext, Identifier name, SourceLoc loc,
-    BridgedVersionTuple cVersion, BridgedSourceRange cVersionRange) {
-  return AvailabilitySpec::createForDomainIdentifier(cContext.unbridged(), name,
-                                                     loc, cVersion.unbridged(),
-                                                     cVersionRange.unbridged());
+    BridgedVersionTuple cVersion, SourceRange versionRange) {
+  return AvailabilitySpec::createForDomainIdentifier(
+      cContext.unbridged(), name, loc, cVersion.unbridged(), versionRange);
 }
 
 BridgedAvailabilitySpec
@@ -89,7 +88,7 @@ BridgedAvailabilitySpec_getDomainOrIdentifier(BridgedAvailabilitySpec spec) {
   return spec.unbridged()->getDomainOrIdentifier();
 }
 
-BridgedSourceRange
+SourceRange
 BridgedAvailabilitySpec_getSourceRange(BridgedAvailabilitySpec spec) {
   return spec.unbridged()->getSourceRange();
 }
@@ -103,7 +102,7 @@ BridgedAvailabilitySpec_getRawVersion(BridgedAvailabilitySpec spec) {
   return spec.unbridged()->getRawVersion();
 }
 
-BridgedSourceRange
+SourceRange
 BridgedAvailabilitySpec_getVersionRange(BridgedAvailabilitySpec spec) {
   return spec.unbridged()->getVersionSrcRange();
 }