Project: Jython

Revision: 5264

Author: fwierzbicki

Date: 29 Aug 2008 09:47:16

Changes:

Merged revisions 5210,5216-5220,5223-5226,5228,5230,5236-5261 via svnmerge from
https://jython.svn.sourceforge.net/svnroot/jython/branches/nowalker

........
r5210 | fwierzbicki | 2008-08-19 17:43:06 -0400 (Tue, 19 Aug 2008) | 5 lines

Work to date on the one pass grammar. Not ready for others to look at really.
If you really want to try it note that you need to comment out parts of site.py
and os.py to get things to work. They *almost* parse and compile, but not
quite, and they are basic dependencies for Jython to run.
........
r5216 | fwierzbicki | 2008-08-20 08:10:26 -0400 (Wed, 20 Aug 2008) | 2 lines

Much better BoolOp.
........
r5217 | fwierzbicki | 2008-08-20 10:06:30 -0400 (Wed, 20 Aug 2008) | 2 lines

Fix "del".
........
r5218 | fwierzbicki | 2008-08-20 10:39:21 -0400 (Wed, 20 Aug 2008) | 2 lines

Dict support.
........
r5219 | fwierzbicki | 2008-08-20 11:23:14 -0400 (Wed, 20 Aug 2008) | 2 lines

Conditional Expression support.
........
r5220 | fwierzbicki | 2008-08-20 11:37:02 -0400 (Wed, 20 Aug 2008) | 2 lines

repr support.
........
r5223 | fwierzbicki | 2008-08-20 15:57:39 -0400 (Wed, 20 Aug 2008) | 2 lines

Start of list comprehensions and generator expressions.
........
r5224 | fwierzbicki | 2008-08-20 15:58:17 -0400 (Wed, 20 Aug 2008) | 2 lines

oops revert build.xml
........
r5225 | fwierzbicki | 2008-08-20 16:57:09 -0400 (Wed, 20 Aug 2008) | 2 lines

re-remove PythonWalker.g from build
........
r5226 | fwierzbicki | 2008-08-20 16:59:44 -0400 (Wed, 20 Aug 2008) | 2 lines

gen expressions and list comps now actually work...
........
r5228 | fwierzbicki | 2008-08-20 22:58:24 -0400 (Wed, 20 Aug 2008) | 2 lines

debugging of some expr_contextType values.
........
r5230 | fwierzbicki | 2008-08-20 23:47:32 -0400 (Wed, 20 Aug 2008) | 2 lines

bugfix on exception and on assign value expr_contextType.
........
r5236 | fwierzbicki | 2008-08-22 19:03:45 -0400 (Fri, 22 Aug 2008) | 2 lines

Bugfix for expr_contextType on assign values.
........
r5237 | fwierzbicki | 2008-08-22 22:33:48 -0400 (Fri, 22 Aug 2008) | 2 lines

Add expr types to BaseTree children.
........
r5238 | fwierzbicki | 2008-08-23 15:19:16 -0400 (Sat, 23 Aug 2008) | 2 lines

BinOp now works in one pass.
........
r5239 | fwierzbicki | 2008-08-23 15:43:19 -0400 (Sat, 23 Aug 2008) | 2 lines

Fine tuning List and Assign col position.
........
r5240 | fwierzbicki | 2008-08-23 19:03:59 -0400 (Sat, 23 Aug 2008) | 5 lines

Make PythonTree's toStringTree more easily comparable with ast/astview.py
output. This will help with the walkerless Python.g, as it doesn't quite
parse ast/astview.py yet.
........
r5241 | fwierzbicki | 2008-08-23 22:04:43 -0400 (Sat, 23 Aug 2008) | 2 lines

Fix lambda without args.
........
r5242 | fwierzbicki | 2008-08-24 05:38:22 -0400 (Sun, 24 Aug 2008) | 2 lines

check for PythonTree in makeStmts.
........
r5243 | fwierzbicki | 2008-08-25 10:21:29 -0400 (Mon, 25 Aug 2008) | 2 lines

Fix generator expressions, rename all "stmts" in Python.g to "stypes".
........
r5244 | fwierzbicki | 2008-08-25 11:25:24 -0400 (Mon, 25 Aug 2008) | 2 lines

Clean up creation of stmtType[] and exprType[].
........
r5245 | fwierzbicki | 2008-08-25 14:44:46 -0400 (Mon, 25 Aug 2008) | 3 lines

Fix build.xml (oops)
Fix Generator Expression assignments and multi-statement simple_stmt.
........
r5246 | fwierzbicki | 2008-08-25 16:36:04 -0400 (Mon, 25 Aug 2008) | 3 lines

Fixed fplist, subscripts (especially extslice) and enable Interactive
and Expression (single and eval). regrtest.py is now running.
........
r5247 | fwierzbicki | 2008-08-25 17:18:03 -0400 (Mon, 25 Aug 2008) | 2 lines

Fix **
........
r5248 | fwierzbicki | 2008-08-25 22:04:27 -0400 (Mon, 25 Aug 2008) | 3 lines

Cleanup: removal of comments, re-format of Python.g and
removal of PYNODE.
........
r5249 | fwierzbicki | 2008-08-26 08:21:42 -0400 (Tue, 26 Aug 2008) | 3 lines

Remove unnecessary constructor on BinOp (now it is just the generated version again)
Remove some whitespace in Python.g
........
r5250 | fwierzbicki | 2008-08-26 11:05:19 -0400 (Tue, 26 Aug 2008) | 2 lines

Moved makeSliceType code to GrammarActions.
........
r5251 | fwierzbicki | 2008-08-26 12:51:15 -0400 (Tue, 26 Aug 2008) | 2 lines

Moved Subscript creation up a rule - fixed a bunch of unit tests.
........
r5252 | fwierzbicki | 2008-08-26 15:37:34 -0400 (Tue, 26 Aug 2008) | 2 lines

Another expr_contextType adjustment.
........
r5253 | fwierzbicki | 2008-08-26 16:17:50 -0400 (Tue, 26 Aug 2008) | 2 lines

checking for bad assignment statements.
........
r5254 | fwierzbicki | 2008-08-26 20:44:35 -0400 (Tue, 26 Aug 2008) | 3 lines

Fix illegal Lambda statements and more illegal assigns. Also raise exceptions
on illegal gen expression arguments.
........
r5255 | fwierzbicki | 2008-08-26 22:38:35 -0400 (Tue, 26 Aug 2008) | 2 lines

Fix for FunctionDef and Call problems.
........
r5256 | fwierzbicki | 2008-08-26 22:47:56 -0400 (Tue, 26 Aug 2008) | 2 lines

whitespace
........
r5257 | fwierzbicki | 2008-08-27 12:07:35 -0400 (Wed, 27 Aug 2008) | 2 lines

revert build.xml after accidently checking in my local copy.
........
r5258 | fwierzbicki | 2008-08-27 15:51:16 -0400 (Wed, 27 Aug 2008) | 2 lines

for not_test, replacing manual tree construction with ->.
........
r5259 | fwierzbicki | 2008-08-27 16:09:39 -0400 (Wed, 27 Aug 2008) | 2 lines

TODO comment.
........
r5260 | fwierzbicki | 2008-08-27 16:35:54 -0400 (Wed, 27 Aug 2008) | 3 lines

Removed XXX comments that no longer apply (special testlists don't
seem to be needed). Removed unused c1 and c2 alias.
........
r5261 | fwierzbicki | 2008-08-27 16:51:19 -0400 (Wed, 27 Aug 2008) | 2 lines

simplify testlist.
........

Files:
modified: /trunk/jython/src/org/python/antlr/ast/Print.java (try)
modified: /trunk/jython/tests/java/org/python/antlr/PythonTreeTester.java (try)
modified: /trunk/jython/src/org/python/antlr/ast/UnaryOp.java (try)
modified: /trunk/jython/src/org/python/antlr/ast/Attribute.java (try)
modified: /trunk/jython/src/org/python/antlr/ast/Raise.java (try)
modified: /trunk/jython/src/org/python/antlr/ast/Yield.java (try)
modified: /trunk/jython (try)
modified: /trunk/jython/ast/asdl_antlr.py (try)
modified: /trunk/jython/src/org/python/antlr/ast/Call.java (try)
modified: /trunk/jython/src/org/python/antlr/ast/comprehensionType.java (try)
deleted: /trunk/jython/grammar/PythonWalker.g
modified: /trunk/jython/src/org/python/antlr/ast/Expr.java (try)
modified: /trunk/jython/src/org/python/antlr/ast/AugAssign.java (try)
modified: /trunk/jython/src/org/python/util/jython.java (try)
modified: /trunk/jython/src/org/python/antlr/ast/Assign.java (try)
modified: /trunk/jython/src/org/python/antlr/ast/Exec.java (try)
modified: /trunk/jython/src/org/python/antlr/ExpressionParser.java (try)
modified: /trunk/jython/src/org/python/antlr/ast/keywordType.java (try)
modified: /trunk/jython/src/org/python/antlr/ast/Compare.java (try)
modified: /trunk/jython/src/org/python/antlr/ast/excepthandlerType.java (try)
modified: /trunk/jython/src/org/python/antlr/ast/ListComp.java (try)
modified: /trunk/jython/src/org/python/antlr/ast/If.java (try)
modified: /trunk/jython/src/org/python/antlr/ast/Slice.java (try)
modified: /trunk/jython/src/org/python/antlr/ast/Expression.java (try)
modified: /trunk/jython/src/org/python/antlr/ast/Assert.java (try)
modified: /trunk/jython/src/org/python/antlr/InteractiveParser.java (try)
modified: /trunk/jython/src/org/python/antlr/ast/GeneratorExp.java (try)
modified: /trunk/jython/grammar/Python.g (try)
modified: /trunk/jython/src/org/python/antlr/ast/BinOp.java (try)
modified: /trunk/jython/src/org/python/antlr/ast/Index.java (try)
modified: /trunk/jython/src/org/python/antlr/ast/While.java (try)
modified: /trunk/jython/src/org/python/antlr/ast/Repr.java (try)
modified: /trunk/jython/build.xml (try)
modified: /trunk/jython/src/org/python/antlr/ast/With.java (try)
modified: /trunk/jython/src/org/python/antlr/ModuleParser.java (try)
modified: /trunk/jython/src/org/python/antlr/ast/IfExp.java (try)
modified: /trunk/jython/src/org/python/antlr/ast/Subscript.java (try)
modified: /trunk/jython/src/org/python/antlr/ast/Return.java (try)
modified: /trunk/jython/src/org/python/antlr/ast/Lambda.java (try)
modified: /trunk/jython/src/org/python/antlr/GrammarActions.java (try)
modified: /trunk/jython/src/org/python/antlr/ast/For.java (try)
Diff: