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

Make Golang frontends more consistent to others -- continued

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

+ 1 - 1
jplag.frontend.golang/pom.xml

@@ -1,12 +1,12 @@
 <?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>
         <version>${revision}</version>
     </parent>
-
     <artifactId>golang</artifactId>
 
     <dependencies>

+ 1 - 1
jplag.frontend.golang/src/main/java/de/jplag/golang/GoParserAdapter.java

@@ -50,7 +50,7 @@ public class GoParserAdapter extends AbstractParser {
             ParserRuleContext entryContext = parser.sourceFile();
             ParseTreeWalker treeWalker = new ParseTreeWalker();
 
-            GoListener listener = new GoListener(this);
+            JPlagGoListener listener = new JPlagGoListener(this);
             for (int i = 0; i < entryContext.getChildCount(); i++) {
                 ParseTree parseTree = entryContext.getChild(i);
                 treeWalker.walk(listener, parseTree);

+ 2 - 2
jplag.frontend.golang/src/main/java/de/jplag/golang/GoListener.java → jplag.frontend.golang/src/main/java/de/jplag/golang/JPlagGoListener.java

@@ -10,13 +10,13 @@ import org.antlr.v4.runtime.tree.TerminalNode;
 import de.jplag.golang.grammar.GoParser;
 import de.jplag.golang.grammar.GoParserBaseListener;
 
-public class GoListener extends GoParserBaseListener {
+public class JPlagGoListener extends GoParserBaseListener {
 
     public static final int NONE = -1;
     private final GoParserAdapter parserAdapter;
     private final Deque<GoBlockContext> blockContexts;
 
-    public GoListener(GoParserAdapter parserAdapter) {
+    public JPlagGoListener(GoParserAdapter parserAdapter) {
         this.parserAdapter = parserAdapter;
         blockContexts = new LinkedList<>();
     }

+ 1 - 1
jplag.frontend.golang/src/test/java/de/jplag/golang/GoFrontendTest.java

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