Merge pull request #471 from robinmaisch/R

Fix to R frontend

jplag.frontend.rlang/src/main/java/de/jplag/R/JplagRListener.java → jplag.frontend.rlang/src/main/java/de/jplag/rlang/JplagRListener.java

@@ -1,8 +1,8 @@
-package de.jplag.R;
+package de.jplag.rlang;
 
 import org.antlr.v4.runtime.Token;
 
-import de.jplag.R.grammar.*;
+import de.jplag.rlang.grammar.*;
 
 /**
  * Listener class for visiting the R ANTLR parse tree. Transforms the visited ANTLR token into JPlag tokens. Based on an

jplag.frontend.rlang/src/main/java/de/jplag/R/Language.java → jplag.frontend.rlang/src/main/java/de/jplag/rlang/Language.java

@@ -1,4 +1,4 @@
-package de.jplag.R;
+package de.jplag.rlang;
 
 import java.io.File;
 

jplag.frontend.rlang/src/main/java/de/jplag/R/RCombinedBaseListener.java → jplag.frontend.rlang/src/main/java/de/jplag/rlang/RCombinedBaseListener.java

@@ -1,10 +1,10 @@
-package de.jplag.R;
+package de.jplag.rlang;
 
 import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.tree.ErrorNode;
 import org.antlr.v4.runtime.tree.TerminalNode;
 
-import de.jplag.R.grammar.*;
+import de.jplag.rlang.grammar.*;
 
 /**
  * Empty base implementation for {@link RListener} and {@link RFilterListener}.

jplag.frontend.rlang/src/main/java/de/jplag/R/RParserAdapter.java → jplag.frontend.rlang/src/main/java/de/jplag/rlang/RParserAdapter.java

@@ -1,4 +1,4 @@
-package de.jplag.R;
+package de.jplag.rlang;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -12,10 +12,10 @@ import org.antlr.v4.runtime.tree.ParseTreeWalker;
 
 import de.jplag.AbstractParser;
 import de.jplag.ErrorConsumer;
-import de.jplag.R.grammar.RFilter;
-import de.jplag.R.grammar.RLexer;
-import de.jplag.R.grammar.RParser;
 import de.jplag.TokenList;
+import de.jplag.rlang.grammar.RFilter;
+import de.jplag.rlang.grammar.RLexer;
+import de.jplag.rlang.grammar.RParser;
 
 /**
  * This class sets up the lexer and parser generated by ANTLR4, feeds the submissions through them and passes the

jplag.frontend.rlang/src/main/java/de/jplag/R/RToken.java → jplag.frontend.rlang/src/main/java/de/jplag/rlang/RToken.java

@@ -1,4 +1,4 @@
-package de.jplag.R;
+package de.jplag.rlang;
 
 /**
  * This class represents the occurrence of an R Token in the source code. Based on an R frontend for JPlag v2.15 by Olmo

jplag.frontend.rlang/src/main/java/de/jplag/R/RTokenConstants.java → jplag.frontend.rlang/src/main/java/de/jplag/rlang/RTokenConstants.java

@@ -1,4 +1,4 @@
-package de.jplag.R;
+package de.jplag.rlang;
 
 import de.jplag.TokenConstants;
 

jplag.frontend.rlang/src/test/java/de/jplag/R/RFrontendTest.java → jplag.frontend.rlang/src/test/java/de/jplag/rlang/RFrontendTest.java

@@ -1,4 +1,4 @@
-package de.jplag.R;
+package de.jplag.rlang;
 
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.fail;
@@ -36,7 +36,7 @@ public class RFrontendTest {
 
     private final Logger logger = LoggerFactory.getLogger("R frontend test");
     private final String[] testFiles = new String[] {"Game.R", COMPLETE_TEST_FILE};
-    private final File testFileLocation = Path.of("src", "test", "resources", "de", "jplag", "R").toFile();
+    private final File testFileLocation = Path.of("src", "test", "resources", "de", "jplag", "rlang").toFile();
     private Language language;
 
     @BeforeEach

jplag/src/test/java/de/jplag/special/TokenPrinterTest.java

@@ -43,6 +43,15 @@ public class TokenPrinterTest extends TestBase {
         });
     }
 
+    @Disabled
+    @Test
+    public void printRLangFiles() {
+        printSubmissions(options -> {
+            options.setLanguageOption(LanguageOption.R_LANG);
+            options.setMinimumTokenMatch(MIN_TOKEN_MATCH); // for printing also allow small files
+        });
+    }
+
     private void printSubmissions(Consumer<JPlagOptions> optionsCustomization) {
         try {
             JPlagResult result = runJPlag(PRINTER_FOLDER, optionsCustomization);