Clean-up the Java code specified in the frontend grammars.

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

@@ -15,41 +15,41 @@ options
 
 PARSER_BEGIN(CPPScanner)
 package de.jplag.cpp;
-import java.io.*;
-import de.jplag.*;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+
+import de.jplag.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, de.jplag.cpp.CPPScanner scanner, de.jplag.cpp.Scanner scannerX) {
         try {
-            InputStream in = new NewlineStream(
-                new FileInputStream(new File(dir,fileName)));
-              if (scanner==null) {
+            InputStream in = new NewlineStream(new FileInputStream(new File(dir, fileName)));
+            if (scanner == null) {
                 scanner = new CPPScanner(in, "UTF-8");
-              } else {
+            } else {
                 scanner.ReInit(in, "UTF-8");
-              }
-              scanner.scanner2=scannerX;
+            }
+            scanner.scanner2 = scannerX;
         } catch (FileNotFoundException e) {
-              System.out.println("C/C++ Scanner:  File " + fileName + " not found.");
-              return false;
+            System.out.println("C/C++ Scanner:  File " + fileName + " not found.");
+            return false;
         }
         try {
-              scanner.scan();
+            scanner.scan();
         } catch (ParseException e) {
-              scannerX.getErrorConsumer().addError("  Parsing Error in '" + fileName + "':\n  " + e.getMessage());
-              return false;
+            scannerX.getErrorConsumer().addError("  Parsing Error in '" + fileName + "':\n  " + e.getMessage());
+            return false;
         } catch (TokenMgrException e) {
-              scannerX.getErrorConsumer().addError("  Scanning Error in '" + fileName + "':\n  " + e.getMessage());
-              return false;
+            scannerX.getErrorConsumer().addError("  Scanning Error in '" + fileName + "':\n  " + e.getMessage());
+            return false;
         }
         return true;
     }
-
-/*    public static void main(String args[]) {
-        scanFile(new File("."),args[0]);
-    }*/
 }
 PARSER_END(CPPScanner)
 

jplag.frontend.scheme/src/main/javacc/Scheme.jj

@@ -51,50 +51,42 @@ options
 
 PARSER_BEGIN(SchemeParser)
 package de.jplag.scheme;
-import java.io.*;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 
 public class SchemeParser implements SchemeTokenConstants {
     /* used for context in the template production rule */
     private static int templateParam;
-    private de.jplag.scheme.Parser parser2 ;
-    //static SchemeParser parser = null;
+    private Parser parser2;
 
-    public static boolean parseFile(File dir, String fileName,
-        SchemeParser parser, de.jplag.scheme.Parser parserX)
-    {
-        File file=null;
+    public static boolean parseFile(File dir, String fileName, SchemeParser parser, Parser parserX) {
+        File file = null;
         try {
-            FileInputStream in = new FileInputStream(file=new File(dir,fileName));
-            if (parser==null) {
+            FileInputStream in = new FileInputStream(file = new File(dir, fileName));
+            if (parser == null) {
                 parser = new SchemeParser(in, "UTF-8");
             } else {
                 parser.ReInit(in, "UTF-8");
             }
-            parser.parser2=parserX;
+            parser.parser2 = parserX;
         } catch (FileNotFoundException e) {
-            System.out.println("Scheme Parser R4RS:  File " + fileName +
-                " not found.");
+            System.out.println("Scheme Parser R4RS:  File " + fileName + " not found.");
             return false;
         }
         try {
             parser.Program();
         } catch (ParseException e) {
-            parserX.getErrorConsumer().addError("  Parsing Error in '" + fileName
-                + "':\n  " + e.getMessage() + "\n");
+            parserX.getErrorConsumer().addError("  Parsing Error in '" + fileName + "':\n  " + e.getMessage() + "\n");
             return false;
         } catch (TokenMgrException e) {
-            parserX.getErrorConsumer().addError("  Scanning Error in '" + fileName
-                + "':\n  " + e.getMessage() + "\n");
+            parserX.getErrorConsumer().addError("  Scanning Error in '" + fileName + "':\n  " + e.getMessage() + "\n");
             return false;
         }
         return true;
     }
-
-/*    public static void main(String args[]) {
-        parseFile(new File("."),args[0]);
-    }*/
 }
-
 PARSER_END(SchemeParser)
 
 

jplag.frontend.text/src/main/antlr/text.g

@@ -49,26 +49,26 @@ options
 
 {
     public void newline() {
-	  super.newline();
-	  ((InputState)inputState).column = 1;
+        super.newline();
+        ((InputState) inputState).column = 1;
     }
 
     public void consume() throws antlr.CharStreamException {
-      if ( inputState.guessing == 0 ) {
-	    InputState state = (InputState)inputState;
-	    if (text.length()==0) {
-	      // remember token start column
-	      state.tokColumn = state.column;
-	    }
-	    state.column++;
-      }
-      super.consume();
+        if (inputState.guessing == 0) {
+            InputState state = (InputState) inputState;
+            if (text.length() == 0) {
+                // remember token start column
+                state.tokColumn = state.column;
+            }
+            state.column++;
+        }
+        super.consume();
     }
-    
+
     protected Token makeToken(int t) {
-      ParserToken tok = (ParserToken)super.makeToken(t);
-      tok.setColumn(((InputState)inputState).tokColumn);
-      return tok;
+        ParserToken token = (ParserToken) super.makeToken(t);
+        token.setColumn(((InputState) inputState).tokColumn);
+        return token;
     }
 }