Change end of file token representation to EOF.

jplag.frontend.cpp/src/main/java/de/jplag/cpp/CPPToken.java

@@ -15,7 +15,7 @@ public class CPPToken extends Token implements CPPTokenConstants {
     protected String type2string() {
         switch (type) {
             case CPPTokenConstants.FILE_END:
-                return "********";
+                return "EOF";
 
             case C_BLOCK_BEGIN:
                 return "BLOCK{";
@@ -141,7 +141,7 @@ public class CPPToken extends Token implements CPPTokenConstants {
                 return "NULL";
 
             default:
-                return "<UNKNOWN>";
+                return "<UNKNOWN" + type + ">";
         }
     }
 }

jplag.frontend.cpp/src/main/javacc/CPP.jj

@@ -26,7 +26,7 @@ import de.jplag.cpp.NewlineStream;
 public class CPPScanner implements CPPTokenConstants {
     private static Scanner scanner2;
 
-    public static boolean scanFile(File dir, String fileName, de.jplag.cpp.CPPScanner scanner, de.jplag.cpp.Scanner scannerX) {
+    public static boolean scanFile(File dir, String fileName, CPPScanner scanner, Scanner scannerX) {
         try {
             InputStream in = new NewlineStream(new FileInputStream(new File(dir, fileName)));
             if (scanner == null) {

jplag.frontend.csharp-1.2/src/main/java/de/jplag/csharp/CSharpToken.java

@@ -11,7 +11,7 @@ public class CSharpToken extends Token implements CSharpTokenConstants {
     protected String type2string() {
         switch (type) {
             case CSharpTokenConstants.FILE_END:
-                return "**********";
+                return "EOF";
             case _INVOCATION:
                 return "INVOCATION";
             case _OBJECT_CREATION:

jplag.frontend.java/src/main/java/de/jplag/java/JavaToken.java

@@ -12,7 +12,7 @@ public class JavaToken extends Token implements JavaTokenConstants {
     protected String type2string() {
         switch (type) {
             case JavaTokenConstants.FILE_END:
-                return "********";
+                return "EOF";
             case JavaTokenConstants.SEPARATOR_TOKEN:
                 return "METHOD_SEPARATOR";
             case J_PACKAGE:
@@ -146,8 +146,8 @@ public class JavaToken extends Token implements JavaTokenConstants {
                 return "TRY_RES";
 
             default:
-                System.err.println("*UNKNOWN: " + type);
-                return "*UNKNOWN" + type;
+                System.err.println("UNKNOWN: " + type);
+                return "<UNKNOWN" + type + ">";
         }
     }
 }

jplag.frontend.java/src/main/java/de/jplag/java/JavacAdapter.java

@@ -23,10 +23,11 @@ public class JavacAdapter {
 
     private static final JavaCompiler javac = ToolProvider.getSystemJavaCompiler();
 
-    public int parseFiles(File dir, File[] pathedFiles, final Parser parser) {
-        final StandardJavaFileManager jfm = javac.getStandardFileManager(null, null, StandardCharsets.UTF_8);
+    public int parseFiles(File directory, File[] pathedFiles, final Parser parser) {
+        final StandardJavaFileManager fileManager = javac.getStandardFileManager(null, null, StandardCharsets.UTF_8);
         DiagnosticCollector<? super JavaFileObject> diagListen = new DiagnosticCollector<>();
-        final JavaCompiler.CompilationTask task = javac.getTask(null, jfm, diagListen, null, null, jfm.getJavaFileObjects(pathedFiles));
+        final JavaCompiler.CompilationTask task = javac.getTask(null, fileManager, diagListen, null, null,
+                fileManager.getJavaFileObjects(pathedFiles));
         Iterable<? extends CompilationUnitTree> asts = Collections.emptyList();
         try {
             asts = ((JavacTask) task).parse();
@@ -37,10 +38,10 @@ public class JavacAdapter {
         final SourcePositions positions = trees.getSourcePositions();
         for (final CompilationUnitTree ast : asts) {
             final String filename;
-            if (dir == null)
+            if (directory == null)
                 filename = ast.getSourceFile().getName();
             else {
-                filename = Paths.get(dir.toURI()).relativize(Paths.get(ast.getSourceFile().toUri())).toString();
+                filename = Paths.get(directory.toURI()).relativize(Paths.get(ast.getSourceFile().toUri())).toString();
             }
             final LineMap map = ast.getLineMap();
             ast.accept(new TokenGeneratingTreeScanner(filename, parser, map, positions, ast), null);

jplag.frontend.python-3/src/main/java/de/jplag/python3/Python3Token.java

@@ -11,7 +11,7 @@ public class Python3Token extends Token implements Python3TokenConstants {
     protected String type2string() {
         switch (type) {
             case Python3TokenConstants.FILE_END:
-                return "********";
+                return "EOF";
             case Python3TokenConstants.SEPARATOR_TOKEN:
                 return "METHOD_SEPARATOR";
 

jplag.frontend.scheme/src/main/java/de/jplag/scheme/Parser.java

@@ -5,7 +5,7 @@ import java.io.File;
 import de.jplag.AbstractParser;
 import de.jplag.TokenList;
 
-public class Parser extends AbstractParser{
+public class Parser extends AbstractParser {
     private String currentFile;
 
     private TokenList tokens;

jplag.frontend.scheme/src/main/java/de/jplag/scheme/SchemeToken.java

@@ -15,7 +15,7 @@ public class SchemeToken extends Token implements SchemeTokenConstants {
     protected String type2string() {
         switch (type) {
             case SchemeTokenConstants.FILE_END:
-                return "********";
+                return "EOF";
             case S_BOOL:
                 return "BOOL    ";
             case S_NUMBER: