Browse Source

Adapt frontend to interface changes

Robin Maisch 4 years ago
parent
commit
71aedefca2

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

@@ -14,7 +14,6 @@ import org.antlr.v4.runtime.tree.ParseTree;
 import org.antlr.v4.runtime.tree.ParseTreeWalker;
 import org.antlr.v4.runtime.tree.ParseTreeWalker;
 
 
 import de.jplag.AbstractParser;
 import de.jplag.AbstractParser;
-import de.jplag.ErrorConsumer;
 import de.jplag.TokenList;
 import de.jplag.TokenList;
 import de.jplag.golang.grammar.GoLexer;
 import de.jplag.golang.grammar.GoLexer;
 import de.jplag.golang.grammar.GoParser;
 import de.jplag.golang.grammar.GoParser;
@@ -23,10 +22,6 @@ public class GoParserAdapter extends AbstractParser {
     private String currentFile;
     private String currentFile;
     private TokenList tokens;
     private TokenList tokens;
 
 
-    public GoParserAdapter(ErrorConsumer consumer) {
-        super(consumer);
-    }
-
     public TokenList parse(File directory, String[] fileNames) {
     public TokenList parse(File directory, String[] fileNames) {
         tokens = new TokenList();
         tokens = new TokenList();
         for (String file : fileNames) {
         for (String file : fileNames) {
@@ -56,7 +51,7 @@ public class GoParserAdapter extends AbstractParser {
                 treeWalker.walk(listener, parseTree);
                 treeWalker.walk(listener, parseTree);
             }
             }
         } catch (IOException exception) {
         } catch (IOException exception) {
-            getErrorConsumer().addError("Parsing Error in '%s': %s%s".formatted(fileName, File.separator, exception));
+            logger.error("Parsing Error in '%s':".formatted(fileName), exception);
             return false;
             return false;
         }
         }
         return true;
         return true;

+ 4 - 11
jplag.frontend.golang/src/main/java/de/jplag/golang/Language.java

@@ -1,10 +1,9 @@
 package de.jplag.golang;
 package de.jplag.golang;
 
 
-import java.io.File;
-
-import de.jplag.ErrorConsumer;
 import de.jplag.TokenList;
 import de.jplag.TokenList;
 
 
+import java.io.File;
+
 public class Language implements de.jplag.Language {
 public class Language implements de.jplag.Language {
 
 
     private static final String NAME = "Go Parser";
     private static final String NAME = "Go Parser";
@@ -13,8 +12,8 @@ public class Language implements de.jplag.Language {
     private static final String[] FILE_EXTENSIONS = {".go"};
     private static final String[] FILE_EXTENSIONS = {".go"};
     private final GoParserAdapter parserAdapter;
     private final GoParserAdapter parserAdapter;
 
 
-    public Language(ErrorConsumer consumer) {
-        this.parserAdapter = new GoParserAdapter(consumer);
+    public Language() {
+        this.parserAdapter = new GoParserAdapter();
     }
     }
 
 
     @Override
     @Override
@@ -57,12 +56,6 @@ public class Language implements de.jplag.Language {
         return true;
         return true;
     }
     }
 
 
-    @Override
-    public boolean usesIndex() {
-        return false;
-    }
-
-    @Override
     public int numberOfTokens() {
     public int numberOfTokens() {
         return GoTokenConstants.NUM_DIFF_TOKENS;
         return GoTokenConstants.NUM_DIFF_TOKENS;
     }
     }

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

@@ -1,7 +1,14 @@
 package de.jplag.golang;
 package de.jplag.golang;
 
 
-import static de.jplag.golang.grammar.GoTokenUtils.getDummyToken;
-import static org.junit.jupiter.api.Assertions.*;
+import de.jplag.Token;
+import de.jplag.TokenConstants;
+import de.jplag.TokenList;
+import de.jplag.TokenPrinter;
+import de.jplag.golang.grammar.GoTokenUtils;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 import java.io.File;
 import java.io.File;
 import java.io.IOException;
 import java.io.IOException;
@@ -15,17 +22,8 @@ import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import java.util.stream.IntStream;
 import java.util.stream.StreamSupport;
 import java.util.stream.StreamSupport;
 
 
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import de.jplag.Token;
-import de.jplag.TokenConstants;
-import de.jplag.TokenList;
-import de.jplag.TokenPrinter;
-import de.jplag.golang.grammar.GoTokenUtils;
-import de.jplag.testutils.TestErrorConsumer;
+import static de.jplag.golang.grammar.GoTokenUtils.getDummyToken;
+import static org.junit.jupiter.api.Assertions.fail;
 
 
 class GoFrontendTest {
 class GoFrontendTest {
     /**
     /**
@@ -55,8 +53,7 @@ class GoFrontendTest {
 
 
     @BeforeEach
     @BeforeEach
     void setup() {
     void setup() {
-        TestErrorConsumer consumer = new TestErrorConsumer();
-        language = new Language(consumer);
+        language = new Language();
     }
     }
 
 
     @Test
     @Test