Menu
▾
▴
[Jython-checkins] SF.net SVN: jython:[6613] trunk/jython/src/org/python
|
From: <fwi...@us...> - 2009-07-31 14:41:29
|
Revision: 6613
http://jython.svn.sourceforge.net/jython/?rev=6613&view=rev
Author: fwierzbicki
Date: 2009-07-31 14:41:13 +0000 (Fri, 31 Jul 2009)
Log Message:
-----------
Added Override annotations.
Modified Paths:
--------------
trunk/jython/src/org/python/antlr/BaseParser.java
trunk/jython/src/org/python/antlr/ParseException.java
trunk/jython/src/org/python/antlr/PythonErrorNode.java
trunk/jython/src/org/python/antlr/PythonTreeAdaptor.java
trunk/jython/src/org/python/compiler/CodeCompiler.java
Modified: trunk/jython/src/org/python/antlr/BaseParser.java
===================================================================
--- trunk/jython/src/org/python/antlr/BaseParser.java 2009-07-31 05:02:10 UTC (rev 6612)
+++ trunk/jython/src/org/python/antlr/BaseParser.java 2009-07-31 14:41:13 UTC (rev 6613)
@@ -42,6 +42,7 @@
}
+ @Override
public Token nextToken() {
startPos = getCharPositionInLine();
return super.nextToken();
@@ -53,6 +54,7 @@
super(lexer);
}
+ @Override
public Token nextToken() {
startPos = getCharPositionInLine();
return super.nextToken();
Modified: trunk/jython/src/org/python/antlr/ParseException.java
===================================================================
--- trunk/jython/src/org/python/antlr/ParseException.java 2009-07-31 05:02:10 UTC (rev 6612)
+++ trunk/jython/src/org/python/antlr/ParseException.java 2009-07-31 14:41:13 UTC (rev 6613)
@@ -1,6 +1,5 @@
package org.python.antlr;
-import org.python.antlr.PythonTree;
import org.python.core.Py;
import org.python.core.PyObject;
Modified: trunk/jython/src/org/python/antlr/PythonErrorNode.java
===================================================================
--- trunk/jython/src/org/python/antlr/PythonErrorNode.java 2009-07-31 05:02:10 UTC (rev 6612)
+++ trunk/jython/src/org/python/antlr/PythonErrorNode.java 2009-07-31 14:41:13 UTC (rev 6613)
@@ -20,18 +20,22 @@
this.errorNode = errorNode;
}
+ @Override
public boolean isNil() {
return errorNode.isNil();
}
+ @Override
public int getAntlrType() {
return errorNode.getType();
}
+ @Override
public String getText() {
return errorNode.getText();
}
+ @Override
public String toString() {
return errorNode.toString();
}
Modified: trunk/jython/src/org/python/antlr/PythonTreeAdaptor.java
===================================================================
--- trunk/jython/src/org/python/antlr/PythonTreeAdaptor.java 2009-07-31 05:02:10 UTC (rev 6612)
+++ trunk/jython/src/org/python/antlr/PythonTreeAdaptor.java 2009-07-31 14:41:13 UTC (rev 6613)
@@ -8,6 +8,7 @@
public class PythonTreeAdaptor extends CommonTreeAdaptor {
+ @Override
public void setTokenBoundaries(Object t, Token startToken, Token stopToken) {
if (t==null) {
return;
@@ -33,10 +34,12 @@
pt.setCharStopIndex(stopChar);
}
+ @Override
public Object create(Token token) {
return new PythonTree(token);
}
+ @Override
public Object errorNode(TokenStream input, Token start, Token stop,
RecognitionException e)
{
@@ -45,6 +48,7 @@
return t;
}
+ @Override
public Object dupNode(Object t) {
if (t == null) {
return null;
@@ -52,16 +56,19 @@
return create(((PythonTree) t).getToken());
}
+ @Override
public boolean isNil(Object tree) {
return ((PythonTree)tree).isNil();
}
+ @Override
public void addChild(Object t, Object child) {
if ( t!=null && child!=null ) {
((PythonTree)t).addChild((PythonTree)child);
}
}
+ @Override
public Object becomeRoot(Object newRoot, Object oldRoot) {
//System.out.println("becomeroot new "+newRoot.toString()+" old "+oldRoot);
PythonTree newRootTree = (PythonTree)newRoot;
@@ -85,6 +92,7 @@
return newRootTree;
}
+ @Override
public Object rulePostProcessing(Object root) {
//System.out.println("rulePostProcessing: "+((PythonTree)root).toStringTree());
PythonTree r = (PythonTree)root;
@@ -102,6 +110,7 @@
return r;
}
+ @Override
public Object create(int tokenType, Token fromToken) {
fromToken = createToken(fromToken);
//((ClassicToken)fromToken).setType(tokenType);
@@ -110,6 +119,7 @@
return t;
}
+ @Override
public Object create(int tokenType, Token fromToken, String text) {
fromToken = createToken(fromToken);
fromToken.setType(tokenType);
@@ -118,33 +128,40 @@
return t;
}
+ @Override
public Object create(int tokenType, String text) {
Token fromToken = createToken(tokenType, text);
PythonTree t = (PythonTree)create(fromToken);
return t;
}
+ @Override
public int getType(Object t) {
((PythonTree)t).getType();
return 0;
}
+ @Override
public String getText(Object t) {
return ((PythonTree)t).getText();
}
+ @Override
public Object getChild(Object t, int i) {
return ((PythonTree)t).getChild(i);
}
+ @Override
public void setChild(Object t, int i, Object child) {
((PythonTree)t).setChild(i, (PythonTree)child);
}
+ @Override
public Object deleteChild(Object t, int i) {
return ((PythonTree)t).deleteChild(i);
}
+ @Override
public int getChildCount(Object t) {
return ((PythonTree)t).getChildCount();
}
Modified: trunk/jython/src/org/python/compiler/CodeCompiler.java
===================================================================
--- trunk/jython/src/org/python/compiler/CodeCompiler.java 2009-07-31 05:02:10 UTC (rev 6612)
+++ trunk/jython/src/org/python/compiler/CodeCompiler.java 2009-07-31 14:41:13 UTC (rev 6613)
@@ -89,8 +89,7 @@
import org.objectweb.asm.commons.Method;
-public class CodeCompiler extends Visitor implements Opcodes, ClassConstants //, PythonGrammarTreeConstants
-{
+public class CodeCompiler extends Visitor implements Opcodes, ClassConstants {
public static final Object Exit=new Integer(1);
public static final Object NoExit=null;
@@ -127,13 +126,13 @@
public Stack<ExceptionHandler> exceptionHandlers;
public Vector<Label> yields = new Vector<Label>();
- /* break/continue finally's level.
- * This is the lowest level in the exceptionHandlers which should
- * be executed at break or continue.
- * It is saved/updated/restored when compiling loops.
- * A similar level for returns is not needed because a new CodeCompiler
- * is used for each PyCode, ie. each 'function'.
- * When returning through finally's all the exceptionHandlers are executed.
+ /*
+ * break/continue finally's level. This is the lowest level in the
+ * exceptionHandlers which should be executed at break or continue. It is
+ * saved/updated/restored when compiling loops. A similar level for
+ * returns is not needed because a new CodeCompiler is used for each
+ * PyCode, in other words: each 'function'. When returning through
+ * finally's all the exceptionHandlers are executed.
*/
public int bcfLevel = 0;
@@ -202,13 +201,11 @@
code.freeLocal(tmp);
}
-
public void set(PythonTree node, int tmp) throws Exception {
temporary = tmp;
visit(node);
}
-
private void saveAugTmps(PythonTree node, int count) throws Exception {
if (count >= 4) {
augtmp4 = code.getLocal("Lorg/python/core/PyObject;");
@@ -234,7 +231,6 @@
code.aload(augtmp4);
}
-
private void restoreAugTmps(PythonTree node, int count) throws Exception {
code.aload(augtmp1);
code.freeLocal(augtmp1);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
