[Jython-checkins] SF.net SVN: jython:[5686] branches/astwrite

[<fwi...@us...>]

Revision: 5686
          http://jython.svn.sourceforge.net/jython/?rev=5686&view=rev
Author:   fwierzbicki
Date:     2008-12-03 21:42:59 +0000 (Wed, 03 Dec 2008)

Log Message:
-----------
Only 2 fails left in 2.6 version of test_ast.py.

Modified Paths:
--------------
    branches/astwrite/Lib/ast.py
    branches/astwrite/Lib/test/test_ast.py
    branches/astwrite/ast/asdl_antlr.py
    branches/astwrite/src/org/python/antlr/adapter/AstAdapters.java
    branches/astwrite/src/org/python/antlr/adapter/ExprAdapter.java
    branches/astwrite/src/org/python/antlr/ast/Assert.java
    branches/astwrite/src/org/python/antlr/ast/Assign.java
    branches/astwrite/src/org/python/antlr/ast/AstModule.java
    branches/astwrite/src/org/python/antlr/ast/Attribute.java
    branches/astwrite/src/org/python/antlr/ast/AugAssign.java
    branches/astwrite/src/org/python/antlr/ast/BinOp.java
    branches/astwrite/src/org/python/antlr/ast/BoolOp.java
    branches/astwrite/src/org/python/antlr/ast/Break.java
    branches/astwrite/src/org/python/antlr/ast/Call.java
    branches/astwrite/src/org/python/antlr/ast/ClassDef.java
    branches/astwrite/src/org/python/antlr/ast/Compare.java
    branches/astwrite/src/org/python/antlr/ast/Continue.java
    branches/astwrite/src/org/python/antlr/ast/Delete.java
    branches/astwrite/src/org/python/antlr/ast/Dict.java
    branches/astwrite/src/org/python/antlr/ast/Ellipsis.java
    branches/astwrite/src/org/python/antlr/ast/ExceptHandler.java
    branches/astwrite/src/org/python/antlr/ast/Exec.java
    branches/astwrite/src/org/python/antlr/ast/Expr.java
    branches/astwrite/src/org/python/antlr/ast/Expression.java
    branches/astwrite/src/org/python/antlr/ast/ExtSlice.java
    branches/astwrite/src/org/python/antlr/ast/For.java
    branches/astwrite/src/org/python/antlr/ast/FunctionDef.java
    branches/astwrite/src/org/python/antlr/ast/GeneratorExp.java
    branches/astwrite/src/org/python/antlr/ast/Global.java
    branches/astwrite/src/org/python/antlr/ast/If.java
    branches/astwrite/src/org/python/antlr/ast/IfExp.java
    branches/astwrite/src/org/python/antlr/ast/Import.java
    branches/astwrite/src/org/python/antlr/ast/ImportFrom.java
    branches/astwrite/src/org/python/antlr/ast/Index.java
    branches/astwrite/src/org/python/antlr/ast/Interactive.java
    branches/astwrite/src/org/python/antlr/ast/Lambda.java
    branches/astwrite/src/org/python/antlr/ast/List.java
    branches/astwrite/src/org/python/antlr/ast/ListComp.java
    branches/astwrite/src/org/python/antlr/ast/Module.java
    branches/astwrite/src/org/python/antlr/ast/Name.java
    branches/astwrite/src/org/python/antlr/ast/Num.java
    branches/astwrite/src/org/python/antlr/ast/Pass.java
    branches/astwrite/src/org/python/antlr/ast/Print.java
    branches/astwrite/src/org/python/antlr/ast/Raise.java
    branches/astwrite/src/org/python/antlr/ast/Repr.java
    branches/astwrite/src/org/python/antlr/ast/Return.java
    branches/astwrite/src/org/python/antlr/ast/Slice.java
    branches/astwrite/src/org/python/antlr/ast/Str.java
    branches/astwrite/src/org/python/antlr/ast/Subscript.java
    branches/astwrite/src/org/python/antlr/ast/Suite.java
    branches/astwrite/src/org/python/antlr/ast/TryExcept.java
    branches/astwrite/src/org/python/antlr/ast/TryFinally.java
    branches/astwrite/src/org/python/antlr/ast/Tuple.java
    branches/astwrite/src/org/python/antlr/ast/UnaryOp.java
    branches/astwrite/src/org/python/antlr/ast/VisitorBase.java
    branches/astwrite/src/org/python/antlr/ast/While.java
    branches/astwrite/src/org/python/antlr/ast/With.java
    branches/astwrite/src/org/python/antlr/ast/Yield.java
    branches/astwrite/src/org/python/antlr/ast/aliasType.java
    branches/astwrite/src/org/python/antlr/ast/argumentsType.java
    branches/astwrite/src/org/python/antlr/ast/comprehensionType.java
    branches/astwrite/src/org/python/antlr/ast/excepthandlerType.java
    branches/astwrite/src/org/python/antlr/ast/exprType.java
    branches/astwrite/src/org/python/antlr/ast/keywordType.java
    branches/astwrite/src/org/python/antlr/ast/modType.java
    branches/astwrite/src/org/python/antlr/ast/sliceType.java
    branches/astwrite/src/org/python/antlr/ast/stmtType.java
    branches/astwrite/src/org/python/core/AstList.java

Modified: branches/astwrite/Lib/ast.py
===================================================================
--- branches/astwrite/Lib/ast.py	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/Lib/ast.py	2008-12-03 21:42:59 UTC (rev 5686)
@@ -32,7 +32,7 @@
 if sys.platform.startswith('java'):
     import java.util.List
 
-    ast_list = java.util.List
+    ast_list = astlist
         
     def get_class_name(t):
         result = t.__class__.__name__

Modified: branches/astwrite/Lib/test/test_ast.py
===================================================================
--- branches/astwrite/Lib/test/test_ast.py	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/Lib/test/test_ast.py	2008-12-03 21:42:59 UTC (rev 5686)
@@ -253,10 +253,10 @@
         node = ast.parse("spam(23, 42, eggs='leek')", mode='eval')
         self.assertEqual(len(list(ast.iter_child_nodes(node.body))), 4)
         iterator = ast.iter_child_nodes(node.body)
-        self.assertEqual(next(iterator).id, 'spam')
-        self.assertEqual(next(iterator).n, 23)
-        self.assertEqual(next(iterator).n, 42)
-        self.assertEqual(ast.dump(next(iterator)),
+        self.assertEqual(iterator.next().id, 'spam')
+        self.assertEqual(iterator.next().n, 23)
+        self.assertEqual(iterator.next().n, 42)
+        self.assertEqual(ast.dump(iterator.next()),
             "keyword(arg='eggs', value=Str(s='leek'))"
         )
 

Modified: branches/astwrite/ast/asdl_antlr.py
===================================================================
--- branches/astwrite/ast/asdl_antlr.py	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/ast/asdl_antlr.py	2008-12-03 21:42:59 UTC (rev 5686)
@@ -61,6 +61,7 @@
             print >> self.file, 'import org.python.antlr.AST;'
             print >> self.file, 'import org.python.antlr.PythonTree;'
             print >> self.file, 'import org.python.antlr.adapter.AstAdapters;'
+            print >> self.file, 'import org.python.core.ArgParser;'
             print >> self.file, 'import org.python.core.AstList;'
             print >> self.file, 'import org.python.core.Py;'
             print >> self.file, 'import org.python.core.PyObject;'
@@ -463,9 +464,19 @@
             self.emit("super(subType);", depth + 1)
             self.emit("}", depth)
 
+            fpargs = ", ".join(['"%s"' % f.name for f in fields])
             self.emit("@ExposedNew", depth)
             self.emit("@ExposedMethod", depth)
-            self.emit("public void %s___init__(PyObject[] args, String[] keywords) {}" % ctorname, depth)
+            self.emit("public void %s___init__(PyObject[] args, String[] keywords) {" % ctorname, depth)
+            self.emit('ArgParser ap = new ArgParser("%s", args, keywords, new String[]' % ctorname, depth + 1)
+            self.emit('{%s}, %s);' % (fpargs, len(fields)), depth + 2)
+            i = 0
+            for f in fields:
+                self.emit("set%s(ap.getPyObject(%s));" % (str(f.name).capitalize(),
+                    str(i)), depth+1)
+                i += 1
+            self.emit("}", depth)
+            self.emit("", 0)
 
             fpargs = ", ".join(["PyObject %s" % f.name for f in fields])
             self.emit("public %s(%s) {" % (ctorname, fpargs), depth)

Modified: branches/astwrite/src/org/python/antlr/adapter/AstAdapters.java
===================================================================
--- branches/astwrite/src/org/python/antlr/adapter/AstAdapters.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/adapter/AstAdapters.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -101,11 +101,9 @@
         return (stmtType)stmtAdapter.py2ast(o);
     }
 
-    public static String py2string(Object o) {
-        if (o == null || o instanceof String) {
-            return (String)o;
-        } else if (o instanceof PyString) {
-            return ((PyObject)o).toString();
+    public static Object py2string(Object o) {
+        if (o == null || o instanceof PyString) {
+            return o;
         }
         //FIXME: investigate the right exception
         throw Py.TypeError("Can't convert " + o.getClass().getName() + " to string node");

Modified: branches/astwrite/src/org/python/antlr/adapter/ExprAdapter.java
===================================================================
--- branches/astwrite/src/org/python/antlr/adapter/ExprAdapter.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/adapter/ExprAdapter.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -20,15 +20,14 @@
 public class ExprAdapter implements AstAdapter {
         
     public Object py2ast(PyObject o) {
-        if (o == null) {
+        if (o == null || o instanceof exprType) {
             return o;
-        }
-        if (o instanceof exprType) {
-            return o;
         } else if (o instanceof PyInteger || o instanceof PyLong || o instanceof PyFloat || o instanceof PyComplex) {
             return new Num(o);
         } else if (o instanceof PyString || o instanceof PyUnicode) {
             return new Str(o);
+        } else if (o == Py.None) {
+            return null;
         }
 
         //FIXME: investigate the right exception

Modified: branches/astwrite/src/org/python/antlr/ast/Assert.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Assert.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/Assert.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -5,6 +5,7 @@
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
+import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -67,7 +68,13 @@
     }
     @ExposedNew
     @ExposedMethod
-    public void Assert___init__(PyObject[] args, String[] keywords) {}
+    public void Assert___init__(PyObject[] args, String[] keywords) {
+        ArgParser ap = new ArgParser("Assert", args, keywords, new String[]
+            {"test", "msg"}, 2);
+        setTest(ap.getPyObject(0));
+        setMsg(ap.getPyObject(1));
+    }
+
     public Assert(PyObject test, PyObject msg) {
         setTest(test);
         setMsg(msg);

Modified: branches/astwrite/src/org/python/antlr/ast/Assign.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Assign.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/Assign.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -5,6 +5,7 @@
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
+import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -67,7 +68,13 @@
     }
     @ExposedNew
     @ExposedMethod
-    public void Assign___init__(PyObject[] args, String[] keywords) {}
+    public void Assign___init__(PyObject[] args, String[] keywords) {
+        ArgParser ap = new ArgParser("Assign", args, keywords, new String[]
+            {"targets", "value"}, 2);
+        setTargets(ap.getPyObject(0));
+        setValue(ap.getPyObject(1));
+    }
+
     public Assign(PyObject targets, PyObject value) {
         setTargets(targets);
         setValue(value);

Modified: branches/astwrite/src/org/python/antlr/ast/AstModule.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/AstModule.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/AstModule.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -1,5 +1,6 @@
 package org.python.antlr.ast;
 
+import org.python.core.AstList;
 import org.python.core.ClassDictInit;
 import org.python.core.imp;
 import org.python.core.Py;
@@ -22,6 +23,8 @@
         dict.__setitem__("__version__", new PyString("62047"));
         dict.__setitem__("PyCF_ONLY_AST", new PyInteger(PyTableCode.PyCF_ONLY_AST));
 
+        dict.__setitem__("astlist", AstList.TYPE);
+
         dict.__setitem__("AST", AST.TYPE);
         dict.__setitem__("Module", Module.TYPE);
         dict.__setitem__("Assert", Assert.TYPE);

Modified: branches/astwrite/src/org/python/antlr/ast/Attribute.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Attribute.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/Attribute.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -5,6 +5,7 @@
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
+import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -81,7 +82,14 @@
     }
     @ExposedNew
     @ExposedMethod
-    public void Attribute___init__(PyObject[] args, String[] keywords) {}
+    public void Attribute___init__(PyObject[] args, String[] keywords) {
+        ArgParser ap = new ArgParser("Attribute", args, keywords, new String[]
+            {"value", "attr", "ctx"}, 3);
+        setValue(ap.getPyObject(0));
+        setAttr(ap.getPyObject(1));
+        setCtx(ap.getPyObject(2));
+    }
+
     public Attribute(PyObject value, PyObject attr, PyObject ctx) {
         setValue(value);
         setAttr(attr);

Modified: branches/astwrite/src/org/python/antlr/ast/AugAssign.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/AugAssign.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/AugAssign.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -5,6 +5,7 @@
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
+import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -80,7 +81,14 @@
     }
     @ExposedNew
     @ExposedMethod
-    public void AugAssign___init__(PyObject[] args, String[] keywords) {}
+    public void AugAssign___init__(PyObject[] args, String[] keywords) {
+        ArgParser ap = new ArgParser("AugAssign", args, keywords, new String[]
+            {"target", "op", "value"}, 3);
+        setTarget(ap.getPyObject(0));
+        setOp(ap.getPyObject(1));
+        setValue(ap.getPyObject(2));
+    }
+
     public AugAssign(PyObject target, PyObject op, PyObject value) {
         setTarget(target);
         setOp(op);

Modified: branches/astwrite/src/org/python/antlr/ast/BinOp.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/BinOp.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/BinOp.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -5,6 +5,7 @@
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
+import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -80,7 +81,14 @@
     }
     @ExposedNew
     @ExposedMethod
-    public void BinOp___init__(PyObject[] args, String[] keywords) {}
+    public void BinOp___init__(PyObject[] args, String[] keywords) {
+        ArgParser ap = new ArgParser("BinOp", args, keywords, new String[]
+            {"left", "op", "right"}, 3);
+        setLeft(ap.getPyObject(0));
+        setOp(ap.getPyObject(1));
+        setRight(ap.getPyObject(2));
+    }
+
     public BinOp(PyObject left, PyObject op, PyObject right) {
         setLeft(left);
         setOp(op);

Modified: branches/astwrite/src/org/python/antlr/ast/BoolOp.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/BoolOp.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/BoolOp.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -5,6 +5,7 @@
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
+import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -67,7 +68,13 @@
     }
     @ExposedNew
     @ExposedMethod
-    public void BoolOp___init__(PyObject[] args, String[] keywords) {}
+    public void BoolOp___init__(PyObject[] args, String[] keywords) {
+        ArgParser ap = new ArgParser("BoolOp", args, keywords, new String[]
+            {"op", "values"}, 2);
+        setOp(ap.getPyObject(0));
+        setValues(ap.getPyObject(1));
+    }
+
     public BoolOp(PyObject op, PyObject values) {
         setOp(op);
         setValues(values);

Modified: branches/astwrite/src/org/python/antlr/ast/Break.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Break.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/Break.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -5,6 +5,7 @@
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
+import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;

Modified: branches/astwrite/src/org/python/antlr/ast/Call.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Call.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/Call.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -5,6 +5,7 @@
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
+import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -107,7 +108,16 @@
     }
     @ExposedNew
     @ExposedMethod
-    public void Call___init__(PyObject[] args, String[] keywords) {}
+    public void Call___init__(PyObject[] args, String[] keywords) {
+        ArgParser ap = new ArgParser("Call", args, keywords, new String[]
+            {"func", "args", "keywords", "starargs", "kwargs"}, 5);
+        setFunc(ap.getPyObject(0));
+        setArgs(ap.getPyObject(1));
+        setKeywords(ap.getPyObject(2));
+        setStarargs(ap.getPyObject(3));
+        setKwargs(ap.getPyObject(4));
+    }
+
     public Call(PyObject func, PyObject args, PyObject keywords, PyObject starargs, PyObject
     kwargs) {
         setFunc(func);

Modified: branches/astwrite/src/org/python/antlr/ast/ClassDef.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/ClassDef.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/ClassDef.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -5,6 +5,7 @@
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
+import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -95,7 +96,15 @@
     }
     @ExposedNew
     @ExposedMethod
-    public void ClassDef___init__(PyObject[] args, String[] keywords) {}
+    public void ClassDef___init__(PyObject[] args, String[] keywords) {
+        ArgParser ap = new ArgParser("ClassDef", args, keywords, new String[]
+            {"name", "bases", "body", "decorator_list"}, 4);
+        setName(ap.getPyObject(0));
+        setBases(ap.getPyObject(1));
+        setBody(ap.getPyObject(2));
+        setDecorator_list(ap.getPyObject(3));
+    }
+
     public ClassDef(PyObject name, PyObject bases, PyObject body, PyObject decorator_list) {
         setName(name);
         setBases(bases);

Modified: branches/astwrite/src/org/python/antlr/ast/Compare.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Compare.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/Compare.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -5,6 +5,7 @@
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
+import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -80,7 +81,14 @@
     }
     @ExposedNew
     @ExposedMethod
-    public void Compare___init__(PyObject[] args, String[] keywords) {}
+    public void Compare___init__(PyObject[] args, String[] keywords) {
+        ArgParser ap = new ArgParser("Compare", args, keywords, new String[]
+            {"left", "ops", "comparators"}, 3);
+        setLeft(ap.getPyObject(0));
+        setOps(ap.getPyObject(1));
+        setComparators(ap.getPyObject(2));
+    }
+
     public Compare(PyObject left, PyObject ops, PyObject comparators) {
         setLeft(left);
         setOps(ops);

Modified: branches/astwrite/src/org/python/antlr/ast/Continue.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Continue.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/Continue.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -5,6 +5,7 @@
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
+import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;

Modified: branches/astwrite/src/org/python/antlr/ast/Delete.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Delete.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/Delete.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -5,6 +5,7 @@
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
+import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -54,7 +55,12 @@
     }
     @ExposedNew
     @ExposedMethod
-    public void Delete___init__(PyObject[] args, String[] keywords) {}
+    public void Delete___init__(PyObject[] args, String[] keywords) {
+        ArgParser ap = new ArgParser("Delete", args, keywords, new String[]
+            {"targets"}, 1);
+        setTargets(ap.getPyObject(0));
+    }
+
     public Delete(PyObject targets) {
         setTargets(targets);
     }

Modified: branches/astwrite/src/org/python/antlr/ast/Dict.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Dict.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/Dict.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -5,6 +5,7 @@
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
+import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -67,7 +68,13 @@
     }
     @ExposedNew
     @ExposedMethod
-    public void Dict___init__(PyObject[] args, String[] keywords) {}
+    public void Dict___init__(PyObject[] args, String[] keywords) {
+        ArgParser ap = new ArgParser("Dict", args, keywords, new String[]
+            {"keys", "values"}, 2);
+        setKeys(ap.getPyObject(0));
+        setValues(ap.getPyObject(1));
+    }
+
     public Dict(PyObject keys, PyObject values) {
         setKeys(keys);
         setValues(values);

Modified: branches/astwrite/src/org/python/antlr/ast/Ellipsis.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Ellipsis.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/Ellipsis.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -5,6 +5,7 @@
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
+import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;

Modified: branches/astwrite/src/org/python/antlr/ast/ExceptHandler.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/ExceptHandler.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/ExceptHandler.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -5,6 +5,7 @@
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
+import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -80,7 +81,14 @@
     }
     @ExposedNew
     @ExposedMethod
-    public void ExceptHandler___init__(PyObject[] args, String[] keywords) {}
+    public void ExceptHandler___init__(PyObject[] args, String[] keywords) {
+        ArgParser ap = new ArgParser("ExceptHandler", args, keywords, new String[]
+            {"excepttype", "name", "body"}, 3);
+        setExcepttype(ap.getPyObject(0));
+        setName(ap.getPyObject(1));
+        setBody(ap.getPyObject(2));
+    }
+
     public ExceptHandler(PyObject excepttype, PyObject name, PyObject body) {
         setExcepttype(excepttype);
         setName(name);

Modified: branches/astwrite/src/org/python/antlr/ast/Exec.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Exec.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/Exec.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -5,6 +5,7 @@
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
+import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -80,7 +81,14 @@
     }
     @ExposedNew
     @ExposedMethod
-    public void Exec___init__(PyObject[] args, String[] keywords) {}
+    public void Exec___init__(PyObject[] args, String[] keywords) {
+        ArgParser ap = new ArgParser("Exec", args, keywords, new String[]
+            {"body", "globals", "locals"}, 3);
+        setBody(ap.getPyObject(0));
+        setGlobals(ap.getPyObject(1));
+        setLocals(ap.getPyObject(2));
+    }
+
     public Exec(PyObject body, PyObject globals, PyObject locals) {
         setBody(body);
         setGlobals(globals);

Modified: branches/astwrite/src/org/python/antlr/ast/Expr.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Expr.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/Expr.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -5,6 +5,7 @@
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
+import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -54,7 +55,12 @@
     }
     @ExposedNew
     @ExposedMethod
-    public void Expr___init__(PyObject[] args, String[] keywords) {}
+    public void Expr___init__(PyObject[] args, String[] keywords) {
+        ArgParser ap = new ArgParser("Expr", args, keywords, new String[]
+            {"value"}, 1);
+        setValue(ap.getPyObject(0));
+    }
+
     public Expr(PyObject value) {
         setValue(value);
     }

Modified: branches/astwrite/src/org/python/antlr/ast/Expression.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Expression.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/Expression.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -5,6 +5,7 @@
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
+import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -53,7 +54,12 @@
     }
     @ExposedNew
     @ExposedMethod
-    public void Expression___init__(PyObject[] args, String[] keywords) {}
+    public void Expression___init__(PyObject[] args, String[] keywords) {
+        ArgParser ap = new ArgParser("Expression", args, keywords, new String[]
+            {"body"}, 1);
+        setBody(ap.getPyObject(0));
+    }
+
     public Expression(PyObject body) {
         setBody(body);
     }

Modified: branches/astwrite/src/org/python/antlr/ast/ExtSlice.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/ExtSlice.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/ExtSlice.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -5,6 +5,7 @@
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
+import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -53,7 +54,12 @@
     }
     @ExposedNew
     @ExposedMethod
-    public void ExtSlice___init__(PyObject[] args, String[] keywords) {}
+    public void ExtSlice___init__(PyObject[] args, String[] keywords) {
+        ArgParser ap = new ArgParser("ExtSlice", args, keywords, new String[]
+            {"dims"}, 1);
+        setDims(ap.getPyObject(0));
+    }
+
     public ExtSlice(PyObject dims) {
         setDims(dims);
     }

Modified: branches/astwrite/src/org/python/antlr/ast/For.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/For.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/For.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -5,6 +5,7 @@
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
+import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -94,7 +95,15 @@
     }
     @ExposedNew
     @ExposedMethod
-    public void For___init__(PyObject[] args, String[] keywords) {}
+    public void For___init__(PyObject[] args, String[] keywords) {
+        ArgParser ap = new ArgParser("For", args, keywords, new String[]
+            {"target", "iter", "body", "orelse"}, 4);
+        setTarget(ap.getPyObject(0));
+        setIter(ap.getPyObject(1));
+        setBody(ap.getPyObject(2));
+        setOrelse(ap.getPyObject(3));
+    }
+
     public For(PyObject target, PyObject iter, PyObject body, PyObject orelse) {
         setTarget(target);
         setIter(iter);

Modified: branches/astwrite/src/org/python/antlr/ast/FunctionDef.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/FunctionDef.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/FunctionDef.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -5,6 +5,7 @@
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
+import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -95,7 +96,15 @@
     }
     @ExposedNew
     @ExposedMethod
-    public void FunctionDef___init__(PyObject[] args, String[] keywords) {}
+    public void FunctionDef___init__(PyObject[] args, String[] keywords) {
+        ArgParser ap = new ArgParser("FunctionDef", args, keywords, new String[]
+            {"name", "args", "body", "decorator_list"}, 4);
+        setName(ap.getPyObject(0));
+        setArgs(ap.getPyObject(1));
+        setBody(ap.getPyObject(2));
+        setDecorator_list(ap.getPyObject(3));
+    }
+
     public FunctionDef(PyObject name, PyObject args, PyObject body, PyObject decorator_list) {
         setName(name);
         setArgs(args);

Modified: branches/astwrite/src/org/python/antlr/ast/GeneratorExp.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/GeneratorExp.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/GeneratorExp.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -5,6 +5,7 @@
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
+import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -67,7 +68,13 @@
     }
     @ExposedNew
     @ExposedMethod
-    public void GeneratorExp___init__(PyObject[] args, String[] keywords) {}
+    public void GeneratorExp___init__(PyObject[] args, String[] keywords) {
+        ArgParser ap = new ArgParser("GeneratorExp", args, keywords, new String[]
+            {"elt", "generators"}, 2);
+        setElt(ap.getPyObject(0));
+        setGenerators(ap.getPyObject(1));
+    }
+
     public GeneratorExp(PyObject elt, PyObject generators) {
         setElt(elt);
         setGenerators(generators);

Modified: branches/astwrite/src/org/python/antlr/ast/Global.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Global.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/Global.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -5,6 +5,7 @@
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
+import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -54,7 +55,12 @@
     }
     @ExposedNew
     @ExposedMethod
-    public void Global___init__(PyObject[] args, String[] keywords) {}
+    public void Global___init__(PyObject[] args, String[] keywords) {
+        ArgParser ap = new ArgParser("Global", args, keywords, new String[]
+            {"names"}, 1);
+        setNames(ap.getPyObject(0));
+    }
+
     public Global(PyObject names) {
         setNames(names);
     }

Modified: branches/astwrite/src/org/python/antlr/ast/If.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/If.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/If.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -5,6 +5,7 @@
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
+import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -80,7 +81,14 @@
     }
     @ExposedNew
     @ExposedMethod
-    public void If___init__(PyObject[] args, String[] keywords) {}
+    public void If___init__(PyObject[] args, String[] keywords) {
+        ArgParser ap = new ArgParser("If", args, keywords, new String[]
+            {"test", "body", "orelse"}, 3);
+        setTest(ap.getPyObject(0));
+        setBody(ap.getPyObject(1));
+        setOrelse(ap.getPyObject(2));
+    }
+
     public If(PyObject test, PyObject body, PyObject orelse) {
         setTest(test);
         setBody(body);

Modified: branches/astwrite/src/org/python/antlr/ast/IfExp.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/IfExp.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/IfExp.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -5,6 +5,7 @@
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
+import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -80,7 +81,14 @@
     }
     @ExposedNew
     @ExposedMethod
-    public void IfExp___init__(PyObject[] args, String[] keywords) {}
+    public void IfExp___init__(PyObject[] args, String[] keywords) {
+        ArgParser ap = new ArgParser("IfExp", args, keywords, new String[]
+            {"test", "body", "orelse"}, 3);
+        setTest(ap.getPyObject(0));
+        setBody(ap.getPyObject(1));
+        setOrelse(ap.getPyObject(2));
+    }
+
     public IfExp(PyObject test, PyObject body, PyObject orelse) {
         setTest(test);
         setBody(body);

Modified: branches/astwrite/src/org/python/antlr/ast/Import.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Import.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/Import.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -5,6 +5,7 @@
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
+import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -54,7 +55,12 @@
     }
     @ExposedNew
     @ExposedMethod
-    public void Import___init__(PyObject[] args, String[] keywords) {}
+    public void Import___init__(PyObject[] args, String[] keywords) {
+        ArgParser ap = new ArgParser("Import", args, keywords, new String[]
+            {"names"}, 1);
+        setNames(ap.getPyObject(0));
+    }
+
     public Import(PyObject names) {
         setNames(names);
     }

Modified: branches/astwrite/src/org/python/antlr/ast/ImportFrom.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/ImportFrom.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/ImportFrom.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -5,6 +5,7 @@
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
+import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -81,7 +82,14 @@
     }
     @ExposedNew
     @ExposedMethod
-    public void ImportFrom___init__(PyObject[] args, String[] keywords) {}
+    public void ImportFrom___init__(PyObject[] args, String[] keywords) {
+        ArgParser ap = new ArgParser("ImportFrom", args, keywords, new String[]
+            {"module", "names", "level"}, 3);
+        setModule(ap.getPyObject(0));
+        setNames(ap.getPyObject(1));
+        setLevel(ap.getPyObject(2));
+    }
+
     public ImportFrom(PyObject module, PyObject names, PyObject level) {
         setModule(module);
         setNames(names);

Modified: branches/astwrite/src/org/python/antlr/ast/Index.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Index.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/Index.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -5,6 +5,7 @@
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
+import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -53,7 +54,12 @@
     }
     @ExposedNew
     @ExposedMethod
-    public void Index___init__(PyObject[] args, String[] keywords) {}
+    public void Index___init__(PyObject[] args, String[] keywords) {
+        ArgParser ap = new ArgParser("Index", args, keywords, new String[]
+            {"value"}, 1);
+        setValue(ap.getPyObject(0));
+    }
+
     public Index(PyObject value) {
         setValue(value);
     }

Modified: branches/astwrite/src/org/python/antlr/ast/Interactive.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Interactive.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/Interactive.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -5,6 +5,7 @@
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
+import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -53,7 +54,12 @@
     }
     @ExposedNew
     @ExposedMethod
-    public void Interactive___init__(PyObject[] args, String[] keywords) {}
+    public void Interactive___init__(PyObject[] args, String[] keywords) {
+        ArgParser ap = new ArgParser("Interactive", args, keywords, new String[]
+            {"body"}, 1);
+        setBody(ap.getPyObject(0));
+    }
+
     public Interactive(PyObject body) {
         setBody(body);
     }

Modified: branches/astwrite/src/org/python/antlr/ast/Lambda.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Lambda.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/Lambda.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -5,6 +5,7 @@
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
+import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -67,7 +68,13 @@
     }
     @ExposedNew
     @ExposedMethod
-    public void Lambda___init__(PyObject[] args, String[] keywords) {}
+    public void Lambda___init__(PyObject[] args, String[] keywords) {
+        ArgParser ap = new ArgParser("Lambda", args, keywords, new String[]
+            {"args", "body"}, 2);
+        setArgs(ap.getPyObject(0));
+        setBody(ap.getPyObject(1));
+    }
+
     public Lambda(PyObject args, PyObject body) {
         setArgs(args);
         setBody(body);

Modified: branches/astwrite/src/org/python/antlr/ast/List.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/List.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/List.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -5,6 +5,7 @@
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
+import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -67,7 +68,13 @@
     }
     @ExposedNew
     @ExposedMethod
-    public void List___init__(PyObject[] args, String[] keywords) {}
+    public void List___init__(PyObject[] args, String[] keywords) {
+        ArgParser ap = new ArgParser("List", args, keywords, new String[]
+            {"elts", "ctx"}, 2);
+        setElts(ap.getPyObject(0));
+        setCtx(ap.getPyObject(1));
+    }
+
     public List(PyObject elts, PyObject ctx) {
         setElts(elts);
         setCtx(ctx);

Modified: branches/astwrite/src/org/python/antlr/ast/ListComp.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/ListComp.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/ListComp.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -5,6 +5,7 @@
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
+import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -67,7 +68,13 @@
     }
     @ExposedNew
     @ExposedMethod
-    public void ListComp___init__(PyObject[] args, String[] keywords) {}
+    public void ListComp___init__(PyObject[] args, String[] keywords) {
+        ArgParser ap = new ArgParser("ListComp", args, keywords, new String[]
+            {"elt", "generators"}, 2);
+        setElt(ap.getPyObject(0));
+        setGenerators(ap.getPyObject(1));
+    }
+
     public ListComp(PyObject elt, PyObject generators) {
         setElt(elt);
         setGenerators(generators);

Modified: branches/astwrite/src/org/python/antlr/ast/Module.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Module.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/Module.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -5,6 +5,7 @@
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
+import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -53,7 +54,12 @@
     }
     @ExposedNew
     @ExposedMethod
-    public void Module___init__(PyObject[] args, String[] keywords) {}
+    public void Module___init__(PyObject[] args, String[] keywords) {
+        ArgParser ap = new ArgParser("Module", args, keywords, new String[]
+            {"body"}, 1);
+        setBody(ap.getPyObject(0));
+    }
+
     public Module(PyObject body) {
         setBody(body);
     }

Modified: branches/astwrite/src/org/python/antlr/ast/Name.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Name.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/Name.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -5,6 +5,7 @@
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
+import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -68,7 +69,13 @@
     }
     @ExposedNew
     @ExposedMethod
-    public void Name___init__(PyObject[] args, String[] keywords) {}
+    public void Name___init__(PyObject[] args, String[] keywords) {
+        ArgParser ap = new ArgParser("Name", args, keywords, new String[]
+            {"id", "ctx"}, 2);
+        setId(ap.getPyObject(0));
+        setCtx(ap.getPyObject(1));
+    }
+
     public Name(PyObject id, PyObject ctx) {
         setId(id);
         setCtx(ctx);

Modified: branches/astwrite/src/org/python/antlr/ast/Num.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Num.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/Num.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -5,6 +5,7 @@
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
+import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -54,7 +55,12 @@
     }
     @ExposedNew
     @ExposedMethod
-    public void Num___init__(PyObject[] args, String[] keywords) {}
+    public void Num___init__(PyObject[] args, String[] keywords) {
+        ArgParser ap = new ArgParser("Num", args, keywords, new String[]
+            {"n"}, 1);
+        setN(ap.getPyObject(0));
+    }
+
     public Num(PyObject n) {
         setN(n);
     }

Modified: branches/astwrite/src/org/python/antlr/ast/Pass.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Pass.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/Pass.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -5,6 +5,7 @@
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
+import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;

Modified: branches/astwrite/src/org/python/antlr/ast/Print.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Print.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/Print.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -5,6 +5,7 @@
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
+import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -81,7 +82,14 @@
     }
     @ExposedNew
     @ExposedMethod
-    public void Print___init__(PyObject[] args, String[] keywords) {}
+    public void Print___init__(PyObject[] args, String[] keywords) {
+        ArgParser ap = new ArgParser("Print", args, keywords, new String[]
+            {"dest", "values", "nl"}, 3);
+        setDest(ap.getPyObject(0));
+        setValues(ap.getPyObject(1));
+        setNl(ap.getPyObject(2));
+    }
+
     public Print(PyObject dest, PyObject values, PyObject nl) {
         setDest(dest);
         setValues(values);

Modified: branches/astwrite/src/org/python/antlr/ast/Raise.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Raise.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/Raise.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -5,6 +5,7 @@
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
+import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -80,7 +81,14 @@
     }
     @ExposedNew
     @ExposedMethod
-    public void Raise___init__(PyObject[] args, String[] keywords) {}
+    public void Raise___init__(PyObject[] args, String[] keywords) {
+        ArgParser ap = new ArgParser("Raise", args, keywords, new String[]
+            {"excepttype", "inst", "tback"}, 3);
+        setExcepttype(ap.getPyObject(0));
+        setInst(ap.getPyObject(1));
+        setTback(ap.getPyObject(2));
+    }
+
     public Raise(PyObject excepttype, PyObject inst, PyObject tback) {
         setExcepttype(excepttype);
         setInst(inst);

Modified: branches/astwrite/src/org/python/antlr/ast/Repr.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Repr.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/Repr.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -5,6 +5,7 @@
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
+import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -54,7 +55,12 @@
     }
     @ExposedNew
     @ExposedMethod
-    public void Repr___init__(PyObject[] args, String[] keywords) {}
+    public void Repr___init__(PyObject[] args, String[] keywords) {
+        ArgParser ap = new ArgParser("Repr", args, keywords, new String[]
+            {"value"}, 1);
+        setValue(ap.getPyObject(0));
+    }
+
     public Repr(PyObject value) {
         setValue(value);
     }

Modified: branches/astwrite/src/org/python/antlr/ast/Return.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Return.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/Return.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -5,6 +5,7 @@
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
+import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -54,7 +55,12 @@
     }
     @ExposedNew
     @ExposedMethod
-    public void Return___init__(PyObject[] args, String[] keywords) {}
+    public void Return___init__(PyObject[] args, String[] keywords) {
+        ArgParser ap = new ArgParser("Return", args, keywords, new String[]
+            {"value"}, 1);
+        setValue(ap.getPyObject(0));
+    }
+
     public Return(PyObject value) {
         setValue(value);
     }

Modified: branches/astwrite/src/org/python/antlr/ast/Slice.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Slice.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/Slice.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -5,6 +5,7 @@
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
+import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -79,7 +80,14 @@
     }
     @ExposedNew
     @ExposedMethod
-    public void Slice___init__(PyObject[] args, String[] keywords) {}
+    public void Slice___init__(PyObject[] args, String[] keywords) {
+        ArgParser ap = new ArgParser("Slice", args, keywords, new String[]
+            {"lower", "upper", "step"}, 3);
+        setLower(ap.getPyObject(0));
+        setUpper(ap.getPyObject(1));
+        setStep(ap.getPyObject(2));
+    }
+
     public Slice(PyObject lower, PyObject upper, PyObject step) {
         setLower(lower);
         setUpper(upper);

Modified: branches/astwrite/src/org/python/antlr/ast/Str.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Str.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/Str.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -5,6 +5,7 @@
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
+import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -54,7 +55,12 @@
     }
     @ExposedNew
     @ExposedMethod
-    public void Str___init__(PyObject[] args, String[] keywords) {}
+    public void Str___init__(PyObject[] args, String[] keywords) {
+        ArgParser ap = new ArgParser("Str", args, keywords, new String[]
+            {"s"}, 1);
+        setS(ap.getPyObject(0));
+    }
+
     public Str(PyObject s) {
         setS(s);
     }

Modified: branches/astwrite/src/org/python/antlr/ast/Subscript.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Subscript.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/Subscript.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -5,6 +5,7 @@
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
+import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -80,7 +81,14 @@
     }
     @ExposedNew
     @ExposedMethod
-    public void Subscript___init__(PyObject[] args, String[] keywords) {}
+    public void Subscript___init__(PyObject[] args, String[] keywords) {
+        ArgParser ap = new ArgParser("Subscript", args, keywords, new String[]
+            {"value", "slice", "ctx"}, 3);
+        setValue(ap.getPyObject(0));
+        setSlice(ap.getPyObject(1));
+        setCtx(ap.getPyObject(2));
+    }
+
     public Subscript(PyObject value, PyObject slice, PyObject ctx) {
         setValue(value);
         setSlice(slice);

Modified: branches/astwrite/src/org/python/antlr/ast/Suite.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Suite.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/Suite.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -5,6 +5,7 @@
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
+import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -53,7 +54,12 @@
     }
     @ExposedNew
     @ExposedMethod
-    public void Suite___init__(PyObject[] args, String[] keywords) {}
+    public void Suite___init__(PyObject[] args, String[] keywords) {
+        ArgParser ap = new ArgParser("Suite", args, keywords, new String[]
+            {"body"}, 1);
+        setBody(ap.getPyObject(0));
+    }
+
     public Suite(PyObject body) {
         setBody(body);
     }

Modified: branches/astwrite/src/org/python/antlr/ast/TryExcept.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/TryExcept.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/TryExcept.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -5,6 +5,7 @@
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
+import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -80,7 +81,14 @@
     }
     @ExposedNew
     @ExposedMethod
-    public void TryExcept___init__(PyObject[] args, String[] keywords) {}
+    public void TryExcept___init__(PyObject[] args, String[] keywords) {
+        ArgParser ap = new ArgParser("TryExcept", args, keywords, new String[]
+            {"body", "handlers", "orelse"}, 3);
+        setBody(ap.getPyObject(0));
+        setHandlers(ap.getPyObject(1));
+        setOrelse(ap.getPyObject(2));
+    }
+
     public TryExcept(PyObject body, PyObject handlers, PyObject orelse) {
         setBody(body);
         setHandlers(handlers);

Modified: branches/astwrite/src/org/python/antlr/ast/TryFinally.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/TryFinally.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/TryFinally.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -5,6 +5,7 @@
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
+import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -67,7 +68,13 @@
     }
     @ExposedNew
     @ExposedMethod
-    public void TryFinally___init__(PyObject[] args, String[] keywords) {}
+    public void TryFinally___init__(PyObject[] args, String[] keywords) {
+        ArgParser ap = new ArgParser("TryFinally", args, keywords, new String[]
+            {"body", "finalbody"}, 2);
+        setBody(ap.getPyObject(0));
+        setFinalbody(ap.getPyObject(1));
+    }
+
     public TryFinally(PyObject body, PyObject finalbody) {
         setBody(body);
         setFinalbody(finalbody);

Modified: branches/astwrite/src/org/python/antlr/ast/Tuple.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Tuple.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/Tuple.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -5,6 +5,7 @@
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
+import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -67,7 +68,13 @@
     }
     @ExposedNew
     @ExposedMethod
-    public void Tuple___init__(PyObject[] args, String[] keywords) {}
+    public void Tuple___init__(PyObject[] args, String[] keywords) {
+        ArgParser ap = new ArgParser("Tuple", args, keywords, new String[]
+            {"elts", "ctx"}, 2);
+        setElts(ap.getPyObject(0));
+        setCtx(ap.getPyObject(1));
+    }
+
     public Tuple(PyObject elts, PyObject ctx) {
         setElts(elts);
         setCtx(ctx);

Modified: branches/astwrite/src/org/python/antlr/ast/UnaryOp.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/UnaryOp.java	2008-12-03 19:38:43 UTC (rev 5685)
+++ branches/astwrite/src/org/python/antlr/ast/UnaryOp.java	2008-12-03 21:42:59 UTC (rev 5686)
@@ -5,6 +5,7 @@
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
+import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -67,7 +68,13 @@
     }
     @ExposedNew
     @ExposedMethod
-    public void UnaryOp___init__(PyObject[] args, String[] keywords) {}
+    pub...
 
[truncated message content]