Group files

tomkowz · Jul 21, 2015 · f1582e2 · f1582e2
1 parent 5315ca6
commit f1582e2
Show file tree

Hide file tree

Showing 9 changed files with 103 additions and 54 deletions.
diff --git a/Swifternalization.xcodeproj/project.pbxproj b/Swifternalization.xcodeproj/project.pbxproj
diff --git a/Swifternalization/Expression.swift b/Swifternalization/Expression.swift
@@ -8,18 +8,6 @@
 
 import Foundation
 
-/// Supported expression types
-enum ExpressionType: String {
-    /// works on Int only, e.g. `x<5`, `x=3`
-    case Inequality = "ie"
-
-    /// works on Int only, e.g. `4<x<10`, `1<=x<18`
-    case InequalityExtended = "iex"
-
-    /// regular expression, e.g. `[02-9]+`
-    case Regex = "exp"
-}
-
 /// String that contains expression pattern, e.g. `ie:x<5`, `exp:^1$`.
 internal typealias ExpressionPattern = String
 

diff --git a/...ernalization/ExpressionsPatternType.swift → ...ternalization/ExpressionPatternType.swift b/...ernalization/ExpressionsPatternType.swift → ...ternalization/ExpressionPatternType.swift
diff --git a/Swifternalization/ExpressionType.swift b/Swifternalization/ExpressionType.swift
@@ -0,0 +1,21 @@
+//
+//  ExpressionType.swift
+//  Swifternalization
+//
+//  Created by Tomasz Szulc on 21/07/15.
+//  Copyright (c) 2015 Tomasz Szulc. All rights reserved.
+//
+
+import Foundation
+
+/// Supported expression types
+enum ExpressionType: String {
+    /// works on Int only, e.g. `x<5`, `x=3`
+    case Inequality = "ie"
+
+    /// works on Int only, e.g. `4<x<10`, `1<=x<18`
+    case InequalityExtended = "iex"
+
+    /// regular expression, e.g. `[02-9]+`
+    case Regex = "exp"
+}
diff --git a/Swifternalization/KeyValue.swift → Swifternalization/KeyValueType.swift b/Swifternalization/KeyValue.swift → Swifternalization/KeyValueType.swift
@@ -1,5 +1,5 @@
 //
-//  KeyValue.swift
+//  KeyValueType.swift
 //  Swifternalization
 //
 //  Created by Tomasz Szulc on 28/06/15.
@@ -21,7 +21,7 @@ internal typealias KVDict = Dictionary<Key, Value>
 Protocol that defines properties and methods that need to be implemented by
 objects that keeps key-value pair things.
 */
-protocol KeyValue {
+protocol KeyValueType {
     /// A key.
     var key: Key {get set}
 

diff --git a/...ernalization/ProcessableTranslation.swift → ...on/ProcessableTranslationExpression.swift b/...ernalization/ProcessableTranslation.swift → ...on/ProcessableTranslationExpression.swift
@@ -3,7 +3,7 @@ import Foundation
 /** 
 Represents translation which contains expressions that are not processed yet.
 */
-struct ProcessableTranslation: TranslationType, Processable {
+struct ProcessableTranslationExpression: TranslationType, Processable {
     /// Key that identifies translation.
     let key: String
 

diff --git a/Swifternalization/ProcessableTranslationLengthVariationExpression.swift b/Swifternalization/ProcessableTranslationLengthVariationExpression.swift
@@ -3,7 +3,7 @@ import Foundation
 /** 
 Represents translation which contains expressions with length variations.
 */
-struct ProcessableTranslationLengthVariationExpression: TranslationType, Processable {
+struct ProcessableTranslationExpressionLengthVariationExpression: TranslationType, Processable {
     /// Key that identifies translation.
     let key: String
 

diff --git a/Swifternalization/TranslatablePair.swift b/Swifternalization/TranslatablePair.swift
@@ -13,7 +13,7 @@ Represents key-value pair from Localizable.strings files.
 It contains key, value and expression if exists for the key.
 It can also validate if text matches expression's requirements.
 */
-struct TranslatablePair: KeyValue {
+struct TranslatablePair: KeyValueType {
     /// Key from Localizable.strings.
     var key: Key
 

diff --git a/Swifternalization/TranslationsLoader.swift b/Swifternalization/TranslationsLoader.swift
@@ -41,15 +41,15 @@ final class TranslationsLoader: JSONFileLoader {
 
                 case .TranslationWithLoadedExpressions:
                     let expressions = parseExpressions(dictionary as! DictWithStrings)
-                    loadedTranslations.append(ProcessableTranslation(key: translationKey, loadedExpressions: expressions))
+                    loadedTranslations.append(ProcessableTranslationExpression(key: translationKey, loadedExpressions: expressions))
 
                 case .TranslationWithLengthVariationsAndLoadedExpressions:
                     var expressions = [ProcessableLengthVariationExpression]()
                     for (expressionIdentifier, lengthVariationsDict) in dictionary as! DictWithDicts {
                         let variations = parseLengthVariations(lengthVariationsDict)
                         expressions.append(ProcessableLengthVariationExpression(identifier: expressionIdentifier, variations: variations))
                     }
-                    loadedTranslations.append(ProcessableTranslationLengthVariationExpression(key: translationKey, expressions: expressions))
+                    loadedTranslations.append(ProcessableTranslationExpressionLengthVariationExpression(key: translationKey, expressions: expressions))
 
                 case .NotSupported:
                     // Do nothing