Merge pull request #4 from RougeWare/feature/upperBoundIsInclusive

Added `upperBoundIsInclusive` to `RangeWithUpperBound`

README.md

@@ -18,9 +18,9 @@ In Swift's standard library, all the range types conform to `RangeExpression`. H
 
 This package adds more protocols. These, for accessing members of a range generically:
 
-- `RangeProtocol`: A protocol to which all ranges, even `NSRange`, conform
+- `RangeProtocol`: A protocol to which all ranges, even `NSRange`, conform. Also includes info on whether that upper bound is inclusive.
 - `RangeWithLowerBound`: Any range which has a lower bound, such as `a...`, `a..<b`, and `a...b`
-- `RangeWithUpperBound`: Any range which has an upper bound, such as `..<b`, `...b`, `a..<b`, and `a...b`. Also includes info on whether that upper bound is inclusive.
+- `RangeWithUpperBound`: Any range which has an upper bound, such as `..<b`, `...b`, `a..<b`, and `a...b`
 - `RangeWithLowerAndUpperBound`: Any range which has both a lower and an upper bound, such as `a..<b` and `a...b`
 
 And these for creating ranges generically:

Sources/RangeTools/Default conformances.swift

@@ -23,7 +23,9 @@ extension ClosedRange: RangeWithLowerAndUpperBound {
 
 
 
-extension PartialRangeFrom: RangeWithLowerBound {}
+extension PartialRangeFrom: RangeWithLowerBound {
+    public static var upperBoundIsInclusive: Bool { true }
+}
 
 
 

Sources/RangeTools/RangeProtocol.swift

@@ -20,6 +20,10 @@ public protocol RangeProtocol {
 
 
 
+    /// `true` iff the upper bound of this protocol includes the element at its index, like `a...`, `...b`, and `a...b`. `false` indicates that the upper bound does not include that element, like `..<b` and `a..<b`.
+    static var upperBoundIsInclusive: Bool { get }
+
+
     /// Determines whether this range contains the given element
     ///
     /// - Parameter element: The element you want to see if this range contains
@@ -58,9 +62,6 @@ public protocol RangeWithUpperBound: RangeProtocol {
 
     /// The range's upper bound
     var upperBound: Bound { get }
-
-    /// `true` iff the upper bound of this protocol includes the element at its index, like `...b` and `a...b`. `false` indicates that the upper bound does not include that element, like `..<b` and `a..<b`.
-    static var upperBoundIsInclusive: Bool { get }
 }
 
 

Tests/RangeToolsTests/RangeToolsTests.swift

@@ -55,6 +55,7 @@ final class RangeToolsTests: XCTestCase {
 
 
     func test_upperBoundIsInclusive() {
+        XCTAssertTrue (type(of: 5... ).upperBoundIsInclusive)
         XCTAssertFalse(type(of:  ..<7).upperBoundIsInclusive)
         XCTAssertTrue (type(of:  ...7).upperBoundIsInclusive)
         XCTAssertFalse(type(of: 5..<7).upperBoundIsInclusive)