properly extract token

bnavetta · Dec 20, 2014 · 02e133b · 02e133b
1 parent f706696
commit 02e133b
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/MacVoikko/CocoaVoikko.m b/MacVoikko/CocoaVoikko.m
@@ -51,9 +51,11 @@ - (void)enumerateTokens:(NSString *)text withBlock:(TokenCallback)callback
 	while(tokenType != TOKEN_NONE)
 	{
 		tokenType = voikkoNextTokenCstr(handle, cText + offset, textLen, &tokenLen);
+		NSRange tokenRange = NSMakeRange(offset, tokenLen);
+		NSString* token = [text substringWithRange:tokenRange];
 
-		NSString* token = [[NSString alloc] initWithBytes:cText + offset length:tokenLen - offset encoding:NSUTF8StringEncoding];
-		BOOL keepGoing = callback(tokenType, token, NSMakeRange(offset, tokenLen));
+//		NSString* token = [[NSString alloc] initWithBytes:cText + offset length:tokenLen - offset encoding:NSUTF8StringEncoding];
+		BOOL keepGoing = callback(tokenType, token, tokenRange);
 
 		offset += tokenLen;
 
@@ -71,7 +73,7 @@ - (int)checkSpelling:(NSString *)word
 
 - (NSRange)nextMisspelledWord:(NSString *)text wordCount:(NSInteger *)wordCount
 {
-	__block NSRange range;
+	__block NSRange range = NSMakeRange(NSNotFound, 0);
 	__block int wc = 0;
 	[self enumerateTokens:text withBlock:^BOOL(enum voikko_token_type tokenType, NSString* token, NSRange tokenLoc) {
 		NSLog(@"Token '%@' of type %d at %@", token, tokenType, NSStringFromRange(tokenLoc));
@@ -81,6 +83,7 @@ - (NSRange)nextMisspelledWord:(NSString *)text wordCount:(NSInteger *)wordCount
 			int spelling = [self checkSpelling:token];
 			if(spelling == VOIKKO_SPELL_FAILED)
 			{
+				NSLog(@"Misspelled word '%@' at %@", token, NSStringFromRange(tokenLoc));
 				range = tokenLoc;
 				return NO;
 			}