Introduce more Swift components

Parsimmon/Example/ClassifierViewController.m

@@ -7,7 +7,6 @@
 //
 
 #import "ClassifierViewController.h"
-#import "Parsimmon.h"
 #import "Parsimmon-Swift.h"
 
 @interface ClassifierViewController ()

Parsimmon/Example/TaggerViewController.m

@@ -7,13 +7,13 @@
 //
 
 #import "TaggerViewController.h"
-#import "Parsimmon.h"
+#import "Parsimmon-Swift.h"
 
 @interface TaggerViewController ()
 @property (weak, nonatomic) IBOutlet UITextField *inputTextField;
 @property (weak, nonatomic) IBOutlet UITextView *outputTextView;
 
-@property (strong, nonatomic) ParsimmonTagger *tagger;
+@property (strong, nonatomic) Tagger *tagger;
 @end
 
 @implementation TaggerViewController
@@ -22,7 +22,7 @@ - (void)viewDidLoad
 {
     [super viewDidLoad];
 	// Do any additional setup after loading the view, typically from a nib.
-    self.tagger = [[ParsimmonTagger alloc] init];
+    self.tagger = [[Tagger alloc] init];
 
     UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(dismissKeyboard)];
     [self.view addGestureRecognizer:tap];

Parsimmon/Parsimmon/Analyzer.swift

@@ -0,0 +1,34 @@
+//
+//  Enumerator.swift
+//  Parsimmon
+//
+//  Created by Jordan Kay on 2/19/15.
+//
+//
+
+import Foundation
+
+typealias Pair = (String, String)
+
+protocol Analyzer {
+    var seed: Seed { get }
+    var scheme: String { get }
+}
+
+internal func analyze(analyzer: Analyzer, text: String, options: NSLinguisticTaggerOptions?) -> [Pair] {
+    var pairs: [Pair] = []
+
+    let range = NSRange(location: 0, length: count(text))
+    let options = options ?? analyzer.seed.linguisticTaggerOptions
+    let tagger = analyzer.seed.linguisticTaggerWithOptions(options)
+
+    tagger.string = text
+    tagger.enumerateTagsInRange(range, scheme: analyzer.scheme, options: options) { (tag: String?, tokenRange, range, stop) in
+        if let tag = tag {
+            let token = (text as NSString).substringWithRange(tokenRange)
+            let pair = (token, tag)
+            pairs.append(pair)
+        }
+    }
+    return pairs
+}

Parsimmon/Parsimmon/ParsimmonTagger.h → Parsimmon/Parsimmon/Lemmatizer.swift

@@ -1,17 +1,17 @@
-// ParsimmonTagger.h
-// 
-// Copyright (c) 2013 Ayaka Nonaka
+// Tokenizer.swift
+//
+// Copyright (c) 2015 Ayaka Nonaka
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // in the Software without restriction, including without limitation the rights
 // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 // copies of the Software, and to permit persons to whom the Software is
 // furnished to do so, subject to the following conditions:
-// 
+//
 // The above copyright notice and this permission notice shall be included in
 // all copies or substantial portions of the Software.
-// 
+//
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -20,24 +20,28 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#import <Foundation/Foundation.h>
-#import "ParsimmonSeed.h"
+import Foundation
+
+public class Lemmatizer: NSObject, Analyzer {
+    let seed: Seed
+
+    var scheme: String {
+        return NSLinguisticTagSchemeLemma
+    }
 
-@interface ParsimmonTagger : ParsimmonSeed
+    init(seed: Seed = Seed()) {
+        self.seed = seed
+    }
 
-/**
- Returns the tagged tokens for the input text, omitting any whitespace, punctuation, and other symbols.
- @param text The text to tag
- @return The tagged tokens
- */
-- (NSArray *)tagWordsInText:(NSString *)text;
+    override convenience init() {
+        self.init(seed: Seed())
+    }
 
-/**
- Returns the tagged tokens for the input text using the specified linguistic tagger options.
- @param text Text to tag
- @param options Linguistic tagger options
- @return The tagged tokens
- */
-- (NSArray *)tagText:(NSString *)text options:(NSLinguisticTaggerOptions)options;
+    func lemmatizeWordsInText(text: String) -> [String] {
+        return lemmatizeText(text, options: nil)
+    }
 
-@end
+    func lemmatizeText(text: String, options: NSLinguisticTaggerOptions?) -> [String] {
+        return analyze(self, text, options).map { (token, lemma) in lemma }
+    }
+}

Parsimmon/Parsimmon/NaiveBayesClassifier.swift

@@ -45,19 +45,19 @@ public class NaiveBayesClassifier: NSObject {
     public typealias Word = String
     public typealias Category = String
 
-    private let tokenizer: ParsimmonTokenizer
+    private let tokenizer: Tokenizer
 
     private var categoryOccurrences: [Category: Int] = [:]
     private var wordOccurrences: [Word: [Category: Int]] = [:]
     private var trainingCount = 0
     private var wordCount = 0
 
-    public init(tokenizer: ParsimmonTokenizer) {
+    public init(tokenizer: Tokenizer) {
         self.tokenizer = tokenizer
     }
 
     public convenience override init() {
-        self.init(tokenizer: ParsimmonTokenizer())
+        self.init(tokenizer: Tokenizer())
     }
 
     // MARK: - Training

Parsimmon/Parsimmon/Parsimmon-Bridging-Header.h

@@ -1 +0,0 @@
-#import "ParsimmonSeed.h"