[Pydev-cvs] org.python.pydev.parser/src/org/python/parser/ast UnaryOp.java,1.4,1.5 AugAssign.java,1.
Brought to you by:
fabioz
Update of /cvsroot/pydev/org.python.pydev.parser/src/org/python/parser/ast In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32305/src/org/python/parser/ast Modified Files: UnaryOp.java AugAssign.java While.java ImportFrom.java Python.asdl ListComp.java Attribute.java Yield.java Break.java Lambda.java Tuple.java Slice.java GeneratorExp.java Print.java Assert.java Import.java Repr.java Ellipsis.java Raise.java Pass.java ClassDef.java BinOp.java Exec.java Index.java TryExcept.java ExtSlice.java Global.java If.java Continue.java Call.java Delete.java FunctionDef.java suiteType.java Name.java Num.java Return.java Assign.java For.java Expr.java Str.java Dict.java Subscript.java BoolOp.java List.java Compare.java comprehensionType.java TryFinally.java Log Message: Index: AugAssign.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/parser/ast/AugAssign.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** AugAssign.java 5 Sep 2005 22:57:34 -0000 1.4 --- AugAssign.java 19 Feb 2006 13:34:55 -0000 1.5 *************** *** 38,42 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(12, ostream); pickleThis(this.target, ostream); pickleThis(this.op, ostream); --- 38,42 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(13, ostream); pickleThis(this.target, ostream); pickleThis(this.op, ostream); Index: Dict.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/parser/ast/Dict.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Dict.java 5 Sep 2005 22:57:34 -0000 1.4 --- Dict.java 19 Feb 2006 13:34:55 -0000 1.5 *************** *** 32,36 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(33, ostream); pickleThis(this.keys, ostream); pickleThis(this.values, ostream); --- 32,36 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(34, ostream); pickleThis(this.keys, ostream); pickleThis(this.values, ostream); Index: ListComp.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/parser/ast/ListComp.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ListComp.java 5 Sep 2005 22:57:34 -0000 1.4 --- ListComp.java 19 Feb 2006 13:34:55 -0000 1.5 *************** *** 33,37 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(34, ostream); pickleThis(this.elt, ostream); pickleThis(this.generators, ostream); --- 33,37 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(35, ostream); pickleThis(this.elt, ostream); pickleThis(this.generators, ostream); Index: Exec.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/parser/ast/Exec.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Exec.java 5 Sep 2005 22:57:34 -0000 1.4 --- Exec.java 19 Feb 2006 13:34:55 -0000 1.5 *************** *** 38,42 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(23, 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/parser/ast/Break.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Break.java 5 Sep 2005 22:57:34 -0000 1.4 --- Break.java 19 Feb 2006 13:34:55 -0000 1.5 *************** *** 23,27 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(27, ostream); } --- 23,27 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(28, ostream); } Index: suiteType.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/parser/ast/suiteType.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** suiteType.java 18 Feb 2006 12:02:54 -0000 1.1 --- suiteType.java 19 Feb 2006 13:34:55 -0000 1.2 *************** *** 27,31 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(51, ostream); pickleThis(this.body, ostream); } --- 27,31 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(6, ostream); pickleThis(this.body, ostream); } Index: Assert.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/parser/ast/Assert.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Assert.java 5 Sep 2005 22:57:34 -0000 1.4 --- Assert.java 19 Feb 2006 13:34:55 -0000 1.5 *************** *** 32,36 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(20, 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/parser/ast/Pass.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Pass.java 5 Sep 2005 22:57:34 -0000 1.4 --- Pass.java 19 Feb 2006 13:34:55 -0000 1.5 *************** *** 23,27 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(26, ostream); } --- 23,27 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(27, ostream); } Index: Compare.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/parser/ast/Compare.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Compare.java 5 Sep 2005 22:57:34 -0000 1.4 --- Compare.java 19 Feb 2006 13:34:55 -0000 1.5 *************** *** 38,42 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(36, ostream); pickleThis(this.left, ostream); pickleThis(this.ops, ostream); --- 38,42 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(37, ostream); pickleThis(this.left, ostream); pickleThis(this.ops, ostream); Index: Ellipsis.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/parser/ast/Ellipsis.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Ellipsis.java 5 Sep 2005 22:57:34 -0000 1.4 --- Ellipsis.java 19 Feb 2006 13:34:55 -0000 1.5 *************** *** 23,27 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(46, ostream); } --- 23,27 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(47, ostream); } Index: Continue.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/parser/ast/Continue.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Continue.java 5 Sep 2005 22:57:34 -0000 1.4 --- Continue.java 19 Feb 2006 13:34:55 -0000 1.5 *************** *** 23,27 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(28, ostream); } --- 23,27 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(29, ostream); } Index: ClassDef.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/parser/ast/ClassDef.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ClassDef.java 5 Sep 2005 22:57:34 -0000 1.4 --- ClassDef.java 19 Feb 2006 13:34:55 -0000 1.5 *************** *** 38,42 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(7, ostream); pickleThis(this.name, ostream); pickleThis(this.bases, ostream); --- 38,42 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(8, ostream); pickleThis(this.name, ostream); pickleThis(this.bases, ostream); Index: ExtSlice.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/parser/ast/ExtSlice.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ExtSlice.java 5 Sep 2005 22:57:34 -0000 1.4 --- ExtSlice.java 19 Feb 2006 13:34:55 -0000 1.5 *************** *** 27,31 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(48, ostream); pickleThis(this.dims, ostream); } --- 27,31 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(49, ostream); pickleThis(this.dims, ostream); } Index: FunctionDef.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/parser/ast/FunctionDef.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** FunctionDef.java 5 Sep 2005 22:57:34 -0000 1.5 --- FunctionDef.java 19 Feb 2006 13:34:55 -0000 1.6 *************** *** 44,48 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(6, ostream); pickleThis(this.name, ostream); pickleThis(this.args, ostream); --- 44,48 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(7, ostream); pickleThis(this.name, ostream); pickleThis(this.args, ostream); Index: Call.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/parser/ast/Call.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Call.java 5 Sep 2005 22:57:34 -0000 1.4 --- Call.java 19 Feb 2006 13:34:55 -0000 1.5 *************** *** 49,53 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(37, ostream); pickleThis(this.func, ostream); pickleThis(this.args, ostream); --- 49,53 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(38, ostream); pickleThis(this.func, ostream); pickleThis(this.args, ostream); Index: BinOp.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/parser/ast/BinOp.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** BinOp.java 5 Sep 2005 22:57:34 -0000 1.4 --- BinOp.java 19 Feb 2006 13:34:55 -0000 1.5 *************** *** 37,41 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(30, 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/parser/ast/TryFinally.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TryFinally.java 5 Sep 2005 22:57:34 -0000 1.4 --- TryFinally.java 19 Feb 2006 13:34:55 -0000 1.5 *************** *** 33,37 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(19, 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/parser/ast/ImportFrom.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ImportFrom.java 26 Sep 2005 01:18:57 -0000 1.5 --- ImportFrom.java 19 Feb 2006 13:34:55 -0000 1.6 *************** *** 33,37 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(22, 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: Str.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/parser/ast/Str.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Str.java 14 Feb 2006 00:22:27 -0000 1.5 --- Str.java 19 Feb 2006 13:34:55 -0000 1.6 *************** *** 43,47 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(40, ostream); pickleThis(this.s, ostream); pickleThis(this.type, ostream); --- 43,47 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(41, ostream); pickleThis(this.s, ostream); pickleThis(this.type, ostream); Index: Lambda.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/parser/ast/Lambda.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Lambda.java 5 Sep 2005 22:57:34 -0000 1.4 --- Lambda.java 19 Feb 2006 13:34:55 -0000 1.5 *************** *** 32,36 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(32, 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: If.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/parser/ast/If.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** If.java 5 Sep 2005 22:57:34 -0000 1.4 --- If.java 19 Feb 2006 13:34:55 -0000 1.5 *************** *** 38,42 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(16, ostream); pickleThis(this.test, ostream); pickleThis(this.body, ostream); --- 38,42 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(17, ostream); pickleThis(this.test, ostream); pickleThis(this.body, ostream); Index: Subscript.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/parser/ast/Subscript.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Subscript.java 5 Sep 2005 22:57:34 -0000 1.4 --- Subscript.java 19 Feb 2006 13:34:55 -0000 1.5 *************** *** 39,43 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(42, ostream); pickleThis(this.value, ostream); pickleThis(this.slice, ostream); --- 39,43 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(43, ostream); pickleThis(this.value, ostream); pickleThis(this.slice, ostream); Index: List.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/parser/ast/List.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** List.java 5 Sep 2005 22:57:34 -0000 1.4 --- List.java 19 Feb 2006 13:34:55 -0000 1.5 *************** *** 33,37 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(44, ostream); pickleThis(this.elts, ostream); pickleThis(this.ctx, ostream); --- 33,37 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(45, ostream); pickleThis(this.elts, ostream); pickleThis(this.ctx, ostream); Index: Index.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/parser/ast/Index.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Index.java 5 Sep 2005 22:57:34 -0000 1.4 --- Index.java 19 Feb 2006 13:34:55 -0000 1.5 *************** *** 27,31 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(49, ostream); pickleThis(this.value, ostream); } --- 27,31 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(50, ostream); pickleThis(this.value, ostream); } Index: Delete.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/parser/ast/Delete.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Delete.java 5 Sep 2005 22:57:34 -0000 1.4 --- Delete.java 19 Feb 2006 13:34:55 -0000 1.5 *************** *** 27,31 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(10, ostream); pickleThis(this.targets, ostream); } --- 27,31 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(11, ostream); pickleThis(this.targets, ostream); } Index: Expr.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/parser/ast/Expr.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Expr.java 5 Sep 2005 22:57:34 -0000 1.4 --- Expr.java 19 Feb 2006 13:34:55 -0000 1.5 *************** *** 27,31 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(25, ostream); pickleThis(this.value, ostream); } --- 27,31 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(26, ostream); pickleThis(this.value, ostream); } Index: Attribute.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/parser/ast/Attribute.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Attribute.java 26 Oct 2005 00:25:13 -0000 1.5 --- Attribute.java 19 Feb 2006 13:34:55 -0000 1.6 *************** *** 39,43 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(41, ostream); pickleThis(this.value, ostream); pickleThis(this.attr, ostream); --- 39,43 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(42, ostream); pickleThis(this.value, ostream); pickleThis(this.attr, ostream); Index: Tuple.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/parser/ast/Tuple.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Tuple.java 5 Sep 2005 22:57:34 -0000 1.4 --- Tuple.java 19 Feb 2006 13:34:55 -0000 1.5 *************** *** 33,37 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(45, ostream); pickleThis(this.elts, ostream); pickleThis(this.ctx, ostream); --- 33,37 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(46, ostream); pickleThis(this.elts, ostream); pickleThis(this.ctx, ostream); Index: Return.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/parser/ast/Return.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Return.java 5 Sep 2005 22:57:34 -0000 1.4 --- Return.java 19 Feb 2006 13:34:55 -0000 1.5 *************** *** 27,31 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(8, ostream); pickleThis(this.value, ostream); } --- 27,31 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(9, ostream); pickleThis(this.value, ostream); } Index: BoolOp.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/parser/ast/BoolOp.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** BoolOp.java 5 Sep 2005 22:57:34 -0000 1.4 --- BoolOp.java 19 Feb 2006 13:34:55 -0000 1.5 *************** *** 32,36 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(29, 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: Assign.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/parser/ast/Assign.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Assign.java 5 Sep 2005 22:57:34 -0000 1.4 --- Assign.java 19 Feb 2006 13:34:55 -0000 1.5 *************** *** 32,36 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(11, ostream); pickleThis(this.targets, ostream); pickleThis(this.value, ostream); --- 32,36 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(12, ostream); pickleThis(this.targets, ostream); pickleThis(this.value, ostream); Index: Print.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/parser/ast/Print.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Print.java 5 Sep 2005 22:57:34 -0000 1.4 --- Print.java 19 Feb 2006 13:34:55 -0000 1.5 *************** *** 38,42 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(13, ostream); pickleThis(this.dest, ostream); pickleThis(this.values, ostream); --- 38,42 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(14, ostream); pickleThis(this.dest, ostream); pickleThis(this.values, ostream); Index: For.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/parser/ast/For.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** For.java 5 Sep 2005 22:57:34 -0000 1.4 --- For.java 19 Feb 2006 13:34:55 -0000 1.5 *************** *** 44,48 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(14, ostream); pickleThis(this.target, ostream); pickleThis(this.iter, ostream); --- 44,48 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(15, ostream); pickleThis(this.target, ostream); pickleThis(this.iter, ostream); Index: Name.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/parser/ast/Name.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Name.java 5 Sep 2005 22:57:34 -0000 1.4 --- Name.java 19 Feb 2006 13:34:55 -0000 1.5 *************** *** 33,37 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(43, ostream); pickleThis(this.id, ostream); pickleThis(this.ctx, ostream); --- 33,37 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(44, ostream); pickleThis(this.id, ostream); pickleThis(this.ctx, ostream); Index: Num.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/parser/ast/Num.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Num.java 5 Sep 2005 22:57:34 -0000 1.4 --- Num.java 19 Feb 2006 13:34:55 -0000 1.5 *************** *** 27,31 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(39, ostream); pickleThis(this.n, ostream); } --- 27,31 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(40, ostream); pickleThis(this.n, ostream); } Index: comprehensionType.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/parser/ast/comprehensionType.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** comprehensionType.java 5 Sep 2005 22:57:34 -0000 1.2 --- comprehensionType.java 19 Feb 2006 13:34:55 -0000 1.3 *************** *** 39,43 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(50, ostream); pickleThis(this.target, ostream); pickleThis(this.iter, ostream); --- 39,43 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(51, ostream); pickleThis(this.target, ostream); pickleThis(this.iter, ostream); Index: While.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/parser/ast/While.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** While.java 5 Sep 2005 22:57:34 -0000 1.4 --- While.java 19 Feb 2006 13:34:55 -0000 1.5 *************** *** 8,14 **** public exprType test; public stmtType[] body; ! public stmtType[] orelse; ! public While(exprType test, stmtType[] body, stmtType[] orelse) { this.test = test; this.body = body; --- 8,14 ---- public exprType test; public stmtType[] body; ! public suiteType orelse; ! public While(exprType test, stmtType[] body, suiteType orelse) { this.test = test; this.body = body; *************** *** 16,20 **** } ! public While(exprType test, stmtType[] body, stmtType[] orelse, SimpleNode parent) { this(test, body, orelse); --- 16,20 ---- } ! public While(exprType test, stmtType[] body, suiteType orelse, SimpleNode parent) { this(test, body, orelse); *************** *** 38,42 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(15, ostream); pickleThis(this.test, ostream); pickleThis(this.body, ostream); --- 38,42 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(16, ostream); pickleThis(this.test, ostream); pickleThis(this.body, ostream); *************** *** 57,66 **** } } ! if (orelse != null) { ! for (int i = 0; i < orelse.length; i++) { ! if (orelse[i] != null) ! orelse[i].accept(visitor); ! } ! } } --- 57,62 ---- } } ! if (orelse != null) ! orelse.accept(visitor); } Index: Global.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/parser/ast/Global.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Global.java 5 Sep 2005 22:57:34 -0000 1.4 --- Global.java 19 Feb 2006 13:34:55 -0000 1.5 *************** *** 27,31 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(24, ostream); pickleThis(this.names, ostream); } --- 27,31 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(25, ostream); pickleThis(this.names, ostream); } Index: Repr.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/parser/ast/Repr.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Repr.java 5 Sep 2005 22:57:34 -0000 1.4 --- Repr.java 19 Feb 2006 13:34:55 -0000 1.5 *************** *** 27,31 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(38, ostream); pickleThis(this.value, ostream); } --- 27,31 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(39, ostream); pickleThis(this.value, ostream); } Index: Python.asdl =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/parser/ast/Python.asdl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Python.asdl 18 Feb 2006 12:02:54 -0000 1.7 --- Python.asdl 19 Feb 2006 13:34:55 -0000 1.8 *************** *** 14,17 **** --- 14,21 ---- name_context = ClassName | FunctionName | KeywordName | ImportName | VarArg | KwArg | ImportModule | Attrib + -- the body is an array of statements (this is not used for all constructs because initially the suite was 'inlined' + -- in the constructs, but some information was lost in this way). + suite = (stmt* body) + stmt = FunctionDef(NameTok name, arguments args, stmt* body, decorators* decs) *************** *** 28,32 **** -- use 'orelse' because else is a keyword in target languages | For(expr target, expr iter, stmt* body, stmt* orelse) ! | While(expr test, stmt* body, stmt* orelse) | If(expr test, stmt* body, stmt* orelse) --- 32,36 ---- -- use 'orelse' because else is a keyword in target languages | For(expr target, expr iter, stmt* body, stmt* orelse) ! | While(expr test, stmt* body, suite orelse) | If(expr test, stmt* body, stmt* orelse) *************** *** 98,103 **** -- not sure what to call the first argument for raise and except - - suite = (stmt* body) excepthandler = (expr? type, expr? name, stmt* body) --- 102,105 ---- Index: Import.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/parser/ast/Import.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Import.java 5 Sep 2005 22:57:34 -0000 1.4 --- Import.java 19 Feb 2006 13:34:55 -0000 1.5 *************** *** 27,31 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(21, ostream); pickleThis(this.names, ostream); } --- 27,31 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(22, ostream); pickleThis(this.names, ostream); } Index: UnaryOp.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/parser/ast/UnaryOp.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** UnaryOp.java 5 Sep 2005 22:57:34 -0000 1.4 --- UnaryOp.java 19 Feb 2006 13:34:55 -0000 1.5 *************** *** 32,36 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(31, 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/parser/ast/Raise.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Raise.java 5 Sep 2005 22:57:34 -0000 1.4 --- Raise.java 19 Feb 2006 13:34:55 -0000 1.5 *************** *** 38,42 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(17, 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/parser/ast/TryExcept.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** TryExcept.java 18 Feb 2006 12:02:54 -0000 1.5 --- TryExcept.java 19 Feb 2006 13:34:55 -0000 1.6 *************** *** 39,43 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(18, 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: GeneratorExp.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/parser/ast/GeneratorExp.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GeneratorExp.java 5 Sep 2005 22:57:34 -0000 1.2 --- GeneratorExp.java 19 Feb 2006 13:34:55 -0000 1.3 *************** *** 33,37 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(35, ostream); pickleThis(this.elt, ostream); pickleThis(this.generators, ostream); --- 33,37 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(36, ostream); pickleThis(this.elt, ostream); pickleThis(this.generators, ostream); Index: Slice.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/parser/ast/Slice.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Slice.java 5 Sep 2005 22:57:34 -0000 1.4 --- Slice.java 19 Feb 2006 13:34:55 -0000 1.5 *************** *** 38,42 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(47, ostream); pickleThis(this.lower, ostream); pickleThis(this.upper, ostream); --- 38,42 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(48, ostream); pickleThis(this.lower, ostream); pickleThis(this.upper, ostream); Index: Yield.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/parser/ast/Yield.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Yield.java 5 Sep 2005 22:57:34 -0000 1.4 --- Yield.java 19 Feb 2006 13:34:55 -0000 1.5 *************** *** 27,31 **** public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(9, ostream); pickleThis(this.value, ostream); } --- 27,31 ---- public void pickle(DataOutputStream ostream) throws IOException { ! pickleThis(10, ostream); pickleThis(this.value, ostream); } |