Просмотр исходного кода

Make R and Kotlin frontends more consistent

Robin Maisch 4 лет назад
Родитель
Сommit
1644cd10fc

+ 0 - 2
jplag.frontend.kotlin/pom.xml

@@ -14,8 +14,6 @@
             <groupId>org.antlr</groupId>
             <artifactId>antlr4-runtime</artifactId>
         </dependency>
-
-        <!-- JPlag -->
         <dependency>
             <groupId>de.jplag</groupId>
             <artifactId>frontend-utils</artifactId>

+ 2 - 2
jplag.frontend.kotlin/src/main/java/de/jplag/kotlin/KotlinListener.java → jplag.frontend.kotlin/src/main/java/de/jplag/kotlin/JPlagKotlinListener.java

@@ -10,10 +10,10 @@ import org.antlr.v4.runtime.tree.TerminalNode;
 import de.jplag.kotlin.grammar.KotlinParser;
 import de.jplag.kotlin.grammar.KotlinParserBaseListener;
 
-public class KotlinListener extends KotlinParserBaseListener {
+public class JPlagKotlinListener extends KotlinParserBaseListener {
     private final KotlinParserAdapter parserAdapter;
 
-    public KotlinListener(KotlinParserAdapter parserAdapter) {
+    public JPlagKotlinListener(KotlinParserAdapter parserAdapter) {
         this.parserAdapter = parserAdapter;
     }
 

+ 1 - 1
jplag.frontend.kotlin/src/main/java/de/jplag/kotlin/KotlinParserAdapter.java

@@ -60,7 +60,7 @@ public class KotlinParserAdapter extends AbstractParser {
             ParserRuleContext entryContext = parser.kotlinFile();
             ParseTreeWalker treeWalker = new ParseTreeWalker();
 
-            KotlinListener listener = new KotlinListener(this);
+            JPlagKotlinListener listener = new JPlagKotlinListener(this);
             for (int i = 0; i < entryContext.getChildCount(); i++) {
                 ParseTree parseTree = entryContext.getChild(i);
                 treeWalker.walk(listener, parseTree);

+ 1 - 1
jplag.frontend.kotlin/src/test/java/de/jplag/kotlin/KotlinFrontendTest.java

@@ -77,7 +77,7 @@ class KotlinFrontendTest {
      * Confirms that every type of KotlinToken has a Sting representation associated to it.
      */
     @Test
-    void testToken2String() {
+    void testTokenToString() {
         var missingTokens = IntStream.range(0, language.numberOfTokens())
                 .mapToObj(type -> new KotlinToken(type, NOT_SET_STRING, NOT_SET, NOT_SET, NOT_SET))
                 .filter(token -> token.type2string().contains("UNKNOWN")).toList();

+ 1 - 0
jplag.frontend.rlang/pom.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>de.jplag</groupId>
         <artifactId>aggregator</artifactId>

+ 5 - 4
jplag.frontend.rlang/src/main/java/de/jplag/rlang/Language.java

@@ -10,9 +10,10 @@ import de.jplag.TokenList;
  */
 public class Language implements de.jplag.Language {
 
-    public static final String NAME = "R Parser";
-    public static final String SHORT_NAME = "R";
-    public static final int DEFAULT_MIN_TOKEN_MATCH = 8;
+    private static final String NAME = "R Parser";
+    private static final String SHORT_NAME = "R";
+    private static final int DEFAULT_MIN_TOKEN_MATCH = 8;
+    private static final String[] FILE_EXTENSION = {".R", ".r"};
     private final RParserAdapter parserAdapter;
 
     public Language(ErrorConsumer consumer) {
@@ -21,7 +22,7 @@ public class Language implements de.jplag.Language {
 
     @Override
     public String[] suffixes() {
-        return new String[] {".R", ".r"};
+        return FILE_EXTENSION;
     }
 
     @Override