From: <fwi...@us...> - 2008-09-18 12:37:21
|
Revision: 5340 http://jython.svn.sourceforge.net/jython/?rev=5340&view=rev Author: fwierzbicki Date: 2008-09-18 19:37:19 +0000 (Thu, 18 Sep 2008) Log Message: ----------- Unicode ast node is a kludge from long ago whose time has passed. I forgot to remove it when I unified str node handling in the parser. Modified Paths: -------------- trunk/jython/ast/Python.asdl trunk/jython/src/org/python/antlr/ast/VisitorBase.java trunk/jython/src/org/python/antlr/ast/VisitorIF.java Removed Paths: ------------- trunk/jython/src/org/python/antlr/ast/Unicode.java Modified: trunk/jython/ast/Python.asdl =================================================================== --- trunk/jython/ast/Python.asdl 2008-09-18 19:07:35 UTC (rev 5339) +++ trunk/jython/ast/Python.asdl 2008-09-18 19:37:19 UTC (rev 5340) @@ -68,7 +68,6 @@ | Repr(expr value) | Num(object n) -- a number as a PyObject. | Str(string s) -- need to specify raw, unicode, etc? - | Unicode(string s) -- need to specify raw, unicode, etc? -- other literals? bools? -- the following expression can appear in assignment context Deleted: trunk/jython/src/org/python/antlr/ast/Unicode.java =================================================================== --- trunk/jython/src/org/python/antlr/ast/Unicode.java 2008-09-18 19:07:35 UTC (rev 5339) +++ trunk/jython/src/org/python/antlr/ast/Unicode.java 2008-09-18 19:37:19 UTC (rev 5340) @@ -1,57 +0,0 @@ -// Autogenerated AST node -package org.python.antlr.ast; -import org.python.antlr.PythonTree; -import org.antlr.runtime.CommonToken; -import org.antlr.runtime.Token; -import java.io.DataOutputStream; -import java.io.IOException; - -public class Unicode extends exprType { - public Object s; - - public static final String[] _fields = new String[] {"s"}; - - public Unicode(Token token, Object s) { - super(token); - this.s = s; - } - - public Unicode(int ttype, Token token, Object s) { - super(ttype, token); - this.s = s; - } - - public Unicode(PythonTree tree, Object s) { - super(tree); - this.s = s; - } - - public String toString() { - return "Unicode"; - } - - public String toStringTree() { - StringBuffer sb = new StringBuffer("Unicode("); - sb.append("s="); - sb.append(dumpThis(s)); - sb.append(","); - sb.append(")"); - return sb.toString(); - } - - public <R> R accept(VisitorIF<R> visitor) throws Exception { - return visitor.visitUnicode(this); - } - - public void traverse(VisitorIF visitor) throws Exception { - } - - public int getLineno() { - return getLine(); - } - - public int getCol_offset() { - return getCharPositionInLine(); - } - -} Modified: trunk/jython/src/org/python/antlr/ast/VisitorBase.java =================================================================== --- trunk/jython/src/org/python/antlr/ast/VisitorBase.java 2008-09-18 19:07:35 UTC (rev 5339) +++ trunk/jython/src/org/python/antlr/ast/VisitorBase.java 2008-09-18 19:37:19 UTC (rev 5340) @@ -251,12 +251,6 @@ return ret; } - public R visitUnicode(Unicode node) throws Exception { - R ret = unhandled_node(node); - traverse(node); - return ret; - } - public R visitAttribute(Attribute node) throws Exception { R ret = unhandled_node(node); traverse(node); Modified: trunk/jython/src/org/python/antlr/ast/VisitorIF.java =================================================================== --- trunk/jython/src/org/python/antlr/ast/VisitorIF.java 2008-09-18 19:07:35 UTC (rev 5339) +++ trunk/jython/src/org/python/antlr/ast/VisitorIF.java 2008-09-18 19:37:19 UTC (rev 5340) @@ -43,7 +43,6 @@ public R visitRepr(Repr node) throws Exception; public R visitNum(Num node) throws Exception; public R visitStr(Str node) throws Exception; - public R visitUnicode(Unicode node) throws Exception; public R visitAttribute(Attribute node) throws Exception; public R visitSubscript(Subscript node) throws Exception; public R visitName(Name node) throws Exception; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |