Menu
▾
▴
[Jython-checkins] SF.net SVN: jython:[5552] trunk/jython/src/org/python
|
From: <pj...@us...> - 2008-11-07 01:16:00
|
Revision: 5552
http://jython.svn.sourceforge.net/jython/?rev=5552&view=rev
Author: pjenvey
Date: 2008-11-07 01:15:50 +0000 (Fri, 07 Nov 2008)
Log Message:
-----------
unused imports, some coding standards
Modified Paths:
--------------
trunk/jython/src/org/python/antlr/BaseParser.java
trunk/jython/src/org/python/antlr/ExpressionParser.java
trunk/jython/src/org/python/antlr/FailFastHandler.java
trunk/jython/src/org/python/antlr/InteractiveParser.java
trunk/jython/src/org/python/antlr/ModuleParser.java
trunk/jython/src/org/python/antlr/PythonTree.java
trunk/jython/src/org/python/core/ParserFacade.java
Modified: trunk/jython/src/org/python/antlr/BaseParser.java
===================================================================
--- trunk/jython/src/org/python/antlr/BaseParser.java 2008-11-07 01:04:00 UTC (rev 5551)
+++ trunk/jython/src/org/python/antlr/BaseParser.java 2008-11-07 01:15:50 UTC (rev 5552)
@@ -1,31 +1,10 @@
package org.python.antlr;
import org.antlr.runtime.CharStream;
-import org.antlr.runtime.CommonToken;
-import org.antlr.runtime.CommonTokenStream;
-import org.antlr.runtime.RecognitionException;
import org.antlr.runtime.Token;
-import org.antlr.runtime.tree.CommonTree;
-import org.antlr.runtime.tree.CommonTreeAdaptor;
-import org.antlr.runtime.tree.CommonTreeNodeStream;
-import org.antlr.runtime.tree.Tree;
-import org.antlr.runtime.tree.TreeAdaptor;
-import org.python.antlr.ast.modType;
-import org.python.antlr.ast.Module;
-import org.python.antlr.ast.stmtType;
public class BaseParser {
- public static class PyLexer extends PythonLexer {
- public PyLexer(CharStream lexer) {
- super(lexer);
- }
- public Token nextToken() {
- startPos = getCharPositionInLine();
- return super.nextToken();
- }
- }
-
protected CharStream charStream;
protected boolean partial;
protected String filename;
@@ -35,4 +14,15 @@
public void setAntlrErrorHandler(ErrorHandler eh) {
this.errorHandler = eh;
}
+
+ public static class PyLexer extends PythonLexer {
+ public PyLexer(CharStream lexer) {
+ super(lexer);
+ }
+
+ public Token nextToken() {
+ startPos = getCharPositionInLine();
+ return super.nextToken();
+ }
+ }
}
Modified: trunk/jython/src/org/python/antlr/ExpressionParser.java
===================================================================
--- trunk/jython/src/org/python/antlr/ExpressionParser.java 2008-11-07 01:04:00 UTC (rev 5551)
+++ trunk/jython/src/org/python/antlr/ExpressionParser.java 2008-11-07 01:15:50 UTC (rev 5552)
@@ -1,18 +1,9 @@
package org.python.antlr;
import org.antlr.runtime.CharStream;
-import org.antlr.runtime.CommonToken;
import org.antlr.runtime.CommonTokenStream;
import org.antlr.runtime.RecognitionException;
-import org.antlr.runtime.Token;
-import org.antlr.runtime.tree.CommonTree;
-import org.antlr.runtime.tree.CommonTreeAdaptor;
-import org.antlr.runtime.tree.CommonTreeNodeStream;
-import org.antlr.runtime.tree.Tree;
-import org.antlr.runtime.tree.TreeAdaptor;
import org.python.antlr.ast.modType;
-import org.python.antlr.ast.Module;
-import org.python.antlr.ast.stmtType;
public class ExpressionParser extends BaseParser {
Modified: trunk/jython/src/org/python/antlr/FailFastHandler.java
===================================================================
--- trunk/jython/src/org/python/antlr/FailFastHandler.java 2008-11-07 01:04:00 UTC (rev 5551)
+++ trunk/jython/src/org/python/antlr/FailFastHandler.java 2008-11-07 01:15:50 UTC (rev 5552)
@@ -6,11 +6,7 @@
import org.antlr.runtime.Lexer;
import org.antlr.runtime.MismatchedTokenException;
import org.antlr.runtime.RecognitionException;
-import org.python.antlr.ast.ErrorMod;
import org.python.antlr.ast.exprType;
-import org.python.antlr.ast.ErrorExpr;
-import org.python.antlr.ast.ErrorSlice;
-import org.python.antlr.ast.ErrorStmt;
import org.python.antlr.ast.modType;
import org.python.antlr.ast.sliceType;
import org.python.antlr.ast.stmtType;
Modified: trunk/jython/src/org/python/antlr/InteractiveParser.java
===================================================================
--- trunk/jython/src/org/python/antlr/InteractiveParser.java 2008-11-07 01:04:00 UTC (rev 5551)
+++ trunk/jython/src/org/python/antlr/InteractiveParser.java 2008-11-07 01:15:50 UTC (rev 5552)
@@ -3,19 +3,9 @@
import java.io.BufferedReader;
import java.io.IOException;
-import org.antlr.runtime.CharStream;
-import org.antlr.runtime.CommonToken;
import org.antlr.runtime.CommonTokenStream;
import org.antlr.runtime.RecognitionException;
-import org.antlr.runtime.Token;
-import org.antlr.runtime.tree.CommonTree;
-import org.antlr.runtime.tree.CommonTreeAdaptor;
-import org.antlr.runtime.tree.CommonTreeNodeStream;
-import org.antlr.runtime.tree.Tree;
-import org.antlr.runtime.tree.TreeAdaptor;
import org.python.antlr.ast.modType;
-import org.python.antlr.ast.Module;
-import org.python.antlr.ast.stmtType;
public class InteractiveParser extends BaseParser {
Modified: trunk/jython/src/org/python/antlr/ModuleParser.java
===================================================================
--- trunk/jython/src/org/python/antlr/ModuleParser.java 2008-11-07 01:04:00 UTC (rev 5551)
+++ trunk/jython/src/org/python/antlr/ModuleParser.java 2008-11-07 01:15:50 UTC (rev 5552)
@@ -1,18 +1,9 @@
package org.python.antlr;
import org.antlr.runtime.CharStream;
-import org.antlr.runtime.CommonToken;
import org.antlr.runtime.CommonTokenStream;
import org.antlr.runtime.RecognitionException;
-import org.antlr.runtime.Token;
-import org.antlr.runtime.tree.CommonTree;
-import org.antlr.runtime.tree.CommonTreeAdaptor;
-import org.antlr.runtime.tree.CommonTreeNodeStream;
-import org.antlr.runtime.tree.Tree;
-import org.antlr.runtime.tree.TreeAdaptor;
import org.python.antlr.ast.modType;
-import org.python.antlr.ast.Module;
-import org.python.antlr.ast.stmtType;
public class ModuleParser extends BaseParser {
public ModuleParser(CharStream cs, String filename, String encoding) {
Modified: trunk/jython/src/org/python/antlr/PythonTree.java
===================================================================
--- trunk/jython/src/org/python/antlr/PythonTree.java 2008-11-07 01:04:00 UTC (rev 5551)
+++ trunk/jython/src/org/python/antlr/PythonTree.java 2008-11-07 01:15:50 UTC (rev 5552)
@@ -5,9 +5,6 @@
import org.antlr.runtime.CommonToken;
import org.antlr.runtime.Token;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
import org.python.antlr.ast.VisitorIF;
public class PythonTree extends BaseTree implements AST {
Modified: trunk/jython/src/org/python/core/ParserFacade.java
===================================================================
--- trunk/jython/src/org/python/core/ParserFacade.java 2008-11-07 01:04:00 UTC (rev 5551)
+++ trunk/jython/src/org/python/core/ParserFacade.java 2008-11-07 01:15:50 UTC (rev 5552)
@@ -12,7 +12,6 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.antlr.runtime.ANTLRReaderStream;
import org.antlr.runtime.CharStream;
import org.antlr.runtime.CommonTokenStream;
@@ -22,9 +21,7 @@
import org.python.antlr.ParseException;
import org.python.antlr.ModuleParser;
import org.python.antlr.NoCloseReaderStream;
-import org.python.antlr.PythonParser;
import org.python.antlr.PythonTree;
-import org.python.antlr.PythonTree;
import org.python.antlr.PythonLexer;
import org.python.antlr.PythonPartial;
import org.python.antlr.PythonTokenSource;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
