Fixed dot notation being too aggressive, and removed it from variadic…

… subscripts
orlandos-nl · Dec 10, 2016 · 15714e7 · 15714e7
1 parent aabad31
commit 15714e7
Showing 1 changed file with 5 additions and 26 deletions.
diff --git a/Sources/Document+Subscripts.swift b/Sources/Document+Subscripts.swift
@@ -14,35 +14,23 @@ extension Document {
         get {
             guard let meta = getMeta(forKeyBytes: [UInt8](key.utf8)) else {
                 // use dot syntax
-                var parts = key.components(separatedBy: ".")
+                let parts = key.components(separatedBy: ".")
 
                 guard parts.count >= 2 else {
                     return .nothing
                 }
 
-                let firstPart = parts.removeFirst()
-
-                var value: Value = self[firstPart]
-                while !parts.isEmpty {
-                    let part = parts.removeFirst()
-
-                    value = value[part]
-                }
-
-                return value
+                return self[parts]
             }
 
             return getValue(atDataPosition: meta.dataPosition, withType: meta.type)
         }
 
         set {
-            let parts = key.characters.split(separator: ".", maxSplits: 1, omittingEmptySubsequences: false)
+            let parts = key.components(separatedBy: ".")
 
-            if parts.count == 2 {
-                let firstPart = String(parts[0])
-                let secondPart = String(parts[1])
-
-                self[firstPart][secondPart] = newValue
+            if parts.count > 1 {
+                self[parts] = newValue
                 return
             }
 
@@ -108,15 +96,6 @@ extension Document {
         set {
             if parts.count == 1 {
                 let key = parts[0]
-                let parts = key.characters.split(separator: ".", maxSplits: 1, omittingEmptySubsequences: false)
-
-                if parts.count == 2 {
-                    let firstPart = String(parts[0])
-                    let secondPart = String(parts[1])
-
-                    self[firstPart][secondPart] = newValue
-                    return
-                }
 
                 if let meta = getMeta(forKeyBytes: [UInt8](key.utf8)) {
                     let len = getLengthOfElement(withDataPosition: meta.dataPosition, type: meta.type)