[Pydev-cvs] org.python.pydev.parser/src/org/python/pydev/parser/jython/ast Continue.java, 1.3, 1.4
Brought to you by:
fabioz
Menu
▾
▴
[Pydev-cvs] org.python.pydev.parser/src/org/python/pydev/parser/jython/ast Continue.java, 1.3, 1.4 BinOp.java, 1.3, 1.4 ImportFrom.java, 1.3, 1.4 VisitorIF.java, 1.2, 1.3 TryExcept.java, 1.3, 1.4 Python.asdl, 1.3, 1.4 Expr.java, 1.3, 1.4 UnaryOp.java, 1.3, 1.4 Import.java, 1.3, 1.4 Exec.java, 1.3, 1.4 Lambda.java, 1.3, 1.4 Assert.java, 1.3, 1.4 Raise.java, 1.3, 1.4 VisitorBase.java, 1.2, 1.3 TryFinally.java, 1.3, 1.4 Pass.java, 1.3, 1.4 IfExp.java, 1.1, 1.2 Break.java, 1.3, 1.4 Global.java, 1.3, 1.4 BoolOp.java, 1.3, 1.4
Update of /cvsroot/pydev/org.python.pydev.parser/src/org/python/pydev/parser/jython/ast In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6095/src/org/python/pydev/parser/jython/ast Modified Files: Continue.java BinOp.java ImportFrom.java VisitorIF.java TryExcept.java Python.asdl Expr.java UnaryOp.java Import.java Exec.java Lambda.java Assert.java Raise.java VisitorBase.java TryFinally.java Pass.java IfExp.java Break.java Global.java BoolOp.java Log Message: Ok, finished adding new IfExp for python 2.5 Index: Exec.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/pydev/parser/jython/ast/Exec.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Exec.java 7 Sep 2006 13:48:14 -0000 1.3 --- Exec.java 7 Sep 2006 23:40:37 -0000 1.4 *************** *** 38,42 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(25, ostream); pickleThis(this.body, ostream); pickleThis(this.globals, ostream); --- 38,42 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(24, ostream); pickleThis(this.body, ostream); pickleThis(this.globals, ostream); Index: Break.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/pydev/parser/jython/ast/Break.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Break.java 7 Sep 2006 13:48:14 -0000 1.3 --- Break.java 7 Sep 2006 23:40:37 -0000 1.4 *************** *** 23,27 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(29, ostream); } --- 23,27 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(28, ostream); } Index: Assert.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/pydev/parser/jython/ast/Assert.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Assert.java 7 Sep 2006 13:48:14 -0000 1.3 --- Assert.java 7 Sep 2006 23:40:37 -0000 1.4 *************** *** 32,36 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(22, ostream); pickleThis(this.test, ostream); pickleThis(this.msg, ostream); --- 32,36 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(21, ostream); pickleThis(this.test, ostream); pickleThis(this.msg, ostream); Index: Pass.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/pydev/parser/jython/ast/Pass.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Pass.java 7 Sep 2006 13:48:14 -0000 1.3 --- Pass.java 7 Sep 2006 23:40:37 -0000 1.4 *************** *** 23,27 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(28, ostream); } --- 23,27 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(27, ostream); } Index: Continue.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/pydev/parser/jython/ast/Continue.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Continue.java 7 Sep 2006 13:48:14 -0000 1.3 --- Continue.java 7 Sep 2006 23:40:37 -0000 1.4 *************** *** 23,27 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(30, ostream); } --- 23,27 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(29, ostream); } Index: VisitorIF.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/pydev/parser/jython/ast/VisitorIF.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** VisitorIF.java 7 Sep 2006 13:48:14 -0000 1.2 --- VisitorIF.java 7 Sep 2006 23:40:37 -0000 1.3 *************** *** 19,23 **** public Object visitWhile(While node) throws Exception; public Object visitIf(If node) throws Exception; - public Object visitIfExp(IfExp node) throws Exception; public Object visitRaise(Raise node) throws Exception; public Object visitTryExcept(TryExcept node) throws Exception; --- 19,22 ---- *************** *** 36,39 **** --- 35,39 ---- public Object visitUnaryOp(UnaryOp node) throws Exception; public Object visitLambda(Lambda node) throws Exception; + public Object visitIfExp(IfExp node) throws Exception; public Object visitDict(Dict node) throws Exception; public Object visitListComp(ListComp node) throws Exception; Index: BinOp.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/pydev/parser/jython/ast/BinOp.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** BinOp.java 7 Sep 2006 13:48:14 -0000 1.3 --- BinOp.java 7 Sep 2006 23:40:37 -0000 1.4 *************** *** 37,41 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(32, ostream); pickleThis(this.left, ostream); pickleThis(this.op, ostream); --- 37,41 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(31, ostream); pickleThis(this.left, ostream); pickleThis(this.op, ostream); Index: TryFinally.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/pydev/parser/jython/ast/TryFinally.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TryFinally.java 7 Sep 2006 13:48:14 -0000 1.3 --- TryFinally.java 7 Sep 2006 23:40:37 -0000 1.4 *************** *** 33,37 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(21, ostream); pickleThis(this.body, ostream); pickleThis(this.finalbody, ostream); --- 33,37 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(20, ostream); pickleThis(this.body, ostream); pickleThis(this.finalbody, ostream); Index: ImportFrom.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/pydev/parser/jython/ast/ImportFrom.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ImportFrom.java 7 Sep 2006 13:48:14 -0000 1.3 --- ImportFrom.java 7 Sep 2006 23:40:37 -0000 1.4 *************** *** 33,37 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(24, ostream); pickleThis(this.module, ostream); pickleThis(this.names, ostream); --- 33,37 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(23, ostream); pickleThis(this.module, ostream); pickleThis(this.names, ostream); Index: Lambda.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/pydev/parser/jython/ast/Lambda.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Lambda.java 7 Sep 2006 13:48:14 -0000 1.3 --- Lambda.java 7 Sep 2006 23:40:37 -0000 1.4 *************** *** 32,36 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(34, ostream); pickleThis(this.args, ostream); pickleThis(this.body, ostream); --- 32,36 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(33, ostream); pickleThis(this.args, ostream); pickleThis(this.body, ostream); Index: Expr.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/pydev/parser/jython/ast/Expr.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Expr.java 7 Sep 2006 13:48:14 -0000 1.3 --- Expr.java 7 Sep 2006 23:40:37 -0000 1.4 *************** *** 27,31 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(27, ostream); pickleThis(this.value, ostream); } --- 27,31 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(26, ostream); pickleThis(this.value, ostream); } Index: BoolOp.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/pydev/parser/jython/ast/BoolOp.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** BoolOp.java 7 Sep 2006 13:48:15 -0000 1.3 --- BoolOp.java 7 Sep 2006 23:40:37 -0000 1.4 *************** *** 32,36 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(31, ostream); pickleThis(this.op, ostream); pickleThis(this.values, ostream); --- 32,36 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(30, ostream); pickleThis(this.op, ostream); pickleThis(this.values, ostream); Index: IfExp.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/pydev/parser/jython/ast/IfExp.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** IfExp.java 7 Sep 2006 13:48:14 -0000 1.1 --- IfExp.java 7 Sep 2006 23:40:37 -0000 1.2 *************** *** 5,9 **** import java.io.IOException; ! public class IfExp extends stmtType { public exprType test; public exprType body; --- 5,9 ---- import java.io.IOException; ! public class IfExp extends exprType { public exprType test; public exprType body; *************** *** 38,42 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(18, ostream); pickleThis(this.test, ostream); pickleThis(this.body, ostream); --- 38,42 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(34, ostream); pickleThis(this.test, ostream); pickleThis(this.body, ostream); Index: Python.asdl =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/pydev/parser/jython/ast/Python.asdl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Python.asdl 7 Sep 2006 13:48:14 -0000 1.3 --- Python.asdl 7 Sep 2006 23:40:37 -0000 1.4 *************** *** 40,46 **** | If(expr test, stmt* body, stmt* orelse) - -- added in version 2.5 - | IfExp(expr test, expr body, expr orelse) - -- 'type' is a bad name | Raise(expr? type, expr? inst, expr? tback) --- 40,43 ---- *************** *** 73,76 **** --- 70,77 ---- | UnaryOp(unaryop op, expr operand) | Lambda(arguments args, expr body) + + -- added in version 2.5 + | IfExp(expr test, expr body, expr orelse) + | Dict(expr* keys, expr* values) | ListComp(expr elt, comprehension* generators) Index: Import.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/pydev/parser/jython/ast/Import.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Import.java 7 Sep 2006 13:48:14 -0000 1.3 --- Import.java 7 Sep 2006 23:40:37 -0000 1.4 *************** *** 27,31 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(23, ostream); pickleThis(this.names, ostream); } --- 27,31 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(22, ostream); pickleThis(this.names, ostream); } Index: VisitorBase.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/pydev/parser/jython/ast/VisitorBase.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** VisitorBase.java 7 Sep 2006 13:48:14 -0000 1.2 --- VisitorBase.java 7 Sep 2006 23:40:37 -0000 1.3 *************** *** 100,109 **** } - public Object visitIfExp(IfExp node) throws Exception { - Object ret = unhandled_node(node); - traverse(node); - return ret; - } - public Object visitRaise(Raise node) throws Exception { Object ret = unhandled_node(node); --- 100,103 ---- *************** *** 202,205 **** --- 196,205 ---- } + public Object visitIfExp(IfExp node) throws Exception { + Object ret = unhandled_node(node); + traverse(node); + return ret; + } + public Object visitDict(Dict node) throws Exception { Object ret = unhandled_node(node); Index: UnaryOp.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/pydev/parser/jython/ast/UnaryOp.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** UnaryOp.java 7 Sep 2006 13:48:14 -0000 1.3 --- UnaryOp.java 7 Sep 2006 23:40:37 -0000 1.4 *************** *** 32,36 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(33, ostream); pickleThis(this.op, ostream); pickleThis(this.operand, ostream); --- 32,36 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(32, ostream); pickleThis(this.op, ostream); pickleThis(this.operand, ostream); Index: Raise.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/pydev/parser/jython/ast/Raise.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Raise.java 7 Sep 2006 13:48:14 -0000 1.3 --- Raise.java 7 Sep 2006 23:40:37 -0000 1.4 *************** *** 38,42 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(19, ostream); pickleThis(this.type, ostream); pickleThis(this.inst, ostream); --- 38,42 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(18, ostream); pickleThis(this.type, ostream); pickleThis(this.inst, ostream); Index: TryExcept.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/pydev/parser/jython/ast/TryExcept.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TryExcept.java 7 Sep 2006 13:48:14 -0000 1.3 --- TryExcept.java 7 Sep 2006 23:40:37 -0000 1.4 *************** *** 39,43 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(20, ostream); pickleThis(this.body, ostream); pickleThis(this.handlers, ostream); --- 39,43 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(19, ostream); pickleThis(this.body, ostream); pickleThis(this.handlers, ostream); Index: Global.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/pydev/parser/jython/ast/Global.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Global.java 7 Sep 2006 13:48:14 -0000 1.3 --- Global.java 7 Sep 2006 23:40:37 -0000 1.4 *************** *** 27,31 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(26, ostream); pickleThis(this.names, ostream); } --- 27,31 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(25, ostream); pickleThis(this.names, ostream); } |