Menu
▾
▴
[Jython-checkins] SF.net SVN: jython:[6631] trunk/jython/src/org/python/antlr/ast
|
From: <fwi...@us...> - 2009-08-04 23:52:58
|
Revision: 6631
http://jython.svn.sourceforge.net/jython/?rev=6631&view=rev
Author: fwierzbicki
Date: 2009-08-04 23:52:49 +0000 (Tue, 04 Aug 2009)
Log Message:
-----------
AST codegen, should fix http://bugs.jython.org/issue1415
Modified Paths:
--------------
trunk/jython/src/org/python/antlr/ast/Assert.java
trunk/jython/src/org/python/antlr/ast/Assign.java
trunk/jython/src/org/python/antlr/ast/Attribute.java
trunk/jython/src/org/python/antlr/ast/AugAssign.java
trunk/jython/src/org/python/antlr/ast/BinOp.java
trunk/jython/src/org/python/antlr/ast/BoolOp.java
trunk/jython/src/org/python/antlr/ast/Break.java
trunk/jython/src/org/python/antlr/ast/Call.java
trunk/jython/src/org/python/antlr/ast/ClassDef.java
trunk/jython/src/org/python/antlr/ast/Compare.java
trunk/jython/src/org/python/antlr/ast/Continue.java
trunk/jython/src/org/python/antlr/ast/Delete.java
trunk/jython/src/org/python/antlr/ast/Dict.java
trunk/jython/src/org/python/antlr/ast/Ellipsis.java
trunk/jython/src/org/python/antlr/ast/ExceptHandler.java
trunk/jython/src/org/python/antlr/ast/Exec.java
trunk/jython/src/org/python/antlr/ast/Expr.java
trunk/jython/src/org/python/antlr/ast/Expression.java
trunk/jython/src/org/python/antlr/ast/ExtSlice.java
trunk/jython/src/org/python/antlr/ast/For.java
trunk/jython/src/org/python/antlr/ast/FunctionDef.java
trunk/jython/src/org/python/antlr/ast/GeneratorExp.java
trunk/jython/src/org/python/antlr/ast/Global.java
trunk/jython/src/org/python/antlr/ast/If.java
trunk/jython/src/org/python/antlr/ast/IfExp.java
trunk/jython/src/org/python/antlr/ast/Import.java
trunk/jython/src/org/python/antlr/ast/ImportFrom.java
trunk/jython/src/org/python/antlr/ast/Index.java
trunk/jython/src/org/python/antlr/ast/Interactive.java
trunk/jython/src/org/python/antlr/ast/Lambda.java
trunk/jython/src/org/python/antlr/ast/List.java
trunk/jython/src/org/python/antlr/ast/ListComp.java
trunk/jython/src/org/python/antlr/ast/Module.java
trunk/jython/src/org/python/antlr/ast/Name.java
trunk/jython/src/org/python/antlr/ast/Num.java
trunk/jython/src/org/python/antlr/ast/Pass.java
trunk/jython/src/org/python/antlr/ast/Print.java
trunk/jython/src/org/python/antlr/ast/Raise.java
trunk/jython/src/org/python/antlr/ast/Repr.java
trunk/jython/src/org/python/antlr/ast/Return.java
trunk/jython/src/org/python/antlr/ast/Slice.java
trunk/jython/src/org/python/antlr/ast/Str.java
trunk/jython/src/org/python/antlr/ast/Subscript.java
trunk/jython/src/org/python/antlr/ast/Suite.java
trunk/jython/src/org/python/antlr/ast/TryExcept.java
trunk/jython/src/org/python/antlr/ast/TryFinally.java
trunk/jython/src/org/python/antlr/ast/Tuple.java
trunk/jython/src/org/python/antlr/ast/UnaryOp.java
trunk/jython/src/org/python/antlr/ast/While.java
trunk/jython/src/org/python/antlr/ast/With.java
trunk/jython/src/org/python/antlr/ast/Yield.java
trunk/jython/src/org/python/antlr/ast/alias.java
trunk/jython/src/org/python/antlr/ast/arguments.java
trunk/jython/src/org/python/antlr/ast/comprehension.java
trunk/jython/src/org/python/antlr/ast/keyword.java
Modified: trunk/jython/src/org/python/antlr/ast/Assert.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Assert.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Assert.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -75,9 +75,9 @@
@ExposedMethod
public void Assert___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Assert", args, keywords, new String[]
- {"test", "msg", "lineno", "col_offset"}, 2);
- setTest(ap.getPyObject(0));
- setMsg(ap.getPyObject(1));
+ {"test", "msg", "lineno", "col_offset"}, 2, true);
+ setTest(ap.getPyObject(0, Py.None));
+ setMsg(ap.getPyObject(1, Py.None));
int lin = ap.getInt(2, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Assign.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Assign.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Assign.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -75,9 +75,9 @@
@ExposedMethod
public void Assign___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Assign", args, keywords, new String[]
- {"targets", "value", "lineno", "col_offset"}, 2);
- setTargets(ap.getPyObject(0));
- setValue(ap.getPyObject(1));
+ {"targets", "value", "lineno", "col_offset"}, 2, true);
+ setTargets(ap.getPyObject(0, Py.None));
+ setValue(ap.getPyObject(1, Py.None));
int lin = ap.getInt(2, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Attribute.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Attribute.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Attribute.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -89,10 +89,10 @@
@ExposedMethod
public void Attribute___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Attribute", args, keywords, new String[]
- {"value", "attr", "ctx", "lineno", "col_offset"}, 3);
- setValue(ap.getPyObject(0));
- setAttr(ap.getPyObject(1));
- setCtx(ap.getPyObject(2));
+ {"value", "attr", "ctx", "lineno", "col_offset"}, 3, true);
+ setValue(ap.getPyObject(0, Py.None));
+ setAttr(ap.getPyObject(1, Py.None));
+ setCtx(ap.getPyObject(2, Py.None));
int lin = ap.getInt(3, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/AugAssign.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/AugAssign.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/AugAssign.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -88,10 +88,10 @@
@ExposedMethod
public void AugAssign___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("AugAssign", args, keywords, new String[]
- {"target", "op", "value", "lineno", "col_offset"}, 3);
- setTarget(ap.getPyObject(0));
- setOp(ap.getPyObject(1));
- setValue(ap.getPyObject(2));
+ {"target", "op", "value", "lineno", "col_offset"}, 3, true);
+ setTarget(ap.getPyObject(0, Py.None));
+ setOp(ap.getPyObject(1, Py.None));
+ setValue(ap.getPyObject(2, Py.None));
int lin = ap.getInt(3, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/BinOp.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/BinOp.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/BinOp.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -88,10 +88,10 @@
@ExposedMethod
public void BinOp___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("BinOp", args, keywords, new String[]
- {"left", "op", "right", "lineno", "col_offset"}, 3);
- setLeft(ap.getPyObject(0));
- setOp(ap.getPyObject(1));
- setRight(ap.getPyObject(2));
+ {"left", "op", "right", "lineno", "col_offset"}, 3, true);
+ setLeft(ap.getPyObject(0, Py.None));
+ setOp(ap.getPyObject(1, Py.None));
+ setRight(ap.getPyObject(2, Py.None));
int lin = ap.getInt(3, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/BoolOp.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/BoolOp.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/BoolOp.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -75,9 +75,9 @@
@ExposedMethod
public void BoolOp___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("BoolOp", args, keywords, new String[]
- {"op", "values", "lineno", "col_offset"}, 2);
- setOp(ap.getPyObject(0));
- setValues(ap.getPyObject(1));
+ {"op", "values", "lineno", "col_offset"}, 2, true);
+ setOp(ap.getPyObject(0, Py.None));
+ setValues(ap.getPyObject(1, Py.None));
int lin = ap.getInt(2, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Break.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Break.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Break.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -45,7 +45,7 @@
@ExposedMethod
public void Break___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Break", args, keywords, new String[]
- {"lineno", "col_offset"}, 0);
+ {"lineno", "col_offset"}, 0, true);
int lin = ap.getInt(0, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Call.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Call.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Call.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -115,12 +115,12 @@
@ExposedMethod
public void Call___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Call", args, keywords, new String[]
- {"func", "args", "keywords", "starargs", "kwargs", "lineno", "col_offset"}, 5);
- setFunc(ap.getPyObject(0));
- setArgs(ap.getPyObject(1));
- setKeywords(ap.getPyObject(2));
- setStarargs(ap.getPyObject(3));
- setKwargs(ap.getPyObject(4));
+ {"func", "args", "keywords", "starargs", "kwargs", "lineno", "col_offset"}, 5, true);
+ setFunc(ap.getPyObject(0, Py.None));
+ setArgs(ap.getPyObject(1, Py.None));
+ setKeywords(ap.getPyObject(2, Py.None));
+ setStarargs(ap.getPyObject(3, Py.None));
+ setKwargs(ap.getPyObject(4, Py.None));
int lin = ap.getInt(5, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/ClassDef.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/ClassDef.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/ClassDef.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -103,11 +103,11 @@
@ExposedMethod
public void ClassDef___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("ClassDef", args, keywords, new String[]
- {"name", "bases", "body", "decorator_list", "lineno", "col_offset"}, 4);
- setName(ap.getPyObject(0));
- setBases(ap.getPyObject(1));
- setBody(ap.getPyObject(2));
- setDecorator_list(ap.getPyObject(3));
+ {"name", "bases", "body", "decorator_list", "lineno", "col_offset"}, 4, true);
+ setName(ap.getPyObject(0, Py.None));
+ setBases(ap.getPyObject(1, Py.None));
+ setBody(ap.getPyObject(2, Py.None));
+ setDecorator_list(ap.getPyObject(3, Py.None));
int lin = ap.getInt(4, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Compare.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Compare.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Compare.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -88,10 +88,10 @@
@ExposedMethod
public void Compare___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Compare", args, keywords, new String[]
- {"left", "ops", "comparators", "lineno", "col_offset"}, 3);
- setLeft(ap.getPyObject(0));
- setOps(ap.getPyObject(1));
- setComparators(ap.getPyObject(2));
+ {"left", "ops", "comparators", "lineno", "col_offset"}, 3, true);
+ setLeft(ap.getPyObject(0, Py.None));
+ setOps(ap.getPyObject(1, Py.None));
+ setComparators(ap.getPyObject(2, Py.None));
int lin = ap.getInt(3, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Continue.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Continue.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Continue.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -45,7 +45,7 @@
@ExposedMethod
public void Continue___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Continue", args, keywords, new String[]
- {"lineno", "col_offset"}, 0);
+ {"lineno", "col_offset"}, 0, true);
int lin = ap.getInt(0, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Delete.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Delete.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Delete.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -62,8 +62,8 @@
@ExposedMethod
public void Delete___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Delete", args, keywords, new String[]
- {"targets", "lineno", "col_offset"}, 1);
- setTargets(ap.getPyObject(0));
+ {"targets", "lineno", "col_offset"}, 1, true);
+ setTargets(ap.getPyObject(0, Py.None));
int lin = ap.getInt(1, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Dict.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Dict.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Dict.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -75,9 +75,9 @@
@ExposedMethod
public void Dict___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Dict", args, keywords, new String[]
- {"keys", "values", "lineno", "col_offset"}, 2);
- setKeys(ap.getPyObject(0));
- setValues(ap.getPyObject(1));
+ {"keys", "values", "lineno", "col_offset"}, 2, true);
+ setKeys(ap.getPyObject(0, Py.None));
+ setValues(ap.getPyObject(1, Py.None));
int lin = ap.getInt(2, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Ellipsis.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Ellipsis.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Ellipsis.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -44,7 +44,7 @@
@ExposedMethod
public void Ellipsis___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Ellipsis", args, keywords, new String[]
- {}, 0);
+ {}, 0, true);
}
public Ellipsis() {
Modified: trunk/jython/src/org/python/antlr/ast/ExceptHandler.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/ExceptHandler.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/ExceptHandler.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -88,10 +88,10 @@
@ExposedMethod
public void ExceptHandler___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("ExceptHandler", args, keywords, new String[]
- {"type", "name", "body", "lineno", "col_offset"}, 3);
- setExceptType(ap.getPyObject(0));
- setName(ap.getPyObject(1));
- setBody(ap.getPyObject(2));
+ {"type", "name", "body", "lineno", "col_offset"}, 3, true);
+ setExceptType(ap.getPyObject(0, Py.None));
+ setName(ap.getPyObject(1, Py.None));
+ setBody(ap.getPyObject(2, Py.None));
int lin = ap.getInt(3, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Exec.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Exec.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Exec.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -88,10 +88,10 @@
@ExposedMethod
public void Exec___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Exec", args, keywords, new String[]
- {"body", "globals", "locals", "lineno", "col_offset"}, 3);
- setBody(ap.getPyObject(0));
- setGlobals(ap.getPyObject(1));
- setLocals(ap.getPyObject(2));
+ {"body", "globals", "locals", "lineno", "col_offset"}, 3, true);
+ setBody(ap.getPyObject(0, Py.None));
+ setGlobals(ap.getPyObject(1, Py.None));
+ setLocals(ap.getPyObject(2, Py.None));
int lin = ap.getInt(3, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Expr.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Expr.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Expr.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -62,8 +62,8 @@
@ExposedMethod
public void Expr___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Expr", args, keywords, new String[]
- {"value", "lineno", "col_offset"}, 1);
- setValue(ap.getPyObject(0));
+ {"value", "lineno", "col_offset"}, 1, true);
+ setValue(ap.getPyObject(0, Py.None));
int lin = ap.getInt(1, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Expression.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Expression.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Expression.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -61,8 +61,8 @@
@ExposedMethod
public void Expression___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Expression", args, keywords, new String[]
- {"body"}, 1);
- setBody(ap.getPyObject(0));
+ {"body"}, 1, true);
+ setBody(ap.getPyObject(0, Py.None));
}
public Expression(PyObject body) {
Modified: trunk/jython/src/org/python/antlr/ast/ExtSlice.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/ExtSlice.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/ExtSlice.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -61,8 +61,8 @@
@ExposedMethod
public void ExtSlice___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("ExtSlice", args, keywords, new String[]
- {"dims"}, 1);
- setDims(ap.getPyObject(0));
+ {"dims"}, 1, true);
+ setDims(ap.getPyObject(0, Py.None));
}
public ExtSlice(PyObject dims) {
Modified: trunk/jython/src/org/python/antlr/ast/For.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/For.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/For.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -102,11 +102,11 @@
@ExposedMethod
public void For___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("For", args, keywords, new String[]
- {"target", "iter", "body", "orelse", "lineno", "col_offset"}, 4);
- setTarget(ap.getPyObject(0));
- setIter(ap.getPyObject(1));
- setBody(ap.getPyObject(2));
- setOrelse(ap.getPyObject(3));
+ {"target", "iter", "body", "orelse", "lineno", "col_offset"}, 4, true);
+ setTarget(ap.getPyObject(0, Py.None));
+ setIter(ap.getPyObject(1, Py.None));
+ setBody(ap.getPyObject(2, Py.None));
+ setOrelse(ap.getPyObject(3, Py.None));
int lin = ap.getInt(4, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/FunctionDef.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/FunctionDef.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/FunctionDef.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -103,11 +103,11 @@
@ExposedMethod
public void FunctionDef___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("FunctionDef", args, keywords, new String[]
- {"name", "args", "body", "decorator_list", "lineno", "col_offset"}, 4);
- setName(ap.getPyObject(0));
- setArgs(ap.getPyObject(1));
- setBody(ap.getPyObject(2));
- setDecorator_list(ap.getPyObject(3));
+ {"name", "args", "body", "decorator_list", "lineno", "col_offset"}, 4, true);
+ setName(ap.getPyObject(0, Py.None));
+ setArgs(ap.getPyObject(1, Py.None));
+ setBody(ap.getPyObject(2, Py.None));
+ setDecorator_list(ap.getPyObject(3, Py.None));
int lin = ap.getInt(4, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/GeneratorExp.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/GeneratorExp.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/GeneratorExp.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -75,9 +75,9 @@
@ExposedMethod
public void GeneratorExp___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("GeneratorExp", args, keywords, new String[]
- {"elt", "generators", "lineno", "col_offset"}, 2);
- setElt(ap.getPyObject(0));
- setGenerators(ap.getPyObject(1));
+ {"elt", "generators", "lineno", "col_offset"}, 2, true);
+ setElt(ap.getPyObject(0, Py.None));
+ setGenerators(ap.getPyObject(1, Py.None));
int lin = ap.getInt(2, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Global.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Global.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Global.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -62,8 +62,8 @@
@ExposedMethod
public void Global___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Global", args, keywords, new String[]
- {"names", "lineno", "col_offset"}, 1);
- setNames(ap.getPyObject(0));
+ {"names", "lineno", "col_offset"}, 1, true);
+ setNames(ap.getPyObject(0, Py.None));
int lin = ap.getInt(1, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/If.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/If.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/If.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -88,10 +88,10 @@
@ExposedMethod
public void If___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("If", args, keywords, new String[]
- {"test", "body", "orelse", "lineno", "col_offset"}, 3);
- setTest(ap.getPyObject(0));
- setBody(ap.getPyObject(1));
- setOrelse(ap.getPyObject(2));
+ {"test", "body", "orelse", "lineno", "col_offset"}, 3, true);
+ setTest(ap.getPyObject(0, Py.None));
+ setBody(ap.getPyObject(1, Py.None));
+ setOrelse(ap.getPyObject(2, Py.None));
int lin = ap.getInt(3, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/IfExp.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/IfExp.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/IfExp.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -88,10 +88,10 @@
@ExposedMethod
public void IfExp___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("IfExp", args, keywords, new String[]
- {"test", "body", "orelse", "lineno", "col_offset"}, 3);
- setTest(ap.getPyObject(0));
- setBody(ap.getPyObject(1));
- setOrelse(ap.getPyObject(2));
+ {"test", "body", "orelse", "lineno", "col_offset"}, 3, true);
+ setTest(ap.getPyObject(0, Py.None));
+ setBody(ap.getPyObject(1, Py.None));
+ setOrelse(ap.getPyObject(2, Py.None));
int lin = ap.getInt(3, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Import.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Import.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Import.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -62,8 +62,8 @@
@ExposedMethod
public void Import___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Import", args, keywords, new String[]
- {"names", "lineno", "col_offset"}, 1);
- setNames(ap.getPyObject(0));
+ {"names", "lineno", "col_offset"}, 1, true);
+ setNames(ap.getPyObject(0, Py.None));
int lin = ap.getInt(1, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/ImportFrom.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/ImportFrom.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/ImportFrom.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -89,10 +89,10 @@
@ExposedMethod
public void ImportFrom___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("ImportFrom", args, keywords, new String[]
- {"module", "names", "level", "lineno", "col_offset"}, 3);
- setModule(ap.getPyObject(0));
- setNames(ap.getPyObject(1));
- setLevel(ap.getPyObject(2));
+ {"module", "names", "level", "lineno", "col_offset"}, 3, true);
+ setModule(ap.getPyObject(0, Py.None));
+ setNames(ap.getPyObject(1, Py.None));
+ setLevel(ap.getPyObject(2, Py.None));
int lin = ap.getInt(3, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Index.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Index.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Index.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -61,8 +61,8 @@
@ExposedMethod
public void Index___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Index", args, keywords, new String[]
- {"value"}, 1);
- setValue(ap.getPyObject(0));
+ {"value"}, 1, true);
+ setValue(ap.getPyObject(0, Py.None));
}
public Index(PyObject value) {
Modified: trunk/jython/src/org/python/antlr/ast/Interactive.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Interactive.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Interactive.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -61,8 +61,8 @@
@ExposedMethod
public void Interactive___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Interactive", args, keywords, new String[]
- {"body"}, 1);
- setBody(ap.getPyObject(0));
+ {"body"}, 1, true);
+ setBody(ap.getPyObject(0, Py.None));
}
public Interactive(PyObject body) {
Modified: trunk/jython/src/org/python/antlr/ast/Lambda.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Lambda.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Lambda.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -75,9 +75,9 @@
@ExposedMethod
public void Lambda___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Lambda", args, keywords, new String[]
- {"args", "body", "lineno", "col_offset"}, 2);
- setArgs(ap.getPyObject(0));
- setBody(ap.getPyObject(1));
+ {"args", "body", "lineno", "col_offset"}, 2, true);
+ setArgs(ap.getPyObject(0, Py.None));
+ setBody(ap.getPyObject(1, Py.None));
int lin = ap.getInt(2, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/List.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/List.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/List.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -75,9 +75,9 @@
@ExposedMethod
public void List___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("List", args, keywords, new String[]
- {"elts", "ctx", "lineno", "col_offset"}, 2);
- setElts(ap.getPyObject(0));
- setCtx(ap.getPyObject(1));
+ {"elts", "ctx", "lineno", "col_offset"}, 2, true);
+ setElts(ap.getPyObject(0, Py.None));
+ setCtx(ap.getPyObject(1, Py.None));
int lin = ap.getInt(2, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/ListComp.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/ListComp.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/ListComp.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -75,9 +75,9 @@
@ExposedMethod
public void ListComp___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("ListComp", args, keywords, new String[]
- {"elt", "generators", "lineno", "col_offset"}, 2);
- setElt(ap.getPyObject(0));
- setGenerators(ap.getPyObject(1));
+ {"elt", "generators", "lineno", "col_offset"}, 2, true);
+ setElt(ap.getPyObject(0, Py.None));
+ setGenerators(ap.getPyObject(1, Py.None));
int lin = ap.getInt(2, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Module.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Module.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Module.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -61,8 +61,8 @@
@ExposedMethod
public void Module___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Module", args, keywords, new String[]
- {"body"}, 1);
- setBody(ap.getPyObject(0));
+ {"body"}, 1, true);
+ setBody(ap.getPyObject(0, Py.None));
}
public Module(PyObject body) {
Modified: trunk/jython/src/org/python/antlr/ast/Name.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Name.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Name.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -76,9 +76,9 @@
@ExposedMethod
public void Name___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Name", args, keywords, new String[]
- {"id", "ctx", "lineno", "col_offset"}, 2);
- setId(ap.getPyObject(0));
- setCtx(ap.getPyObject(1));
+ {"id", "ctx", "lineno", "col_offset"}, 2, true);
+ setId(ap.getPyObject(0, Py.None));
+ setCtx(ap.getPyObject(1, Py.None));
int lin = ap.getInt(2, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Num.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Num.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Num.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -62,8 +62,8 @@
@ExposedMethod
public void Num___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Num", args, keywords, new String[]
- {"n", "lineno", "col_offset"}, 1);
- setN(ap.getPyObject(0));
+ {"n", "lineno", "col_offset"}, 1, true);
+ setN(ap.getPyObject(0, Py.None));
int lin = ap.getInt(1, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Pass.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Pass.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Pass.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -45,7 +45,7 @@
@ExposedMethod
public void Pass___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Pass", args, keywords, new String[]
- {"lineno", "col_offset"}, 0);
+ {"lineno", "col_offset"}, 0, true);
int lin = ap.getInt(0, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Print.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Print.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Print.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -89,10 +89,10 @@
@ExposedMethod
public void Print___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Print", args, keywords, new String[]
- {"dest", "values", "nl", "lineno", "col_offset"}, 3);
- setDest(ap.getPyObject(0));
- setValues(ap.getPyObject(1));
- setNl(ap.getPyObject(2));
+ {"dest", "values", "nl", "lineno", "col_offset"}, 3, true);
+ setDest(ap.getPyObject(0, Py.None));
+ setValues(ap.getPyObject(1, Py.None));
+ setNl(ap.getPyObject(2, Py.None));
int lin = ap.getInt(3, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Raise.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Raise.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Raise.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -88,10 +88,10 @@
@ExposedMethod
public void Raise___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Raise", args, keywords, new String[]
- {"type", "inst", "tback", "lineno", "col_offset"}, 3);
- setExceptType(ap.getPyObject(0));
- setInst(ap.getPyObject(1));
- setTback(ap.getPyObject(2));
+ {"type", "inst", "tback", "lineno", "col_offset"}, 3, true);
+ setExceptType(ap.getPyObject(0, Py.None));
+ setInst(ap.getPyObject(1, Py.None));
+ setTback(ap.getPyObject(2, Py.None));
int lin = ap.getInt(3, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Repr.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Repr.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Repr.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -62,8 +62,8 @@
@ExposedMethod
public void Repr___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Repr", args, keywords, new String[]
- {"value", "lineno", "col_offset"}, 1);
- setValue(ap.getPyObject(0));
+ {"value", "lineno", "col_offset"}, 1, true);
+ setValue(ap.getPyObject(0, Py.None));
int lin = ap.getInt(1, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Return.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Return.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Return.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -62,8 +62,8 @@
@ExposedMethod
public void Return___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Return", args, keywords, new String[]
- {"value", "lineno", "col_offset"}, 1);
- setValue(ap.getPyObject(0));
+ {"value", "lineno", "col_offset"}, 1, true);
+ setValue(ap.getPyObject(0, Py.None));
int lin = ap.getInt(1, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Slice.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Slice.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Slice.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -87,10 +87,10 @@
@ExposedMethod
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));
+ {"lower", "upper", "step"}, 3, true);
+ setLower(ap.getPyObject(0, Py.None));
+ setUpper(ap.getPyObject(1, Py.None));
+ setStep(ap.getPyObject(2, Py.None));
}
public Slice(PyObject lower, PyObject upper, PyObject step) {
Modified: trunk/jython/src/org/python/antlr/ast/Str.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Str.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Str.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -62,8 +62,8 @@
@ExposedMethod
public void Str___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Str", args, keywords, new String[]
- {"s", "lineno", "col_offset"}, 1);
- setS(ap.getPyObject(0));
+ {"s", "lineno", "col_offset"}, 1, true);
+ setS(ap.getPyObject(0, Py.None));
int lin = ap.getInt(1, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Subscript.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Subscript.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Subscript.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -88,10 +88,10 @@
@ExposedMethod
public void Subscript___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Subscript", args, keywords, new String[]
- {"value", "slice", "ctx", "lineno", "col_offset"}, 3);
- setValue(ap.getPyObject(0));
- setSlice(ap.getPyObject(1));
- setCtx(ap.getPyObject(2));
+ {"value", "slice", "ctx", "lineno", "col_offset"}, 3, true);
+ setValue(ap.getPyObject(0, Py.None));
+ setSlice(ap.getPyObject(1, Py.None));
+ setCtx(ap.getPyObject(2, Py.None));
int lin = ap.getInt(3, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Suite.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Suite.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Suite.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -61,8 +61,8 @@
@ExposedMethod
public void Suite___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Suite", args, keywords, new String[]
- {"body"}, 1);
- setBody(ap.getPyObject(0));
+ {"body"}, 1, true);
+ setBody(ap.getPyObject(0, Py.None));
}
public Suite(PyObject body) {
Modified: trunk/jython/src/org/python/antlr/ast/TryExcept.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/TryExcept.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/TryExcept.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -88,10 +88,10 @@
@ExposedMethod
public void TryExcept___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("TryExcept", args, keywords, new String[]
- {"body", "handlers", "orelse", "lineno", "col_offset"}, 3);
- setBody(ap.getPyObject(0));
- setHandlers(ap.getPyObject(1));
- setOrelse(ap.getPyObject(2));
+ {"body", "handlers", "orelse", "lineno", "col_offset"}, 3, true);
+ setBody(ap.getPyObject(0, Py.None));
+ setHandlers(ap.getPyObject(1, Py.None));
+ setOrelse(ap.getPyObject(2, Py.None));
int lin = ap.getInt(3, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/TryFinally.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/TryFinally.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/TryFinally.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -75,9 +75,9 @@
@ExposedMethod
public void TryFinally___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("TryFinally", args, keywords, new String[]
- {"body", "finalbody", "lineno", "col_offset"}, 2);
- setBody(ap.getPyObject(0));
- setFinalbody(ap.getPyObject(1));
+ {"body", "finalbody", "lineno", "col_offset"}, 2, true);
+ setBody(ap.getPyObject(0, Py.None));
+ setFinalbody(ap.getPyObject(1, Py.None));
int lin = ap.getInt(2, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Tuple.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Tuple.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Tuple.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -75,9 +75,9 @@
@ExposedMethod
public void Tuple___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Tuple", args, keywords, new String[]
- {"elts", "ctx", "lineno", "col_offset"}, 2);
- setElts(ap.getPyObject(0));
- setCtx(ap.getPyObject(1));
+ {"elts", "ctx", "lineno", "col_offset"}, 2, true);
+ setElts(ap.getPyObject(0, Py.None));
+ setCtx(ap.getPyObject(1, Py.None));
int lin = ap.getInt(2, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/UnaryOp.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/UnaryOp.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/UnaryOp.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -75,9 +75,9 @@
@ExposedMethod
public void UnaryOp___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("UnaryOp", args, keywords, new String[]
- {"op", "operand", "lineno", "col_offset"}, 2);
- setOp(ap.getPyObject(0));
- setOperand(ap.getPyObject(1));
+ {"op", "operand", "lineno", "col_offset"}, 2, true);
+ setOp(ap.getPyObject(0, Py.None));
+ setOperand(ap.getPyObject(1, Py.None));
int lin = ap.getInt(2, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/While.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/While.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/While.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -88,10 +88,10 @@
@ExposedMethod
public void While___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("While", args, keywords, new String[]
- {"test", "body", "orelse", "lineno", "col_offset"}, 3);
- setTest(ap.getPyObject(0));
- setBody(ap.getPyObject(1));
- setOrelse(ap.getPyObject(2));
+ {"test", "body", "orelse", "lineno", "col_offset"}, 3, true);
+ setTest(ap.getPyObject(0, Py.None));
+ setBody(ap.getPyObject(1, Py.None));
+ setOrelse(ap.getPyObject(2, Py.None));
int lin = ap.getInt(3, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/With.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/With.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/With.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -89,10 +89,10 @@
@ExposedMethod
public void With___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("With", args, keywords, new String[]
- {"context_expr", "optional_vars", "body", "lineno", "col_offset"}, 3);
- setContext_expr(ap.getPyObject(0));
- setOptional_vars(ap.getPyObject(1));
- setBody(ap.getPyObject(2));
+ {"context_expr", "optional_vars", "body", "lineno", "col_offset"}, 3, true);
+ setContext_expr(ap.getPyObject(0, Py.None));
+ setOptional_vars(ap.getPyObject(1, Py.None));
+ setBody(ap.getPyObject(2, Py.None));
int lin = ap.getInt(3, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Yield.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Yield.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Yield.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -62,8 +62,8 @@
@ExposedMethod
public void Yield___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Yield", args, keywords, new String[]
- {"value", "lineno", "col_offset"}, 1);
- setValue(ap.getPyObject(0));
+ {"value", "lineno", "col_offset"}, 1, true);
+ setValue(ap.getPyObject(0, Py.None));
int lin = ap.getInt(1, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/alias.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/alias.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/alias.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -76,9 +76,9 @@
@ExposedMethod
public void alias___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("alias", args, keywords, new String[]
- {"name", "asname"}, 2);
- setName(ap.getPyObject(0));
- setAsname(ap.getPyObject(1));
+ {"name", "asname"}, 2, true);
+ setName(ap.getPyObject(0, Py.None));
+ setAsname(ap.getPyObject(1, Py.None));
}
public alias(PyObject name, PyObject asname) {
Modified: trunk/jython/src/org/python/antlr/ast/arguments.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/arguments.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/arguments.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -103,11 +103,11 @@
@ExposedMethod
public void arguments___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("arguments", args, keywords, new String[]
- {"args", "vararg", "kwarg", "defaults"}, 4);
- setArgs(ap.getPyObject(0));
- setVararg(ap.getPyObject(1));
- setKwarg(ap.getPyObject(2));
- setDefaults(ap.getPyObject(3));
+ {"args", "vararg", "kwarg", "defaults"}, 4, true);
+ setArgs(ap.getPyObject(0, Py.None));
+ setVararg(ap.getPyObject(1, Py.None));
+ setKwarg(ap.getPyObject(2, Py.None));
+ setDefaults(ap.getPyObject(3, Py.None));
}
public arguments(PyObject args, PyObject vararg, PyObject kwarg, PyObject defaults) {
Modified: trunk/jython/src/org/python/antlr/ast/comprehension.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/comprehension.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/comprehension.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -87,10 +87,10 @@
@ExposedMethod
public void comprehension___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("comprehension", args, keywords, new String[]
- {"target", "iter", "ifs"}, 3);
- setTarget(ap.getPyObject(0));
- setIter(ap.getPyObject(1));
- setIfs(ap.getPyObject(2));
+ {"target", "iter", "ifs"}, 3, true);
+ setTarget(ap.getPyObject(0, Py.None));
+ setIter(ap.getPyObject(1, Py.None));
+ setIfs(ap.getPyObject(2, Py.None));
}
public comprehension(PyObject target, PyObject iter, PyObject ifs) {
Modified: trunk/jython/src/org/python/antlr/ast/keyword.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/keyword.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/keyword.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -75,9 +75,9 @@
@ExposedMethod
public void keyword___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("keyword", args, keywords, new String[]
- {"arg", "value"}, 2);
- setArg(ap.getPyObject(0));
- setValue(ap.getPyObject(1));
+ {"arg", "value"}, 2, true);
+ setArg(ap.getPyObject(0, Py.None));
+ setValue(ap.getPyObject(1, Py.None));
}
public keyword(PyObject arg, PyObject value) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
