Skip to content

Commit 17990d8

Browse files
change return type
1 parent 07732e8 commit 17990d8

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

Boyer-Moore-Horspool/BoyerMooreHorspool.playground/Contents.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
http://www.drdobbs.com/database/faster-string-searches/184408171
1414
*/
1515
extension String {
16-
func index(of pattern: String, usingHorspoolImprovement: Bool = false) -> Int? {
16+
func index(of pattern: String, usingHorspoolImprovement: Bool = false) -> Index? {
1717
// Cache the length of the search pattern because we're going to
1818
// use it a few times and it's expensive to calculate.
1919
let patternLength = pattern.count
@@ -57,7 +57,7 @@ extension String {
5757
if c == lastChar {
5858

5959
// There is a possible match. Do a brute-force search backwards.
60-
if let k = backwards() { return k.encodedOffset }
60+
if let k = backwards() { return k }
6161

6262
if !usingHorspoolImprovement {
6363
// If no match, we can only safely skip one character ahead.

Boyer-Moore-Horspool/BoyerMooreHorspool.playground/timeline.xctimeline

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
version = "3.0">
44
<TimelineItems>
55
<LoggerValueHistoryTimelineItem
6-
documentLocation = "file:///Users/francisco_saldana/Documents/Nearsoft/Open%20source/swift-algorithm-club/Boyer-Moore-Horspool/BoyerMooreHorspool.playground#CharacterRangeLen=0&amp;CharacterRangeLoc=75&amp;EndingColumnNumber=21&amp;EndingLineNumber=2&amp;StartingColumnNumber=21&amp;StartingLineNumber=2&amp;Timestamp=563159867.556089"
6+
documentLocation = "file:///Users/francisco_saldana/Documents/Nearsoft/Open%20source/swift-algorithm-club/Boyer-Moore-Horspool/BoyerMooreHorspool.playground#CharacterRangeLen=0&amp;CharacterRangeLoc=75&amp;EndingColumnNumber=21&amp;EndingLineNumber=2&amp;StartingColumnNumber=21&amp;StartingLineNumber=2&amp;Timestamp=563161016.665907"
77
selectedRepresentationIndex = "0"
88
shouldTrackSuperviewWidth = "NO">
99
</LoggerValueHistoryTimelineItem>
1010
<LoggerValueHistoryTimelineItem
11-
documentLocation = "file:///Users/francisco_saldana/Documents/Nearsoft/Open%20source/swift-algorithm-club/Boyer-Moore-Horspool/BoyerMooreHorspool.playground#CharacterRangeLen=0&amp;CharacterRangeLoc=75&amp;EndingColumnNumber=21&amp;EndingLineNumber=2&amp;StartingColumnNumber=21&amp;StartingLineNumber=2&amp;Timestamp=563159867.5563149"
11+
documentLocation = "file:///Users/francisco_saldana/Documents/Nearsoft/Open%20source/swift-algorithm-club/Boyer-Moore-Horspool/BoyerMooreHorspool.playground#CharacterRangeLen=0&amp;CharacterRangeLoc=75&amp;EndingColumnNumber=21&amp;EndingLineNumber=2&amp;StartingColumnNumber=21&amp;StartingLineNumber=2&amp;Timestamp=563161016.666045"
1212
selectedRepresentationIndex = "0"
1313
shouldTrackSuperviewWidth = "NO">
1414
</LoggerValueHistoryTimelineItem>
1515
<LoggerValueHistoryTimelineItem
16-
documentLocation = "file:///Users/francisco_saldana/Documents/Nearsoft/Open%20source/swift-algorithm-club/Boyer-Moore-Horspool/BoyerMooreHorspool.playground#CharacterRangeLen=0&amp;CharacterRangeLoc=75&amp;EndingColumnNumber=21&amp;EndingLineNumber=2&amp;StartingColumnNumber=21&amp;StartingLineNumber=2&amp;Timestamp=563159867.556504"
16+
documentLocation = "file:///Users/francisco_saldana/Documents/Nearsoft/Open%20source/swift-algorithm-club/Boyer-Moore-Horspool/BoyerMooreHorspool.playground#CharacterRangeLen=0&amp;CharacterRangeLoc=75&amp;EndingColumnNumber=21&amp;EndingLineNumber=2&amp;StartingColumnNumber=21&amp;StartingLineNumber=2&amp;Timestamp=563161016.666169"
1717
selectedRepresentationIndex = "0"
1818
shouldTrackSuperviewWidth = "NO">
1919
</LoggerValueHistoryTimelineItem>

Boyer-Moore-Horspool/BoyerMooreHorspool.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
http://www.drdobbs.com/database/faster-string-searches/184408171
77
*/
88
extension String {
9-
func index(of pattern: String, usingHorspoolImprovement: Bool = false) -> Int? {
9+
func index(of pattern: String, usingHorspoolImprovement: Bool = false) -> Index? {
1010
// Cache the length of the search pattern because we're going to
1111
// use it a few times and it's expensive to calculate.
1212
let patternLength = pattern.count
@@ -50,7 +50,7 @@ extension String {
5050
if c == lastChar {
5151

5252
// There is a possible match. Do a brute-force search backwards.
53-
if let k = backwards() { return k.encodedOffset }
53+
if let k = backwards() { return k }
5454

5555
if !usingHorspoolImprovement {
5656
// If no match, we can only safely skip one character ahead.

0 commit comments

Comments
 (0)