Right python parser for method label extraction

src/main/kotlin/astminer/cli/LabelExtractors.kt

@@ -12,7 +12,9 @@ import astminer.parse.antlr.python.PythonMethodSplitter
 import astminer.parse.cpp.FuzzyMethodSplitter
 import astminer.parse.cpp.FuzzyNode
 import astminer.parse.java.GumTreeJavaNode
-import astminer.parse.java.GumTreeMethodSplitter
+import astminer.parse.java.GumTreeJavaMethodSplitter
+import astminer.parse.python.GumTreePythonMethodSplitter
+import astminer.parse.python.GumTreePythonNode
 import java.io.File
 
 
@@ -42,7 +44,8 @@ abstract class FileLabelExtractor : LabelExtractor {
 
 abstract class MethodLabelExtractor(
         open val filterPredicates: Collection<MethodFilterPredicate> = emptyList(),
-        open val javaParser: String = "gumtree"
+        open val javaParser: String = "gumtree",
+        open val pythonParser: String = "antlr"
 ) : LabelExtractor {
 
     override fun toLabeledData(
@@ -61,7 +64,7 @@ abstract class MethodLabelExtractor(
             "java" -> {
                 when (javaParser) {
                     "gumtree" -> {
-                        val methodSplitter = GumTreeMethodSplitter()
+                        val methodSplitter = GumTreeJavaMethodSplitter()
                         methodSplitter.splitIntoMethods(root as GumTreeJavaNode)
                     }
                     "antlr" -> {
@@ -74,8 +77,19 @@ abstract class MethodLabelExtractor(
                 }
             }
             "py" -> {
-                val methodSplitter = PythonMethodSplitter()
-                methodSplitter.splitIntoMethods(root as SimpleNode)
+                when (pythonParser) {
+                    "gumtree" -> {
+                        val methodSplitter = GumTreePythonMethodSplitter()
+                        methodSplitter.splitIntoMethods(root as GumTreePythonNode)
+                    }
+                    "antlr" -> {
+                        val methodSplitter = PythonMethodSplitter()
+                        methodSplitter.splitIntoMethods(root as SimpleNode)
+                    }
+                    else -> {
+                        throw UnsupportedOperationException("Unsupported parser $pythonParser")
+                    }
+                }
             }
             "js" -> {
                 val methodSplitter = JavaScriptMethodSplitter()
@@ -111,8 +125,9 @@ class FolderExtractor : FileLabelExtractor() {
 class MethodNameExtractor(
         val hideMethodNames: Boolean = false,
         override val filterPredicates: Collection<MethodFilterPredicate> = emptyList(),
-        override val javaParser: String = "gumtree"
-) : MethodLabelExtractor(filterPredicates, javaParser) {
+        override val javaParser: String = "gumtree",
+        override val pythonParser: String = "antlr"
+) : MethodLabelExtractor(filterPredicates, javaParser, pythonParser) {
 
     override fun <T : Node> extractLabel(methodInfo: MethodInfo<T>, filePath: String): String? {
         val methodNameNode = methodInfo.method.nameNode ?: return null

src/main/kotlin/astminer/examples/AllJavaMethods.kt

@@ -4,7 +4,7 @@ import astminer.common.model.LabeledPathContexts
 import astminer.common.model.MethodInfo
 import astminer.parse.java.GumTreeJavaNode
 import astminer.parse.java.GumTreeJavaParser
-import astminer.parse.java.GumTreeMethodSplitter
+import astminer.parse.java.GumTreeJavaMethodSplitter
 import astminer.paths.PathMiner
 import astminer.paths.PathRetrievalSettings
 import astminer.paths.CsvPathStorage
@@ -34,7 +34,7 @@ fun allJavaMethods() {
         val fileNode = GumTreeJavaParser().parseInputStream(file.inputStream()) ?: return@forFilesWithSuffix
 
         //extract method nodes
-        val methodNodes = GumTreeMethodSplitter().splitIntoMethods(fileNode)
+        val methodNodes = GumTreeJavaMethodSplitter().splitIntoMethods(fileNode)
 
         methodNodes.forEach { methodInfo ->
             //Retrieve paths from every node individually

src/main/kotlin/astminer/parse/java/GumTreeMethodSplitter.kt → src/main/kotlin/astminer/parse/java/GumTreeJavaMethodSplitter.kt

@@ -5,7 +5,7 @@ import astminer.common.preOrder
 
 private fun GumTreeJavaNode.isTypeNode() = getTypeLabel().endsWith("Type")
 
-class GumTreeMethodSplitter : TreeMethodSplitter<GumTreeJavaNode> {
+class GumTreeJavaMethodSplitter : TreeMethodSplitter<GumTreeJavaNode> {
 
     companion object {
         private object TypeLabels {

src/test/kotlin/astminer/parse/java/GumTreeMethodSplitterTest.kt → src/test/kotlin/astminer/parse/java/GumTreeJavaMethodSplitterTest.kt

@@ -11,10 +11,10 @@ private fun createTree(filename: String): GumTreeJavaNode {
 }
 
 private fun createAndSplitTree(filename: String): Collection<MethodInfo<GumTreeJavaNode>> {
-    return GumTreeMethodSplitter().splitIntoMethods(createTree(filename))
+    return GumTreeJavaMethodSplitter().splitIntoMethods(createTree(filename))
 }
 
-class GumTreeMethodSplitterTest {
+class GumTreeJavaMethodSplitterTest {
     @Test
     fun testMethodExtraction1() {
         val methodInfos = createAndSplitTree("src/test/resources/gumTreeMethodSplitter/1.java")

src/test/kotlin/astminer/parse/python/GumTreeMethodSplitterTest.kt → src/test/kotlin/astminer/parse/python/GumTreeJavaMethodSplitterTest.kt

@@ -6,7 +6,7 @@ import java.io.File
 import kotlin.test.assertEquals
 import kotlin.test.assertNotNull
 
-class GumTreeMethodSplitterTest {
+class GumTreeJavaMethodSplitterTest {
     private fun parse(filename: String): GumTreePythonNode? =
         GumTreePythonParser().parseInputStream(File(filename).inputStream())