From: <fwi...@us...> - 2008-09-26 14:42:17
|
Revision: 5350 http://jython.svn.sourceforge.net/jython/?rev=5350&view=rev Author: fwierzbicki Date: 2008-09-26 14:41:55 +0000 (Fri, 26 Sep 2008) Log Message: ----------- Correct this for new __class__.__name__ package truncating behavior of Java classes. Modified Paths: -------------- trunk/jython/ast/astview.py Modified: trunk/jython/ast/astview.py =================================================================== --- trunk/jython/ast/astview.py 2008-09-25 21:16:30 UTC (rev 5349) +++ trunk/jython/ast/astview.py 2008-09-26 14:41:55 UTC (rev 5350) @@ -19,11 +19,11 @@ def get_class_name(t): result = t.__class__.__name__ - if result in ("org.python.antlr.ast.expr_contextType", - "org.python.antlr.ast.boolopType", - "org.python.antlr.ast.unaryopType", - "org.python.antlr.ast.cmpopType", - "org.python.antlr.ast.operatorType"): + if result in ("expr_contextType", + "boolopType", + "unaryopType", + "cmpopType", + "operatorType"): result = str(t) if result == "AugLoad": result = "Load" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pj...@us...> - 2008-10-02 00:16:39
|
Revision: 5355 http://jython.svn.sourceforge.net/jython/?rev=5355&view=rev Author: pjenvey Date: 2008-10-02 00:16:29 +0000 (Thu, 02 Oct 2008) Log Message: ----------- whitespace Modified Paths: -------------- trunk/jython/ast/astview.py Modified: trunk/jython/ast/astview.py =================================================================== --- trunk/jython/ast/astview.py 2008-10-02 00:13:21 UTC (rev 5354) +++ trunk/jython/ast/astview.py 2008-10-02 00:16:29 UTC (rev 5355) @@ -20,10 +20,10 @@ def get_class_name(t): result = t.__class__.__name__ if result in ("expr_contextType", - "boolopType", - "unaryopType", - "cmpopType", - "operatorType"): + "boolopType", + "unaryopType", + "cmpopType", + "operatorType"): result = str(t) if result == "AugLoad": result = "Load" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fwi...@us...> - 2009-01-08 19:34:39
|
Revision: 5884 http://jython.svn.sourceforge.net/jython/?rev=5884&view=rev Author: fwierzbicki Date: 2009-01-08 19:34:31 +0000 (Thu, 08 Jan 2009) Log Message: ----------- improvement to astview.py in light of better ast.py in Jython. Modified Paths: -------------- trunk/jython/ast/astview.py Modified: trunk/jython/ast/astview.py =================================================================== --- trunk/jython/ast/astview.py 2009-01-08 19:22:49 UTC (rev 5883) +++ trunk/jython/ast/astview.py 2009-01-08 19:34:31 UTC (rev 5884) @@ -14,29 +14,15 @@ import sys if sys.platform.startswith('java'): - - get_symbol_key = lambda op: op - def get_class_name(t): result = t.__class__.__name__ - if result in ("expr_contextType", - "boolopType", - "unaryopType", - "cmpopType", - "operatorType"): - result = str(t) - if result == "AugLoad": - result = "Load" - elif result == "AugStore": - result = "Store" - else: - result = result.split(".")[-1] - if result.endswith("Type"): - result = result[:-4] + if result == "AugLoad": + result = "Load" + elif result == "AugStore": + result = "Store" return result else: - get_symbol_key = type get_class_name = lambda node: node.__class__.__name__ get_lines_and_cols = True @@ -48,7 +34,7 @@ result = get_class_name(node) if get_lines_and_cols and hasattr(node, 'lineno') and hasattr(node, 'col_offset'): result = "%s (%s,%s)" % (result, node.lineno, node.col_offset) - yield result#get_class_name(node)#result + yield result try: for field in node._fields: yield tuple(lispify_field(field, getattr(node, field))) @@ -57,10 +43,10 @@ def lispify_field(field, child): yield field - if not hasattr(child, '__iter__'): - children = [child] - else: + if isinstance(child, list): children = child + else: + children = [child] for node in children: if isinstance(node, _ast.AST): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fwi...@us...> - 2009-01-08 19:36:37
|
Revision: 5885 http://jython.svn.sourceforge.net/jython/?rev=5885&view=rev Author: fwierzbicki Date: 2009-01-08 19:36:33 +0000 (Thu, 08 Jan 2009) Log Message: ----------- _ast -> ast Modified Paths: -------------- trunk/jython/ast/astview.py Modified: trunk/jython/ast/astview.py =================================================================== --- trunk/jython/ast/astview.py 2009-01-08 19:34:31 UTC (rev 5884) +++ trunk/jython/ast/astview.py 2009-01-08 19:36:33 UTC (rev 5885) @@ -10,7 +10,7 @@ """ -import _ast +import ast import sys if sys.platform.startswith('java'): @@ -49,7 +49,7 @@ children = [child] for node in children: - if isinstance(node, _ast.AST): + if isinstance(node, ast.AST): yield lispify_ast(node) else: if isinstance(node, float): @@ -64,10 +64,10 @@ def tree(pyfile): try: - ast = compile(open(pyfile).read(), pyfile, "exec", _ast.PyCF_ONLY_AST) + node = compile(open(pyfile).read(), pyfile, "exec", ast.PyCF_ONLY_AST) except SyntaxError: return "SyntaxError", - return lispify_ast(ast) + return lispify_ast(node) if __name__ == '__main__': import pprint This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fwi...@us...> - 2009-01-14 14:10:07
|
Revision: 5930 http://jython.svn.sourceforge.net/jython/?rev=5930&view=rev Author: fwierzbicki Date: 2009-01-14 14:09:58 +0000 (Wed, 14 Jan 2009) Log Message: ----------- oops, move back to _ast since I want to compare with Python 2.5 which does not yet have ast.py. Modified Paths: -------------- trunk/jython/ast/astview.py Modified: trunk/jython/ast/astview.py =================================================================== --- trunk/jython/ast/astview.py 2009-01-14 04:35:22 UTC (rev 5929) +++ trunk/jython/ast/astview.py 2009-01-14 14:09:58 UTC (rev 5930) @@ -10,7 +10,7 @@ """ -import ast +import _ast import sys if sys.platform.startswith('java'): @@ -49,7 +49,7 @@ children = [child] for node in children: - if isinstance(node, ast.AST): + if isinstance(node, _ast.AST): yield lispify_ast(node) else: if isinstance(node, float): @@ -64,7 +64,7 @@ def tree(pyfile): try: - node = compile(open(pyfile).read(), pyfile, "exec", ast.PyCF_ONLY_AST) + node = compile(open(pyfile).read(), pyfile, "exec", _ast.PyCF_ONLY_AST) except SyntaxError: return "SyntaxError", return lispify_ast(node) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |