                 codeKeys[index] = cp1
                 nameVals[index] = name
 
-                if (cp2 != empty) {
-                    var s = String()
-                    s.append(Character(UnicodeScalar(cp1)!))
-                    s.append(Character(UnicodeScalar(cp2)!))
-                    multipoints[name] = s
-                }
-                i = i + 1
+                if cp2 != empty {
+                    var string = String()
+                    string.append(Character(UnicodeScalar(cp1)!))
+                    string.append(Character(UnicodeScalar(cp2)!))
+                    multipoints[name] = string
+                }
+                i += 1
             }
         }
 


            let reader: CharacterReader = CharacterReader(string)

            while (!reader.isEmpty()) {
                // NotNestedLessLess=10913,824;1887

                let name: String = reader.consumeTo("=")

        }

        let codepoint = EscapeMode.extended.codepointForName(name)
        if codepoint != empty {
            codepoints[0] = UnicodeScalar(codepoint)!
            return 1
        }
