PR changes

angelolloqui · Feb 7, 2019 · 580b604 · 580b604
1 parent 8f617aa
commit 580b604
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 33 deletions.
diff --git a/Assets/Tests/KotlinTokenizer/overrideargs.kt b/Assets/Tests/KotlinTokenizer/overrideargs.kt
@@ -2,4 +2,6 @@
 class Test {
 
     override fun dostuff(x: Int) {}
+
+    fun otherMethod(x: Int = 5) {}
 }
diff --git a/Assets/Tests/KotlinTokenizer/overrideargs.swift b/Assets/Tests/KotlinTokenizer/overrideargs.swift
@@ -1,5 +1,8 @@
 class Test {
-    override func dostuff(x:Int = 5) {
+    override func dostuff(x: Int = 5) {
+    }
+
+    func otherMethod(x: Int = 5) {
     }
 }
 
diff --git a/Sources/SwiftKotlinFramework/KotlinTokenizer.swift b/Sources/SwiftKotlinFramework/KotlinTokenizer.swift
@@ -37,8 +37,8 @@ public class KotlinTokenizer: SwiftTokenizer {
 
         var signatureTokens = tokenize(declaration.signature, node: declaration)
         let bodyTokens = declaration.body.map(tokenize) ?? []
-        
-        if modifierTokens.contains(where:{$0.value == "override" }) {
+
+        if declaration.isOverride {
             // overridden methods can't have default args in kotlin:
             signatureTokens = removeDefaultArgsFromParameters(tokens:signatureTokens)
         }
@@ -1077,39 +1077,39 @@ public class KotlinTokenizer: SwiftTokenizer {
         interpolatedString += remainingText
         return [node.newToken(.string, interpolatedString)]
     }
+
+    // function used to remove default arguments from override functions, since kotlin doesn't have them
+    private func removeDefaultArgsFromParameters(tokens:[Token]) -> [Token] {
+        var newTokens = [Token]()
+        var removing = false
+        var bracket = false
+        for t in tokens {
+            if removing && t.kind == .startOfScope && t.value == "(" {
+                bracket = true
+            }
+            if bracket && t.kind == .endOfScope && t.value == ")" {
+                bracket = false
+                removing = false
+                continue
+            }
+            if t.kind == .symbol && (t.value.contains("=")) {
+                removing = true
+            }
+            if t.kind == .delimiter && t.value.contains(",") {
+                removing = false
+            }
+            if !bracket && removing && t.kind == .endOfScope && t.value == ")" {
+                removing = false
+            }
+            if !removing {
+                newTokens.append(t)
+            }
+        }
+        return newTokens
+    }
 }
 
 public typealias InvertedConditionList = [InvertedCondition]
 public struct InvertedCondition: ASTTokenizable {
     public let condition: Condition
 }
-
-// function used to remove default arguments from override functions, since kotlin doesn't have them
-private func removeDefaultArgsFromParameters(tokens:[Token]) -> [Token] {
-    var newTokens = [Token]()
-    var removing = false
-    var bracket = false
-    for t in tokens {
-        if removing && t.kind == .startOfScope && t.value == "(" {
-            bracket = true
-        }
-        if bracket && t.kind == .endOfScope && t.value == ")" {
-            bracket = false
-            removing = false
-            continue
-        }
-        if t.kind == .symbol && (t.value.contains("=")) {
-            removing = true
-        }
-        if t.kind == .delimiter && t.value.contains(",") {
-            removing = false
-        }
-        if !bracket && removing && t.kind == .endOfScope && t.value == ")" {
-            removing = false
-        }
-        if !removing {
-            newTokens.append(t)
-        }
-    }
-    return newTokens
-}
diff --git a/Sources/SwiftKotlinFramework/utils/AST+Operations.swift b/Sources/SwiftKotlinFramework/utils/AST+Operations.swift
@@ -54,6 +54,9 @@ extension FunctionDeclaration {
     var isStatic: Bool {
         return modifiers.isStatic
     }
+    var isOverride: Bool {
+        return modifiers.isOverride
+    }
 }
 
 extension StructDeclaration.Member {
@@ -118,6 +121,10 @@ extension Collection where Iterator.Element == DeclarationModifier {
     var isLazy: Bool {
         return self.contains(where: { $0.isLazy })
     }
+
+    var isOverride: Bool {
+        return self.contains(where: { $0.isOverride })
+    }
 }
 
 extension DeclarationModifier {
@@ -134,6 +141,13 @@ extension DeclarationModifier {
         default: return false
         }
     }
+
+    var isOverride: Bool {
+        switch self {
+        case .override: return true
+        default: return false
+        }
+    }
 }
 
 extension SuperclassExpression {