Update for Xcode6-beta4 (Swift 1.2) & improve compilation speed by explicitly declaring argument type (while creating expressionSignal).

Author: inamiy

Cartfile

@@ -1 +1 @@
-github "ReactKit/ReactKit" ~> 0.8.0
+github "ReactKit/ReactKit" "swift/1.2" #~> 0.8.0

Cartfile.private

@@ -1,2 +1,2 @@
-github "Quick/Quick" ~> 0.2.2
-github "Quick/Nimble" ~> 0.3.0
+github "Quick/Quick" #~> 0.2.2
+github "Quick/Nimble" #~> 0.3.0

Cartfile.resolved

@@ -1,4 +1,4 @@
-github "Quick/Nimble" "v0.3.1"
-github "Quick/Quick" "v0.2.2"
-github "ReactKit/SwiftTask" "2.6.4"
-github "ReactKit/ReactKit" "0.8.0"
+github "Quick/Nimble" "v0.4.1"
+github "Quick/Quick" "v0.3.0"
+github "ReactKit/SwiftTask" "585a97f0e6c2a3c5817b3c603b65aeb6db4667c2"
+github "ReactKit/ReactKit" "63d5fae4466cbedbc9cb5f0669d04b76c5c48298"

Carthage/Checkouts/Nimble

@@ -20,20 +20,6 @@
                ReferencedContainer = "container:ReactKitCalculator.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "1F97819C1A94984600A7D656"
-               BuildableName = "ReactKitCalculator-OSXTests.xctest"
-               BlueprintName = "ReactKitCalculator-OSXTests"
-               ReferencedContainer = "container:ReactKitCalculator.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
@@ -46,9 +32,9 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "1F97819C1A94984600A7D656"
-               BuildableName = "ReactKitCalculator-OSXTests.xctest"
-               BlueprintName = "ReactKitCalculator-OSXTests"
+               BlueprintIdentifier = "1F9781B01A9498AD00A7D656"
+               BuildableName = "ReactKitCalculatorTests.xctest"
+               BlueprintName = "ReactKitCalculatorTests"
                ReferencedContainer = "container:ReactKitCalculator.xcodeproj">
             </BuildableReference>
          </TestableReference>

Carthage/Checkouts/Quick

@@ -12,7 +12,7 @@ import ReactKit
 /// mimics iOS's Calculator.app
 public class Calculator
 {
-    public enum Key: NSString
+    public enum Key: String
     {
         case Num0 = "0", Num1 = "1", Num2 = "2", Num3 = "3", Num4 = "4", Num5 = "5", Num6 = "6", Num7 = "7", Num8 = "8", Num9 = "9"
         case Point = "."
@@ -256,15 +256,15 @@ public class Calculator
         /// - [t = 7] "4"
         /// - [t = 8] (none)
         ///
-        let numBuildSignal: Signal<NSString?> =
+        let numBuildSignal: Signal<String?> =
             mergedKeySignal
-                .mapAccumulate(nil) { (accumulatedString, newKey) -> NSString? in
+                .mapAccumulate(nil) { (accumulatedString, newKey) -> String? in
 
                     let acc = (accumulatedString ?? Key.Num0.rawValue)
 
                     switch newKey {
                         case .Point:
-                            if acc.containsString(Key.Point.rawValue) {
+                            if acc.rangeOfString(Key.Point.rawValue) != nil {
                                 return acc    // don't add another `.Point` if already exists
                             }
                             else {
@@ -280,7 +280,7 @@ public class Calculator
                                 return newKey.rawValue  // e.g. "0" then "1" will be "1"
                             }
                             else {
-                                return (accumulatedString ?? "")  + newKey.rawValue // e.g. "12" then "3" will be "123"
+                                return (accumulatedString ?? "") + newKey.rawValue // e.g. "12" then "3" will be "123"
                             }
 
                         case .PlusMinus:
@@ -289,15 +289,15 @@ public class Calculator
 
                             // string-based toggling of prefixed "-"
                             if acc.hasPrefix(Key.Minus.rawValue) {
-                                return acc.substringFromIndex(1)
+                                return acc.substringFromIndex(advance(acc.startIndex, 1))
                             }
                             else {
                                 return Key.Minus.rawValue + acc
                             }
 
                         // NOTE: this unaryKey will not contain `.PlusMinus` as `case .PlusMinus` is declared above
                         case let unaryKey where contains(Key.unaryOperators(), unaryKey):
-                            return newKey.evaluate(acc.doubleValue).calculatorString
+                            return newKey.evaluate((acc as NSString).doubleValue).calculatorString
 
                         // comment-out: don't send "0" because it will confuse with `Key.Num0` input
 //                        case .Clear:
@@ -314,7 +314,7 @@ public class Calculator
 
         let numTokenSignal: Signal<_Token> =
             numBuildSignal
-                .map { _Token.Number($0!.doubleValue) }
+                .map { _Token.Number(($0! as NSString).doubleValue) }
 
         let operatorKeyTokenSignal: Signal<_Token> =
             mergedKeySignal
@@ -360,7 +360,7 @@ public class Calculator
 
                                     case .Clear:
                                         _b.clear()
-                                        _b.addNumber(Key.Num0.rawValue.doubleValue)
+                                        _b.addNumber((Key.Num0.rawValue as NSString).doubleValue)
 
                                     case .AllClear:
                                         _b.allClear()
@@ -489,7 +489,12 @@ public class Calculator
 
         self.expressionSignal =
             bufferingTokensSignal
-                .map { tokens in tokens.reduce("") { $0 + ($1.number?.calculatorString ?? $1.operatorKey?.rawValue ?? "") + " " } }
+                .map { (tokens: [_Token]) in
+                    // NOTE: explicitly declare `acc` & `token` type, or Swift compiler will take too much time for compiling
+                    return tokens.reduce("") { (acc: String, token: _Token) -> String in
+                        return acc + (token.number?.calculatorString ?? token.operatorKey?.rawValue ?? "") + " "
+                    }
+                }
                 .peek { println("expressionSignal ---> \($0)") }
     }
 

Carthage/Checkouts/ReactKit

@@ -61,11 +61,11 @@ func _scientificNotation(num: Double) -> ScientificNotation
 /// - inf -> "inf"
 /// - NaN -> "nan"
 ///
-func _calculatorString(_ num: Double? = nil, raw numString: NSString? = nil, rtrims rtrimsSuffixedPointAndZeros: Bool = true) -> String
+func _calculatorString(_ num: Double? = nil, raw numString: String? = nil, rtrims rtrimsSuffixedPointAndZeros: Bool = true) -> String
 {
     precondition(num != nil || numString != nil, "Either `num` or `numString` must be non-nil.")
 
-    let num = num ?? numString!.doubleValue
+    let num = num ?? (numString! as NSString).doubleValue
 
     // return "inf" or "nan" if needed
     if !num.isFinite { return "\(num)" }
@@ -75,7 +75,7 @@ func _calculatorString(_ num: Double? = nil, raw numString: NSString? = nil, rtr
     let shouldShowNegativeExponent = (num > -1 && num < 1 && exponent <= -MIN_EXPONENT)
     let shouldShowPositiveExponent = ((num > 1 || num < -1) && exponent >= MIN_EXPONENT)
 
-    var string: NSString
+    var string: String
 
     // add exponent, e.g. 1.2345678e+9
     if shouldShowPositiveExponent || shouldShowNegativeExponent {
@@ -92,8 +92,8 @@ func _calculatorString(_ num: Double? = nil, raw numString: NSString? = nil, rtr
         else {
             string = _rtrimFloatString(significand.calculatorString)
 
-            if string.length > SIGNIFICAND_DIGIT + 1 {  // +1 for `.Point`
-                string = string.substringToIndex(SIGNIFICAND_DIGIT + 1)
+            if count(string) > SIGNIFICAND_DIGIT + 1 {  // +1 for `.Point`
+                string = string.substringToIndex(advance(string.startIndex, SIGNIFICAND_DIGIT + 1))
             }
 
             // append exponent
@@ -110,7 +110,7 @@ func _calculatorString(_ num: Double? = nil, raw numString: NSString? = nil, rtr
     }
     // add commas for integer-part
     else {
-        let numString = numString ?? NSString(format: "%0.\(MIN_EXPONENT)f", num)
+        let numString = numString ?? (NSString(format: "%0.\(MIN_EXPONENT)f", num) as String)
         string = _commaString(numString)
 
         if rtrimsSuffixedPointAndZeros {
@@ -122,56 +122,56 @@ func _calculatorString(_ num: Double? = nil, raw numString: NSString? = nil, rtr
 }
 
 /// e.g. "12345.67000" -> "12,345.67000" (used for number with non-exponent only)
-func _commaString(var string: NSString) -> String
+func _commaString(var string: String) -> String
 {
     // split by `.Point`
     let splittedStrings = string.componentsSeparatedByString(Calculator.Key.Point.rawValue)
-    if let integerString = splittedStrings.first as? String {
+    if let integerString = splittedStrings.first {
 
         var integerCharacters = Array(integerString)
         let isNegative = integerString.hasPrefix(Calculator.Key.Minus.rawValue)
 
         // insert commas
-        for var i = countElements(integerCharacters) - 3; i > (isNegative ? 1 : 0); i -= 3 {
+        for var i = count(integerCharacters) - 3; i > (isNegative ? 1 : 0); i -= 3 {
             integerCharacters.insert(Character(COMMA_SEPARATOR), atIndex: i)
         }
 
         string = String(integerCharacters)
 
         if splittedStrings.count == 2 {
             // append `.Point` & decimal-part
-            string = string + (Calculator.Key.Point.rawValue as String) + (splittedStrings.last! as String)
+            string = string + Calculator.Key.Point.rawValue + splittedStrings.last!
         }
     }
 
     var nonNumberCount = 0
-    for char in string as String {
+    for char in string {
         if char == Character(COMMA_SEPARATOR) || char == Character(Calculator.Key.Point.rawValue) {
             nonNumberCount++
         }
     }
 
     // limit to MAX_DIGIT_FOR_NONEXPONENT considering non-number characters
-    if string.length > MAX_DIGIT_FOR_NONEXPONENT + nonNumberCount {
-        string = string.substringToIndex(MAX_DIGIT_FOR_NONEXPONENT + nonNumberCount)
+    if count(string) > MAX_DIGIT_FOR_NONEXPONENT + nonNumberCount {
+        string = string.substringToIndex(advance(string.startIndex, MAX_DIGIT_FOR_NONEXPONENT + nonNumberCount))
     }
 
     return string
 }
 
 /// e.g. "123.000" -> "123"
-func _rtrimFloatString(var string: NSString) -> String
+func _rtrimFloatString(var string: String) -> String
 {
     // trim floating zeros, e.g. `123.000` -> `123.`
-    if string.containsString(Calculator.Key.Point.rawValue) {
+    if string.rangeOfString(Calculator.Key.Point.rawValue) != nil {
         while string.hasSuffix(Calculator.Key.Num0.rawValue) {
-            string = string.substringToIndex(string.length-1)
+            string = string.substringToIndex(advance(string.startIndex, count(string)-1))
         }
     }
 
     // trim suffix `.Point` if needed, e.g. `123.` -> `123`
     if string.hasSuffix(Calculator.Key.Point.rawValue) {
-        string = string.substringToIndex(string.length-1)
+        string = string.substringToIndex(advance(string.startIndex, count(string)-1))
     }
 
     return string

Carthage/Checkouts/SwiftTask

@@ -24,7 +24,7 @@ class ExpressionSpec: QuickSpec
             p = _Peripheral()
 
             calculator = Calculator { mapper in
-                let signal = KVO.signal(p, "input").map { $0 as NSString? } //.asSignal(NSString?)
+                let signal = KVO.signal(p, "input").map { $0 as? NSString } //.asSignal(NSString?)
 
                 for key in Calculator.Key.allKeys() {
                     mapper[key] = signal.filter { $0 == key.rawValue }.map { _ -> Void in } //.asSignal(Void)

ReactKitCalculator.xcodeproj/xcshareddata/xcschemes/ReactKitCalculator-OSX.xcscheme

@@ -24,7 +24,7 @@ class OutputSpec: QuickSpec
             p = _Peripheral()
 
             calculator = Calculator { mapper in
-                let signal = KVO.signal(p, "input").map { $0 as NSString? } //.asSignal(NSString?)
+                let signal = KVO.signal(p, "input").map { $0 as? NSString } //.asSignal(NSString?)
 
                 for key in Calculator.Key.allKeys() {
                     mapper[key] = signal.filter { $0 == key.rawValue }.map { _ -> Void in } //.asSignal(Void)
@@ -288,10 +288,10 @@ class OutputSpec: QuickSpec
                 expect(p.output!).to(equal("3"))
 
                 p.input = "="
-                expect(p.output!).to(beginWith("0.666"))
+                expect(p.output!).to(contain("0.666"))    //.to(beginWith("0.666"))
 
                 p.input = "="
-                expect(p.output!).to(beginWith("0.222"))
+                expect(p.output!).to(contain("0.222"))    //.to(beginWith("0.222"))
 
             }
         }