all tests passed

Author: mariotaku

SQLite.xcodeproj/project.pbxproj

@@ -1007,6 +1007,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
+				SWIFT_VERSION = 3.0;
 				TVOS_DEPLOYMENT_TARGET = 9.1;
 			};
 			name = Debug;
@@ -1019,6 +1020,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
+				SWIFT_VERSION = 3.0;
 				TVOS_DEPLOYMENT_TARGET = 9.1;
 			};
 			name = Release;
@@ -1040,6 +1042,7 @@
 				PRODUCT_NAME = SQLite;
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = 4;
 				WATCHOS_DEPLOYMENT_TARGET = 2.2;
 			};
@@ -1062,6 +1065,7 @@
 				PRODUCT_NAME = SQLite;
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = 4;
 				WATCHOS_DEPLOYMENT_TARGET = 2.2;
 			};

SQLite/Extensions/FTS4.swift

@@ -148,7 +148,7 @@ extension Connection {
 
             let view = string.utf8
             offset.pointee += string.substring(to: range.lowerBound).utf8.count
-            length.pointee = Int32(view.distance(from: range.lowerBound.samePosition(in: view), to: range.lowerBound.samePosition(in: view)))
+            length.pointee = Int32(view.distance(from: range.lowerBound.samePosition(in: view), to: range.upperBound.samePosition(in: view)))
             return token
         })
     }

SQLiteTests/FTS4Tests.swift

@@ -187,15 +187,15 @@ class FTS4IntegrationTests : SQLiteTestCase {
         let tokenizer = CFStringTokenizerCreate(nil, "" as CFString!, CFRangeMake(0, 0), UInt(kCFStringTokenizerUnitWord), locale)
         try! db.registerTokenizer(tokenizerName) { string in
             CFStringTokenizerSetString(tokenizer, string as CFString, CFRangeMake(0, CFStringGetLength(string as CFString)))
-            if CFStringTokenizerAdvanceToNextToken(tokenizer) == .none {
+            if CFStringTokenizerAdvanceToNextToken(tokenizer).isEmpty {
                 return nil
             }
             let range = CFStringTokenizerGetCurrentTokenRange(tokenizer)
-            let input = CFStringCreateWithSubstring(kCFAllocatorDefault, string as CFString, range)
-            let token = CFStringCreateMutableCopy(nil, range.length, input)
+            let input = CFStringCreateWithSubstring(kCFAllocatorDefault, string as CFString, range)!
+            let token = CFStringCreateMutableCopy(nil, range.length, input)!
             CFStringLowercase(token, locale)
             CFStringTransform(token, nil, kCFStringTransformStripDiacritics, false)
-            return ((token as String?)!, string.range(of: (input as String?)!)!)
+            return (token as String, string.range(of: input as String)!)
         }
 
         _ = try! db.run(emails.create(.FTS4([subject, body], tokenize: .Custom(tokenizerName))))