Menu
▾
▴
jython-checkins
|
From: <pj...@us...> - 2008-08-03 02:13:39
|
Revision: 5057
http://jython.svn.sourceforge.net/jython/?rev=5057&view=rev
Author: pjenvey
Date: 2008-08-03 02:13:36 +0000 (Sun, 03 Aug 2008)
Log Message:
-----------
o pre and xreadlines were removed in CPython 2.4
o include some other modules I hope actually work
Modified Paths:
--------------
branches/asm/CPythonLib.includes
branches/asm/Lib/test/regrtest.py
branches/asm/src/org/python/modules/Setup.java
Removed Paths:
-------------
branches/asm/src/org/python/modules/xreadlines.java
Modified: branches/asm/CPythonLib.includes
===================================================================
--- branches/asm/CPythonLib.includes 2008-08-02 21:43:22 UTC (rev 5056)
+++ branches/asm/CPythonLib.includes 2008-08-03 02:13:36 UTC (rev 5057)
@@ -47,6 +47,7 @@
dircache.py
dircmp.py
dis.py
+DocXMLRPCServer.py
dospath.py
dumbdbm.py
exceptions.py
@@ -117,6 +118,7 @@
repr.py
rfc822.py
rlcompleter.py
+robotparser.py
runpy.py
sched.py
sha.py
@@ -137,6 +139,7 @@
string.py
StringIO.py
symbol.py
+tabnanny.py
this.py
threading.py
textwrap.py
Modified: branches/asm/Lib/test/regrtest.py
===================================================================
--- branches/asm/Lib/test/regrtest.py 2008-08-02 21:43:22 UTC (rev 5056)
+++ branches/asm/Lib/test/regrtest.py 2008-08-03 02:13:36 UTC (rev 5057)
@@ -1432,7 +1432,6 @@
test_pyexpat
test_resource
test_rgbimg
- test_robotparser
test_rotor
test_scriptpackages
test_signal
Modified: branches/asm/src/org/python/modules/Setup.java
===================================================================
--- branches/asm/src/org/python/modules/Setup.java 2008-08-02 21:43:22 UTC (rev 5056)
+++ branches/asm/src/org/python/modules/Setup.java 2008-08-03 02:13:36 UTC (rev 5057)
@@ -31,7 +31,6 @@
"operator",
"time:org.python.modules.time.Time",
"_py_compile",
- "pre:org.python.modules.re",
"_sre",
"synchronize",
"cPickle",
@@ -45,7 +44,6 @@
"_jython",
"_new:org.python.modules._newmodule",
"_weakref:org.python.modules._weakref.WeakrefModule",
- "xreadlines",
"errno",
"array:org.python.modules.ArrayModule",
"_random:org.python.modules.random.RandomModule",
Deleted: branches/asm/src/org/python/modules/xreadlines.java
===================================================================
--- branches/asm/src/org/python/modules/xreadlines.java 2008-08-02 21:43:22 UTC (rev 5056)
+++ branches/asm/src/org/python/modules/xreadlines.java 2008-08-03 02:13:36 UTC (rev 5057)
@@ -1,59 +0,0 @@
-// Copyright (c) 2001 Finn Bock.
-
-package org.python.modules;
-
-import org.python.core.*;
-
-public class xreadlines {
- private final static int CHUNKSIZE = 8192;
-
- public static PyString __doc__xreadlines = new PyString(
- "xreadlines(f)\n" +
- "\n" +
- "Return an xreadlines object for the file f."
- );
-
- public static PyObject xreadlines$(PyObject file) {
- return new XReadlineObj(file);
- }
-
- public static class XReadlineObj extends PyObject {
- private PyObject file;
- private PyObject lines = null;
- private int lineslen = 0;
- private int lineno = 0;
- private int abslineno = 0;
-
- public XReadlineObj(PyObject file) {
- this.file = file;
- }
-
- public PyObject __iter__() {
- return new PySequenceIter(this);
- }
-
- public PyObject __finditem__(PyObject idx) {
- return __finditem__(((PyInteger)idx.__int__()).getValue());
- }
-
- public PyObject __finditem__(int idx) {
- if (idx != abslineno) {
- throw Py.RuntimeError(
- "xreadlines object accessed out of order");
- }
-
- if (lineno >= lineslen) {
- lines = file.invoke("readlines", Py.newInteger(CHUNKSIZE));
- lineno = 0;
- lineslen = lines.__len__();
- }
- abslineno++;
- return lines.__finditem__(lineno++);
- }
-
- public String toString() {
- return "<xreadlines object " + Py.idstr(this) + ">";
- }
-
- }
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zy...@us...> - 2008-08-03 04:45:41
|
Revision: 5061
http://jython.svn.sourceforge.net/jython/?rev=5061&view=rev
Author: zyasoft
Date: 2008-08-03 04:45:39 +0000 (Sun, 03 Aug 2008)
Log Message:
-----------
Allow typecodes of B, H, I to fully use their storage. Don't run
test_byteswap for u (Unicode) because it doesn't make sense given
UTF-16 decoding.
Fixes test_array.
Modified Paths:
--------------
branches/asm/Lib/test/test_array.py
branches/asm/src/org/python/core/PyArray.java
Modified: branches/asm/Lib/test/test_array.py
===================================================================
--- branches/asm/Lib/test/test_array.py 2008-08-03 04:45:30 UTC (rev 5060)
+++ branches/asm/Lib/test/test_array.py 2008-08-03 04:45:39 UTC (rev 5061)
@@ -74,6 +74,10 @@
self.assertEqual(bi[1], len(a))
def test_byteswap(self):
+ if test_support.is_jython and self.typecode == 'u':
+ # Jython unicodes are already decoded from utf16,
+ # so this doesn't make sense
+ return
a = array.array(self.typecode, self.example)
self.assertRaises(TypeError, a.byteswap, 42)
if a.itemsize in (1, 2, 4, 8):
@@ -912,11 +916,12 @@
lower = 0
itemsize = a.itemsize
if test_support.is_jython:
- # XXX: unsigned itemsizes are larger than would be expected
- # in CPython
- itemsize /= 2
- #upper = long(pow(2, a.itemsize * 8)) - 1L
- upper = long(pow(2, itemsize * 8)) - 1L
+ # unsigned itemsizes are larger than would be expected
+ # in CPython because Jython promotes to the next size
+ # (Java has no unsiged integers except for char)
+ upper = long(pow(2, a.itemsize * 8 - 1)) - 1L
+ else:
+ upper = long(pow(2, a.itemsize * 8)) - 1L
self.check_overflow(lower, upper)
Modified: branches/asm/src/org/python/core/PyArray.java
===================================================================
--- branches/asm/src/org/python/core/PyArray.java 2008-08-03 04:45:30 UTC (rev 5060)
+++ branches/asm/src/org/python/core/PyArray.java 2008-08-03 04:45:39 UTC (rev 5061)
@@ -1327,7 +1327,6 @@
return;
}
- // check for overflow of the integral types
if(type == Byte.TYPE) {
long val;
try {
@@ -1337,7 +1336,7 @@
}
if(val < (isSigned() ? 0 : Byte.MIN_VALUE)) {
throw Py.OverflowError("value too small for " + type.getName());
- } else if(val > (isSigned() ? Byte.MAX_VALUE * 2 + 1 : Byte.MAX_VALUE)) {
+ } else if(val > Byte.MAX_VALUE) {
throw Py.OverflowError("value too large for " + type.getName());
}
} else if(type == Short.TYPE) {
@@ -1349,7 +1348,7 @@
}
if(val < (isSigned() ? 0 : Short.MIN_VALUE)) {
throw Py.OverflowError("value too small for " + type.getName());
- } else if(val > (isSigned() ? Byte.MAX_VALUE * 2 + 1 : Short.MAX_VALUE)) {
+ } else if(val > Short.MAX_VALUE) {
throw Py.OverflowError("value too large for " + type.getName());
}
} else if(type == Integer.TYPE) {
@@ -1361,7 +1360,7 @@
}
if(val < (isSigned() ? 0 : Integer.MIN_VALUE)) {
throw Py.OverflowError("value too small for " + type.getName());
- } else if(val > (isSigned() ? Short.MAX_VALUE * 2 + 1 : Integer.MAX_VALUE)) {
+ } else if(val > Integer.MAX_VALUE) {
throw Py.OverflowError("value too large for " + type.getName());
}
} else if(type == Long.TYPE) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fwi...@us...> - 2008-08-03 14:42:47
|
Revision: 5067
http://jython.svn.sourceforge.net/jython/?rev=5067&view=rev
Author: fwierzbicki
Date: 2008-08-03 14:42:44 +0000 (Sun, 03 Aug 2008)
Log Message:
-----------
Passed filename along to parsers and PythonTokenSource. created
a PyIndentationError to allow me derive IndentationErrors from
ParseException. Added a "type" to ParseException to recognize
when an IndentationError is needed. Changed test_traceback slightly
because I believe Antlr comes up with a better placement for the
carot vs CPython (at the indent and not end of line for indent errors.
Modified Paths:
--------------
branches/asm/Lib/test/test_traceback.py
branches/asm/src/org/python/antlr/BaseParser.java
branches/asm/src/org/python/antlr/ExpressionParser.java
branches/asm/src/org/python/antlr/InteractiveParser.java
branches/asm/src/org/python/antlr/ModuleParser.java
branches/asm/src/org/python/antlr/ParseException.java
branches/asm/src/org/python/antlr/PythonTokenSource.java
branches/asm/src/org/python/core/ParserFacade.java
branches/asm/src/org/python/core/PySyntaxError.java
branches/asm/tests/java/org/python/antlr/PythonTreeTester.java
Added Paths:
-----------
branches/asm/src/org/python/core/PyIndentationError.java
Modified: branches/asm/Lib/test/test_traceback.py
===================================================================
--- branches/asm/Lib/test/test_traceback.py 2008-08-03 09:50:01 UTC (rev 5066)
+++ branches/asm/Lib/test/test_traceback.py 2008-08-03 14:42:44 UTC (rev 5067)
@@ -50,7 +50,9 @@
self.assert_(len(err) == 4)
self.assert_(err[1].strip() == "print 2")
self.assert_("^" in err[2])
- self.assert_(err[1].find("2") == err[2].find("^"))
+ # Antlr thinks the error is at the indentation, while CPython points at
+ # the end of the line. I am agreeing with Antlr over CPython here.
+ self.assert_(err[1].find("p") -1 == err[2].find("^"))
def test_bug737473(self):
import sys, os, tempfile, time
Modified: branches/asm/src/org/python/antlr/BaseParser.java
===================================================================
--- branches/asm/src/org/python/antlr/BaseParser.java 2008-08-03 09:50:01 UTC (rev 5066)
+++ branches/asm/src/org/python/antlr/BaseParser.java 2008-08-03 14:42:44 UTC (rev 5067)
@@ -28,6 +28,7 @@
protected CharStream charStream;
protected boolean partial;
+ protected String filename;
protected ErrorHandler errorHandler = new FailFastHandler();
public void setAntlrErrorHandler(ErrorHandler eh) {
Modified: branches/asm/src/org/python/antlr/ExpressionParser.java
===================================================================
--- branches/asm/src/org/python/antlr/ExpressionParser.java 2008-08-03 09:50:01 UTC (rev 5066)
+++ branches/asm/src/org/python/antlr/ExpressionParser.java 2008-08-03 14:42:44 UTC (rev 5067)
@@ -16,8 +16,9 @@
public class ExpressionParser extends BaseParser {
- public ExpressionParser(CharStream cs) {
+ public ExpressionParser(CharStream cs, String filename) {
this.charStream = cs;
+ this.filename = filename;
}
public modType parse() {
@@ -26,7 +27,7 @@
lexer.setErrorHandler(errorHandler);
CommonTokenStream tokens = new CommonTokenStream(lexer);
tokens.discardOffChannelTokens(true);
- PythonTokenSource indentedSource = new PythonTokenSource(tokens);
+ PythonTokenSource indentedSource = new PythonTokenSource(tokens, filename);
tokens = new CommonTokenStream(indentedSource);
PythonParser parser = new PythonParser(tokens);
parser.setErrorHandler(errorHandler);
Modified: branches/asm/src/org/python/antlr/InteractiveParser.java
===================================================================
--- branches/asm/src/org/python/antlr/InteractiveParser.java 2008-08-03 09:50:01 UTC (rev 5066)
+++ branches/asm/src/org/python/antlr/InteractiveParser.java 2008-08-03 14:42:44 UTC (rev 5067)
@@ -32,8 +32,9 @@
}
}
- public InteractiveParser(BufferedReader br) {
+ public InteractiveParser(BufferedReader br, String filename) {
this.bufreader = br;
+ this.filename = filename;
}
public modType parse() throws IOException {
@@ -44,7 +45,7 @@
lexer.inSingle = true;
CommonTokenStream tokens = new CommonTokenStream(lexer);
tokens.discardOffChannelTokens(true);
- PythonTokenSource indentedSource = new PythonTokenSource(tokens);
+ PythonTokenSource indentedSource = new PythonTokenSource(tokens, filename);
tokens = new CommonTokenStream(indentedSource);
PythonParser parser = new PythonParser(tokens);
parser.setErrorHandler(errorHandler);
Modified: branches/asm/src/org/python/antlr/ModuleParser.java
===================================================================
--- branches/asm/src/org/python/antlr/ModuleParser.java 2008-08-03 09:50:01 UTC (rev 5066)
+++ branches/asm/src/org/python/antlr/ModuleParser.java 2008-08-03 14:42:44 UTC (rev 5067)
@@ -15,13 +15,14 @@
import org.python.antlr.ast.stmtType;
public class ModuleParser extends BaseParser {
- public ModuleParser(CharStream cs) {
- this(cs, false);
+ public ModuleParser(CharStream cs, String filename) {
+ this(cs, filename, false);
}
- public ModuleParser(CharStream cs, boolean partial) {
+ public ModuleParser(CharStream cs, String filename, boolean partial) {
this.partial = partial;
this.charStream = cs;
+ this.filename = filename;
}
public modType file_input() {
@@ -30,7 +31,7 @@
lexer.setErrorHandler(errorHandler);
CommonTokenStream tokens = new CommonTokenStream(lexer);
tokens.discardOffChannelTokens(true);
- PythonTokenSource indentedSource = new PythonTokenSource(tokens);
+ PythonTokenSource indentedSource = new PythonTokenSource(tokens, filename);
tokens = new CommonTokenStream(indentedSource);
PythonParser parser = new PythonParser(tokens);
parser.setErrorHandler(errorHandler);
Modified: branches/asm/src/org/python/antlr/ParseException.java
===================================================================
--- branches/asm/src/org/python/antlr/ParseException.java 2008-08-03 09:50:01 UTC (rev 5066)
+++ branches/asm/src/org/python/antlr/ParseException.java 2008-08-03 14:42:44 UTC (rev 5067)
@@ -1,6 +1,9 @@
package org.python.antlr;
import org.python.antlr.PythonTree;
+import org.python.core.Py;
+import org.python.core.PyObject;
+
import org.antlr.runtime.*;
public class ParseException extends RuntimeException {
@@ -13,28 +16,49 @@
public int charPositionInLine;
public boolean approximateLineInfo;
+ private PyObject type = Py.SyntaxError;
+
public ParseException() {
super();
}
- public ParseException(String message) {
+ public ParseException(String message, int lin, int charPos) {
super(message);
+ this.line = lin;
+ this.charPositionInLine = charPos;
}
- public ParseException(String message, PythonTree node) {
- super(message);
+ public ParseException(String message) {
+ this(message, 0, 0);
}
+ /**
+ * n must not be null to use this constructor
+ */
+ public ParseException(String message, PythonTree n) {
+ this(message, n.getLine(), n.getCharPositionInLine());
+ this.node = n;
+ this.token = n.token;
+ }
+
public ParseException(String message, RecognitionException r) {
super(message);
- input = r.input;
- index = r.index;
- token = r.token;
- node = r.node;
- c = r.c;
- line = r.line;
- charPositionInLine = r.charPositionInLine;
- approximateLineInfo = r.approximateLineInfo;
+ this.input = r.input;
+ this.index = r.index;
+ this.token = r.token;
+ this.node = r.node;
+ this.c = r.c;
+ this.line = r.line;
+ this.charPositionInLine = r.charPositionInLine;
+ this.approximateLineInfo = r.approximateLineInfo;
}
+ public void setType(PyObject t) {
+ this.type = t;
+ }
+
+ public PyObject getType() {
+ return this.type;
+ }
+
}
Modified: branches/asm/src/org/python/antlr/PythonTokenSource.java
===================================================================
--- branches/asm/src/org/python/antlr/PythonTokenSource.java 2008-08-03 09:50:01 UTC (rev 5066)
+++ branches/asm/src/org/python/antlr/PythonTokenSource.java 2008-08-03 14:42:44 UTC (rev 5067)
@@ -1,5 +1,7 @@
package org.python.antlr;
+import org.python.core.Py;
+
/*
[The "BSD licence"]
Copyright (c) 2004 Terence Parr and Loring Craymer
@@ -88,11 +90,14 @@
int lastTokenAddedIndex = -1;
+ String filename;
+
public PythonTokenSource(PythonLexer lexer) {
}
- public PythonTokenSource(CommonTokenStream stream) {
+ public PythonTokenSource(CommonTokenStream stream, String filename) {
this.stream = stream;
+ this.filename = filename;
// "state" of indent level is FIRST_CHAR_POSITION
push(FIRST_CHAR_POSITION);
}
@@ -265,9 +270,8 @@
if (i == -1 || i == -2) {
return FIRST_CHAR_POSITION;
}
- ParseException p = new ParseException("unindent does not match any outer indentation level");
- p.line = t.getLine();
- p.charPositionInLine = t.getCharPositionInLine();
+ ParseException p = new ParseException("unindent does not match any outer indentation level", t.getLine(), t.getCharPositionInLine());
+ p.setType(Py.IndentationError);
throw p;
}
@@ -282,7 +286,7 @@
//FIXME: needed this for the Antlr 3.1b interface change.
public String getSourceName() {
- return "XXX-need-real-name.py";
+ return filename;
}
}
Modified: branches/asm/src/org/python/core/ParserFacade.java
===================================================================
--- branches/asm/src/org/python/core/ParserFacade.java 2008-08-03 09:50:01 UTC (rev 5066)
+++ branches/asm/src/org/python/core/ParserFacade.java 2008-08-03 14:42:44 UTC (rev 5067)
@@ -46,15 +46,15 @@
if (reader == null) {
return "";
}
+ String text = null;
try {
- String text=null;
for(int i=0; i < line; i++) {
text = reader.readLine();
}
return text;
} catch (IOException ioe) {
- return null;
}
+ return text;
}
// if reader != null, reset it
@@ -80,12 +80,9 @@
}
String text=getLine(reader, line);
String msg = e.getMessage();
- if (msg == null) {
- msg = "XXX: missing msg";
+ if (e.getType() == Py.IndentationError) {
+ return new PyIndentationError(msg, line, col, text, filename);
}
- if (text == null) {
- text = "XXX: missing text";
- }
return new PySyntaxError(msg, line, col, text, filename);
}
else return Py.JavaError(t);
@@ -108,16 +105,16 @@
if (kind.equals("eval")) {
bufreader = prepBufreader(new LeadingSpaceSkippingStream(bstream), cflags, filename);
CharStream cs = new NoCloseReaderStream(bufreader);
- ExpressionParser e = new ExpressionParser(cs);
+ ExpressionParser e = new ExpressionParser(cs, filename);
node = e.parse();
} else if (kind.equals("single")) {
bufreader = prepBufreader(bstream, cflags, filename);
- InteractiveParser i = new InteractiveParser(bufreader);
+ InteractiveParser i = new InteractiveParser(bufreader, filename);
node = i.parse();
} else if (kind.equals("exec")) {
bufreader = prepBufreader(bstream, cflags, filename);
CharStream cs = new NoCloseReaderStream(bufreader);
- ModuleParser g = new ModuleParser(cs);
+ ModuleParser g = new ModuleParser(cs, filename);
node = g.file_input();
} else {
throw Py.ValueError("parse kind must be eval, exec, " + "or single");
@@ -150,7 +147,7 @@
StringUtil.toBytes(string));
BufferedInputStream bstream = bstream = new BufferedInputStream(bi);
bufreader = prepBufreader(bstream, cflags, filename);
- InteractiveParser i = new InteractiveParser(bufreader);
+ InteractiveParser i = new InteractiveParser(bufreader, filename);
node = i.parse();
} else {
throw Py.ValueError("parse kind must be eval, exec, " + "or single");
Added: branches/asm/src/org/python/core/PyIndentationError.java
===================================================================
--- branches/asm/src/org/python/core/PyIndentationError.java (rev 0)
+++ branches/asm/src/org/python/core/PyIndentationError.java 2008-08-03 14:42:44 UTC (rev 5067)
@@ -0,0 +1,33 @@
+// Copyright (c) Corporation for National Research Initiatives
+package org.python.core;
+
+/**
+ * A convenience class for creating Indentation errors. Note that the
+ * syntax error is still taken from Py.IndentationError.
+ * <p>
+ * Generally subclassing from PyException is not the right way
+ * of creating new exception classes.
+ */
+
+public class PyIndentationError extends PyException {
+ int lineno, column;
+ String text;
+ String filename;
+
+ public PyIndentationError(String s, int line, int column, String text,
+ String filename)
+ {
+ super(Py.IndentationError);
+ PyObject[] tmp = new PyObject[] {
+ new PyString(filename), new PyInteger(line),
+ new PyInteger(column), new PyString(text)
+ };
+
+ this.value = new PyTuple(new PyString(s), new PyTuple(tmp));
+
+ this.lineno = line;
+ this.column = column;
+ this.text = text;
+ this.filename = filename;
+ }
+}
Modified: branches/asm/src/org/python/core/PySyntaxError.java
===================================================================
--- branches/asm/src/org/python/core/PySyntaxError.java 2008-08-03 09:50:01 UTC (rev 5066)
+++ branches/asm/src/org/python/core/PySyntaxError.java 2008-08-03 14:42:44 UTC (rev 5067)
@@ -2,7 +2,7 @@
package org.python.core;
/**
- * A convience class for creating Syntax errors. Note that the
+ * A convenience class for creating Syntax errors. Note that the
* syntax error is still taken from Py.SyntaxError.
* <p>
* Generally subclassing from PyException is not the right way
@@ -10,7 +10,8 @@
*/
public class PySyntaxError extends PyException {
- int lineno, column;
+ int lineno;
+ int column;
String text;
String filename;
Modified: branches/asm/tests/java/org/python/antlr/PythonTreeTester.java
===================================================================
--- branches/asm/tests/java/org/python/antlr/PythonTreeTester.java 2008-08-03 09:50:01 UTC (rev 5066)
+++ branches/asm/tests/java/org/python/antlr/PythonTreeTester.java 2008-08-03 14:42:44 UTC (rev 5067)
@@ -27,13 +27,17 @@
public PythonTree parse(String[] args) throws Exception {
PythonTree result = null;
+ //ErrorHandler eh = new ListErrorHandler();
+ ErrorHandler eh = new FailFastHandler();
CharStream input = new ANTLRFileStream(args[0]);
PythonLexer lexer = new ModuleParser.PyLexer(input);
+ lexer.setErrorHandler(eh);
CommonTokenStream tokens = new CommonTokenStream(lexer);
tokens.discardOffChannelTokens(true);
- PythonTokenSource indentedSource = new PythonTokenSource(tokens);
+ PythonTokenSource indentedSource = new PythonTokenSource(tokens, args[0]);
tokens = new CommonTokenStream(indentedSource);
PythonParser parser = new PythonParser(tokens);
+ parser.setErrorHandler(eh);
parser.setTreeAdaptor(new PythonTreeAdaptor());
Tree r = null;
switch (_block) {
@@ -54,6 +58,7 @@
CommonTreeNodeStream nodes = new CommonTreeNodeStream(r);
nodes.setTokenStream(tokens);
PythonWalker walker = new PythonWalker(nodes);
+ walker.setErrorHandler(eh);
switch (_block) {
case MODULE :
result = walker.module();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pj...@us...> - 2008-08-03 18:18:36
|
Revision: 5070
http://jython.svn.sourceforge.net/jython/?rev=5070&view=rev
Author: pjenvey
Date: 2008-08-03 18:18:34 +0000 (Sun, 03 Aug 2008)
Log Message:
-----------
o FileIO whitespace, small refactor
o re-enable test_ast
Modified Paths:
--------------
branches/asm/Lib/test/regrtest.py
branches/asm/src/org/python/core/io/FileIO.java
Modified: branches/asm/Lib/test/regrtest.py
===================================================================
--- branches/asm/Lib/test/regrtest.py 2008-08-03 18:14:53 UTC (rev 5069)
+++ branches/asm/Lib/test/regrtest.py 2008-08-03 18:18:34 UTC (rev 5070)
@@ -1467,7 +1467,6 @@
_failures = {
'java':
"""
- test_ast
test_codecencodings_cn
test_codecencodings_hk
test_codecencodings_jp
Modified: branches/asm/src/org/python/core/io/FileIO.java
===================================================================
--- branches/asm/src/org/python/core/io/FileIO.java 2008-08-03 18:14:53 UTC (rev 5069)
+++ branches/asm/src/org/python/core/io/FileIO.java 2008-08-03 18:18:34 UTC (rev 5070)
@@ -69,8 +69,8 @@
if (fullPath.isDirectory()) {
throw Py.IOError(errno.EISDIR, "Is a directory");
}
- if ( (writable && !fullPath.canWrite()) ||
- fnfe.getMessage().endsWith("(Permission denied)")) {
+ if ((writable && !fullPath.canWrite())
+ || fnfe.getMessage().endsWith("(Permission denied)")) {
throw Py.IOError(errno.EACCES, "Permission denied: '" + name + "'");
}
throw Py.IOError(errno.ENOENT, "No such file or directory: '" + name + "'");
@@ -178,10 +178,11 @@
/** {@inheritDoc} */
public boolean isatty() {
checkClosed();
- if (file == null) return false;
-
+ if (file == null) {
+ return false;
+ }
try {
- return imp.load("os").__getattr__("isatty").__call__(Py.java2py(file.getFD())).__nonzero__();
+ return imp.load("os").invoke("isatty", Py.java2py(file.getFD())).__nonzero__();
} catch (IOException e) {
return false;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fwi...@us...> - 2008-08-03 22:54:17
|
Revision: 5073
http://jython.svn.sourceforge.net/jython/?rev=5073&view=rev
Author: fwierzbicki
Date: 2008-08-03 22:54:14 +0000 (Sun, 03 Aug 2008)
Log Message:
-----------
CommonToken now appears to cover the cases that ClassicToken was left around
to cover. Removed all ClassicToken.
Modified Paths:
--------------
branches/asm/grammar/Python.g
branches/asm/src/org/python/antlr/PythonPartialTokenSource.java
branches/asm/src/org/python/antlr/PythonTokenSource.java
branches/asm/src/org/python/antlr/PythonTree.java
branches/asm/src/org/python/antlr/PythonTreeAdaptor.java
Removed Paths:
-------------
branches/asm/src/org/python/antlr/ImaginaryToken.java
Modified: branches/asm/grammar/Python.g
===================================================================
--- branches/asm/grammar/Python.g 2008-08-03 21:45:49 UTC (rev 5072)
+++ branches/asm/grammar/Python.g 2008-08-03 22:54:14 UTC (rev 5073)
@@ -1337,7 +1337,7 @@
*/
CONTINUED_LINE
: '\\' ('\r')? '\n' (' '|'\t')* { $channel=HIDDEN; }
- ( nl=NEWLINE {emit(new ClassicToken(NEWLINE,nl.getText()));}
+ ( nl=NEWLINE {emit(new CommonToken(NEWLINE,nl.getText()));}
|
)
;
@@ -1383,7 +1383,7 @@
for (int i=0; i<spaces; i++) {
indentation[i] = ' ';
}
- ClassicToken c = new ClassicToken(LEADING_WS,new String(indentation));
+ CommonToken c = new CommonToken(LEADING_WS,new String(indentation));
c.setLine(input.getLine());
c.setCharPositionInLine(input.getCharPositionInLine());
emit(c);
Deleted: branches/asm/src/org/python/antlr/ImaginaryToken.java
===================================================================
--- branches/asm/src/org/python/antlr/ImaginaryToken.java 2008-08-03 21:45:49 UTC (rev 5072)
+++ branches/asm/src/org/python/antlr/ImaginaryToken.java 2008-08-03 22:54:14 UTC (rev 5073)
@@ -1,29 +0,0 @@
-package org.python.antlr;
-
-import org.antlr.runtime.ClassicToken;
-
-public class ImaginaryToken extends ClassicToken {
-
- protected int start;
- protected int stop;
-
- public ImaginaryToken(int ttype, String text) {
- super(ttype, text);
- }
-
- public int getStartIndex() {
- return start;
- }
-
- public void setStartIndex(int start) {
- this.start = start;
- }
-
- public int getStopIndex() {
- return stop;
- }
-
- public void setStopIndex(int stop) {
- this.stop = stop;
- }
-}
Modified: branches/asm/src/org/python/antlr/PythonPartialTokenSource.java
===================================================================
--- branches/asm/src/org/python/antlr/PythonPartialTokenSource.java 2008-08-03 21:45:49 UTC (rev 5072)
+++ branches/asm/src/org/python/antlr/PythonPartialTokenSource.java 2008-08-03 22:54:14 UTC (rev 5073)
@@ -83,7 +83,7 @@
stream.consume();
if ( t.getType()==Token.EOF ) {
atEnd = true;
- Token em = new ClassicToken(PythonPartialParser.ENDMARKER,"");
+ Token em = new CommonToken(PythonPartialParser.ENDMARKER,"");
em.setCharPositionInLine(t.getCharPositionInLine());
em.setLine(t.getLine());
tokens.addElement(em);
@@ -123,7 +123,7 @@
int cpos = t.getCharPositionInLine(); // column dictates indent/dedent
if ( t.getType()==Token.EOF ) {
atEnd = true;
- Token em = new ClassicToken(PythonPartialParser.ENDMARKER,"");
+ Token em = new CommonToken(PythonPartialParser.ENDMARKER,"");
em.setCharPositionInLine(t.getCharPositionInLine());
em.setLine(t.getLine());
tokens.addElement(em);
@@ -142,7 +142,7 @@
if ( cpos > lastIndent ) { // they indented; track and gen INDENT
push(cpos);
//System.out.println("push("+cpos+"): "+stackString());
- Token indent = new ClassicToken(PythonPartialParser.INDENT,"");
+ Token indent = new CommonToken(PythonPartialParser.INDENT,"");
indent.setCharPositionInLine(t.getCharPositionInLine());
indent.setLine(t.getLine());
tokens.addElement(indent);
@@ -155,9 +155,9 @@
for (int d=sp-1; d>=prevIndex; d--) {
Token tok;
if (atEnd) {
- tok = new ClassicToken(PythonPartialParser.ENDMARKER,"");
+ tok = new CommonToken(PythonPartialParser.ENDMARKER,"");
} else {
- tok = new ClassicToken(PythonPartialParser.DEDENT,"");
+ tok = new CommonToken(PythonPartialParser.DEDENT,"");
}
tok.setCharPositionInLine(t.getCharPositionInLine());
tok.setLine(t.getLine());
Modified: branches/asm/src/org/python/antlr/PythonTokenSource.java
===================================================================
--- branches/asm/src/org/python/antlr/PythonTokenSource.java 2008-08-03 21:45:49 UTC (rev 5072)
+++ branches/asm/src/org/python/antlr/PythonTokenSource.java 2008-08-03 22:54:14 UTC (rev 5073)
@@ -200,7 +200,7 @@
if (cpos > lastIndent) { // they indented; track and gen INDENT
push(cpos);
//System.out.println("push("+cpos+"): "+stackString());
- Token indent = new ImaginaryToken(PythonParser.INDENT,"");
+ Token indent = new CommonToken(PythonParser.INDENT,"");
indent.setCharPositionInLine(t.getCharPositionInLine());
indent.setLine(t.getLine());
tokens.addElement(indent);
@@ -211,7 +211,7 @@
//System.out.println("dedented; prevIndex of cpos="+cpos+" is "+prevIndex);
// generate DEDENTs for each indent level we backed up over
for (int d = sp - 1; d >= prevIndex; d--) {
- ImaginaryToken dedent = new ImaginaryToken(PythonParser.DEDENT,"");
+ CommonToken dedent = new CommonToken(PythonParser.DEDENT,"");
dedent.setCharPositionInLine(t.getCharPositionInLine());
dedent.setLine(t.getLine());
Modified: branches/asm/src/org/python/antlr/PythonTree.java
===================================================================
--- branches/asm/src/org/python/antlr/PythonTree.java 2008-08-03 21:45:49 UTC (rev 5072)
+++ branches/asm/src/org/python/antlr/PythonTree.java 2008-08-03 22:54:14 UTC (rev 5073)
@@ -152,12 +152,7 @@
public int getCharStartIndex() {
if (charStartIndex == -1 && token != null) {
- if (token instanceof CommonToken) {
- return ((CommonToken)token).getStartIndex();
- }
- if (token instanceof ImaginaryToken) {
- return ((ImaginaryToken)token).getStartIndex();
- }
+ return ((CommonToken)token).getStartIndex();
}
return charStartIndex ;
}
@@ -178,12 +173,7 @@
public int getCharStopIndex() {
if (charStopIndex == -1 && token != null) {
- if (token instanceof CommonToken) {
- return ((CommonToken)token).getStopIndex() + 1;
- }
- if (token instanceof ImaginaryToken) {
- return ((ImaginaryToken)token).getStopIndex() + 1;
- }
+ return ((CommonToken)token).getStopIndex() + 1;
}
return charStopIndex;
}
Modified: branches/asm/src/org/python/antlr/PythonTreeAdaptor.java
===================================================================
--- branches/asm/src/org/python/antlr/PythonTreeAdaptor.java 2008-08-03 21:45:49 UTC (rev 5072)
+++ branches/asm/src/org/python/antlr/PythonTreeAdaptor.java 2008-08-03 22:54:14 UTC (rev 5073)
@@ -18,23 +18,11 @@
int stopChar = 0;
if (startToken!=null) {
start = startToken.getTokenIndex();
- //XXX: instanceof is necessary because of the use of ClassicToken
- // for leading whitespace lexing.
- if (startToken instanceof CommonToken) {
- startChar = ((CommonToken)startToken).getStartIndex();
- } else if (startToken instanceof ImaginaryToken) {
- startChar = ((ImaginaryToken)startToken).getStartIndex();
- }
+ startChar = ((CommonToken)startToken).getStartIndex();
}
if (stopToken!=null) {
stop = stopToken.getTokenIndex();
- //XXX: instanceof is necessary because of the use of ClassicToken
- // for leading whitespace lexing.
- if (stopToken instanceof CommonToken) {
- stopChar = ((CommonToken)stopToken).getStopIndex() + 1;
- } else if (stopToken instanceof ImaginaryToken) {
- stopChar = ((ImaginaryToken)stopToken).getStopIndex() + 1;
- }
+ stopChar = ((CommonToken)stopToken).getStopIndex() + 1;
}
PythonTree pt = (PythonTree)t;
pt.setTokenStartIndex(start);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fwi...@us...> - 2008-08-04 01:15:50
|
Revision: 5074
http://jython.svn.sourceforge.net/jython/?rev=5074&view=rev
Author: fwierzbicki
Date: 2008-08-04 01:15:48 +0000 (Mon, 04 Aug 2008)
Log Message:
-----------
Fixes to handle parsing with files that have no newline at the end.
Modified Paths:
--------------
branches/asm/grammar/Python.g
branches/asm/src/org/python/antlr/PythonTokenSource.java
Modified: branches/asm/grammar/Python.g
===================================================================
--- branches/asm/grammar/Python.g 2008-08-03 22:54:14 UTC (rev 5073)
+++ branches/asm/grammar/Python.g 2008-08-04 01:15:48 UTC (rev 5074)
@@ -1383,10 +1383,14 @@
for (int i=0; i<spaces; i++) {
indentation[i] = ' ';
}
- CommonToken c = new CommonToken(LEADING_WS,new String(indentation));
- c.setLine(input.getLine());
- c.setCharPositionInLine(input.getCharPositionInLine());
- emit(c);
+ if (input.LA(1) != -1) {
+ CommonToken c = new CommonToken(LEADING_WS,new String(indentation));
+ c.setLine(input.getLine());
+ c.setCharPositionInLine(input.getCharPositionInLine());
+ emit(c);
+ } else {
+ emit(new CommonToken(LEADING_WS,""));
+ }
}
// kill trailing newline if present and then ignore
( ('\r')? '\n' {if (state.token!=null) state.token.setChannel(HIDDEN); else $channel=HIDDEN;})*
Modified: branches/asm/src/org/python/antlr/PythonTokenSource.java
===================================================================
--- branches/asm/src/org/python/antlr/PythonTokenSource.java 2008-08-03 22:54:14 UTC (rev 5073)
+++ branches/asm/src/org/python/antlr/PythonTokenSource.java 2008-08-04 01:15:48 UTC (rev 5074)
@@ -179,8 +179,8 @@
newline = new CommonToken(PythonLexer.NEWLINE, "\n");
newline.setLine(t.getLine());
newline.setCharPositionInLine(t.getCharPositionInLine());
- //XXX: should be moved to after DEDENTS are generated, but doesn't work yet.
- tokens.addElement(newline);
+ //XXX: this is where lsoto had this...
+ //tokens.addElement(newline);
}
// compute cpos as the char pos of next non-WS token in line
@@ -223,13 +223,10 @@
}
sp = prevIndex; // pop those off indent level
}
- /*
- //XXX: I think this is really where this needs to be, but causes more problems than it
- // solves at the moment.
+ //XXX: make sure lsoto's stuff isn't broken by this...
if (t.getType() == PythonLexer.EOF) {
tokens.addElement(newline);
}
- */
if (t.getType() != PythonLexer.LEADING_WS) { // discard WS
tokens.addElement(t);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fwi...@us...> - 2008-08-05 16:55:25
|
Revision: 5079
http://jython.svn.sourceforge.net/jython/?rev=5079&view=rev
Author: fwierzbicki
Date: 2008-08-05 16:55:18 +0000 (Tue, 05 Aug 2008)
Log Message:
-----------
Reworked lexing of newlines and EOF. Broke up PythonTokenSource into more
useful methods. Removed inSingle from Python.g and added it to
PythonTokenSource.
Modified Paths:
--------------
branches/asm/grammar/Python.g
branches/asm/src/org/python/antlr/InteractiveParser.java
branches/asm/src/org/python/antlr/PythonTokenSource.java
Modified: branches/asm/grammar/Python.g
===================================================================
--- branches/asm/grammar/Python.g 2008-08-04 21:34:24 UTC (rev 5078)
+++ branches/asm/grammar/Python.g 2008-08-05 16:55:18 UTC (rev 5079)
@@ -182,9 +182,6 @@
}
@members {
- //XXX: only used for single_input -- seems kludgy.
- public boolean inSingle = false;
-
boolean debugOn = false;
private ErrorHandler errorHandler;
@@ -443,8 +440,6 @@
//and the same one in the parser.
private ErrorHandler errorHandler;
-//XXX: Hopefully we can remove inSingle when we get PyCF_DONT_IMPLY_DEDENT support.
-public boolean inSingle = false;
int implicitLineJoiningLevel = 0;
int startPos=-1;
@@ -489,7 +484,7 @@
}
//single_input: NEWLINE | simple_stmt | compound_stmt NEWLINE
-single_input : NEWLINE -> ^(Interactive)
+single_input : NEWLINE? -> ^(Interactive)
| simple_stmt -> ^(Interactive simple_stmt)
| compound_stmt NEWLINE -> ^(Interactive compound_stmt)
;
@@ -1349,12 +1344,11 @@
* Frank Wierzbicki added: Also ignore FORMFEEDS (\u000C).
*/
NEWLINE
- : {inSingle}? => (('\u000C')?('\r')? '\n' )
- {if (implicitLineJoiningLevel>0 )
- $channel=HIDDEN;
- }
- | (('\u000C')?('\r')? '\n' )+
- {if ( startPos==0 || implicitLineJoiningLevel>0 )
+@init {
+ int newlines = 0;
+}
+ : (('\u000C')?('\r')? '\n' {newlines++; } )+ {
+ if ( startPos==0 || implicitLineJoiningLevel>0 )
$channel=HIDDEN;
}
;
@@ -1371,30 +1365,42 @@
LEADING_WS
@init {
int spaces = 0;
+ int newlines = 0;
}
: {startPos==0}?=>
( {implicitLineJoiningLevel>0}? ( ' ' | '\t' )+ {$channel=HIDDEN;}
| ( ' ' { spaces++; }
| '\t' { spaces += 8; spaces -= (spaces \% 8); }
)+
- {
- // make a string of n spaces where n is column number - 1
- char[] indentation = new char[spaces];
- for (int i=0; i<spaces; i++) {
- indentation[i] = ' ';
- }
- if (input.LA(1) != -1) {
- CommonToken c = new CommonToken(LEADING_WS,new String(indentation));
- c.setLine(input.getLine());
- c.setCharPositionInLine(input.getCharPositionInLine());
- emit(c);
- } else {
- emit(new CommonToken(LEADING_WS,""));
- }
- }
- // kill trailing newline if present and then ignore
- ( ('\r')? '\n' {if (state.token!=null) state.token.setChannel(HIDDEN); else $channel=HIDDEN;})*
- // {state.token.setChannel(99); }
+ ( ('\r')? '\n' {newlines++; }
+ )* {
+ if (input.LA(1) != -1) {
+ // make a string of n spaces where n is column number - 1
+ char[] indentation = new char[spaces];
+ for (int i=0; i<spaces; i++) {
+ indentation[i] = ' ';
+ }
+ CommonToken c = new CommonToken(LEADING_WS,new String(indentation));
+ c.setLine(input.getLine());
+ c.setCharPositionInLine(input.getCharPositionInLine());
+ emit(c);
+ // kill trailing newline if present and then ignore
+ if (newlines != 0) {
+ if (state.token!=null) {
+ state.token.setChannel(HIDDEN);
+ } else {
+ $channel=HIDDEN;
+ }
+ }
+ } else {
+ // make a string of n newlines
+ char[] nls = new char[newlines];
+ for (int i=0; i<newlines; i++) {
+ nls[i] = '\n';
+ }
+ emit(new CommonToken(NEWLINE,new String(nls)));
+ }
+ }
)
;
Modified: branches/asm/src/org/python/antlr/InteractiveParser.java
===================================================================
--- branches/asm/src/org/python/antlr/InteractiveParser.java 2008-08-04 21:34:24 UTC (rev 5078)
+++ branches/asm/src/org/python/antlr/InteractiveParser.java 2008-08-05 16:55:18 UTC (rev 5079)
@@ -41,15 +41,12 @@
modType tree = null;
PythonLexer lexer = new PyLexer(new NoCloseReaderStream(bufreader));
lexer.setErrorHandler(errorHandler);
- //XXX: Hopefully we can remove inSingle when we get PyCF_DONT_IMPLY_DEDENT support.
- lexer.inSingle = true;
CommonTokenStream tokens = new CommonTokenStream(lexer);
tokens.discardOffChannelTokens(true);
- PythonTokenSource indentedSource = new PythonTokenSource(tokens, filename);
+ PythonTokenSource indentedSource = new PythonTokenSource(tokens, filename, true);
tokens = new CommonTokenStream(indentedSource);
PythonParser parser = new PythonParser(tokens);
parser.setErrorHandler(errorHandler);
- parser.inSingle = true;
parser.setTreeAdaptor(new PythonTreeAdaptor());
try {
Modified: branches/asm/src/org/python/antlr/PythonTokenSource.java
===================================================================
--- branches/asm/src/org/python/antlr/PythonTokenSource.java 2008-08-04 21:34:24 UTC (rev 5078)
+++ branches/asm/src/org/python/antlr/PythonTokenSource.java 2008-08-05 16:55:18 UTC (rev 5079)
@@ -91,13 +91,20 @@
int lastTokenAddedIndex = -1;
String filename;
+ boolean inSingle;
public PythonTokenSource(PythonLexer lexer) {
}
+
public PythonTokenSource(CommonTokenStream stream, String filename) {
+ this(stream, filename, false);
+ }
+
+ public PythonTokenSource(CommonTokenStream stream, String filename, boolean single) {
this.stream = stream;
this.filename = filename;
+ this.inSingle = single;
// "state" of indent level is FIRST_CHAR_POSITION
push(FIRST_CHAR_POSITION);
}
@@ -129,7 +136,7 @@
if (tokens.size() > 0) {
Token t = (Token)tokens.firstElement();
tokens.removeElementAt(0);
- //System.out.println(t);
+ //System.out.println(filename + t);
return t;
}
@@ -138,32 +145,36 @@
return nextToken();
}
+ private void generateNewline(Token t) {
+ // Imaginary newline before EOF
+ CommonToken newline = new CommonToken(PythonLexer.NEWLINE, "\n");
+ newline.setLine(t.getLine());
+ newline.setCharPositionInLine(t.getCharPositionInLine());
+ tokens.addElement(newline);
+ }
+
protected void insertImaginaryIndentDedentTokens() {
Token t = stream.LT(1);
stream.consume();
- // if the current token is not a NEWLINE or EOF, it doesn't signal indent/dedent work; just enqueue
- if (t.getType() != PythonLexer.NEWLINE && t.getType() != PythonLexer.EOF) {
- List hiddenTokens = stream.getTokens(lastTokenAddedIndex + 1,t.getTokenIndex() - 1);
- if (hiddenTokens != null) {
- tokens.addAll(hiddenTokens);
+ if (t.getType() == Token.EOF) {
+ Token prev = stream.LT(-1);
+ if (!inSingle && (prev == null || prev.getType() != PythonLexer.NEWLINE)) {
+ generateNewline(t);
}
- lastTokenAddedIndex = t.getTokenIndex();
- tokens.addElement(t);
- return;
- }
- CommonToken newline;
- if (t.getType() == PythonLexer.NEWLINE) {
+ handleDedents(-1, (CommonToken)t);
+ enqueue(t);
+ } else if (t.getType() == PythonLexer.NEWLINE) {
// save NEWLINE in the queue
//System.out.println("found newline: "+t+" stack is "+stackString());
- newline = (CommonToken)t;
List hiddenTokens = stream.getTokens(lastTokenAddedIndex + 1,t.getTokenIndex() - 1);
if (hiddenTokens!=null) {
tokens.addAll(hiddenTokens);
}
lastTokenAddedIndex = t.getTokenIndex();
tokens.addElement(t);
+ Token newline = t;
// grab first token of next line
t = stream.LT(1);
@@ -174,63 +185,85 @@
tokens.addAll(hiddenTokens);
}
lastTokenAddedIndex = t.getTokenIndex();
- } else {
- // Imaginary newline before EOF
- newline = new CommonToken(PythonLexer.NEWLINE, "\n");
- newline.setLine(t.getLine());
- newline.setCharPositionInLine(t.getCharPositionInLine());
- //XXX: this is where lsoto had this...
- //tokens.addElement(newline);
- }
- // compute cpos as the char pos of next non-WS token in line
- int cpos = t.getCharPositionInLine(); // column dictates indent/dedent
- if (t.getType() == Token.EOF) {
- cpos = -1; // pretend EOF always happens at left edge
- }
- else if (t.getType() == PythonLexer.LEADING_WS) {
- cpos = t.getText().length();
- }
+ // compute cpos as the char pos of next non-WS token in line
+ int cpos = t.getCharPositionInLine(); // column dictates indent/dedent
+ if (t.getType() == Token.EOF) {
+ cpos = -1; // pretend EOF always happens at left edge
+ }
+ else if (t.getType() == PythonLexer.LEADING_WS) {
+ Token next = stream.LT(1);
+ if (next != null && next.getType() == Token.EOF) {
+ stream.consume();
+ return;
+ } else {
+ cpos = t.getText().length();
+ }
+ }
- //System.out.println("next token is: "+t);
+ //System.out.println("next token is: "+t);
- // compare to last indent level
- int lastIndent = peek();
- //System.out.println("cpos, lastIndent = "+cpos+", "+lastIndent);
- if (cpos > lastIndent) { // they indented; track and gen INDENT
- push(cpos);
- //System.out.println("push("+cpos+"): "+stackString());
- Token indent = new CommonToken(PythonParser.INDENT,"");
- indent.setCharPositionInLine(t.getCharPositionInLine());
- indent.setLine(t.getLine());
- tokens.addElement(indent);
- }
- else if (cpos < lastIndent) { // they dedented
- // how far back did we dedent?
- int prevIndex = findPreviousIndent(cpos, t);
- //System.out.println("dedented; prevIndex of cpos="+cpos+" is "+prevIndex);
- // generate DEDENTs for each indent level we backed up over
- for (int d = sp - 1; d >= prevIndex; d--) {
- CommonToken dedent = new CommonToken(PythonParser.DEDENT,"");
- dedent.setCharPositionInLine(t.getCharPositionInLine());
- dedent.setLine(t.getLine());
+ // compare to last indent level
+ int lastIndent = peek();
+ //System.out.println("cpos, lastIndent = "+cpos+", "+lastIndent);
+ if (cpos > lastIndent) { // they indented; track and gen INDENT
+ handleIndents(cpos, (CommonToken)t);
+ }
+ else if (cpos < lastIndent) { // they dedented
+ handleDedents(cpos, (CommonToken)t);
+ }
- //XXX: this will get messed up by comments.
- dedent.setStartIndex(newline.getStartIndex());
- dedent.setStopIndex(newline.getStopIndex());
+ if (t.getType() == Token.EOF && inSingle) {
+ String newlines = newline.getText();
+ for(int i=1;i<newlines.length();i++) {
+ generateNewline(newline);
+ }
+ }
- tokens.addElement(dedent);
+ if (t.getType() != PythonLexer.LEADING_WS) { // discard WS
+ tokens.addElement(t);
}
- sp = prevIndex; // pop those off indent level
+
+ } else {
+ enqueue(t);
}
- //XXX: make sure lsoto's stuff isn't broken by this...
- if (t.getType() == PythonLexer.EOF) {
- tokens.addElement(newline);
+ }
+
+ private void enqueue(Token t) {
+ List hiddenTokens = stream.getTokens(lastTokenAddedIndex + 1,t.getTokenIndex() - 1);
+ if (hiddenTokens != null) {
+ tokens.addAll(hiddenTokens);
}
+ lastTokenAddedIndex = t.getTokenIndex();
+ tokens.addElement(t);
+ }
- if (t.getType() != PythonLexer.LEADING_WS) { // discard WS
- tokens.addElement(t);
+ private void handleIndents(int cpos, CommonToken t) {
+ push(cpos);
+ //System.out.println("push("+cpos+"): "+stackString());
+ Token indent = new CommonToken(PythonParser.INDENT,"");
+ indent.setCharPositionInLine(t.getCharPositionInLine());
+ indent.setLine(t.getLine());
+ tokens.addElement(indent);
+ }
+
+ private void handleDedents(int cpos, CommonToken t) {
+ // how far back did we dedent?
+ int prevIndex = findPreviousIndent(cpos, t);
+ //System.out.println("dedented; prevIndex of cpos="+cpos+" is "+prevIndex);
+ // generate DEDENTs for each indent level we backed up over
+ for (int d = sp - 1; d >= prevIndex; d--) {
+ CommonToken dedent = new CommonToken(PythonParser.DEDENT,"");
+ dedent.setCharPositionInLine(t.getCharPositionInLine());
+ dedent.setLine(t.getLine());
+
+ //XXX: this will get messed up by comments.
+ dedent.setStartIndex(t.getStartIndex());
+ dedent.setStopIndex(t.getStopIndex());
+
+ tokens.addElement(dedent);
}
+ sp = prevIndex; // pop those off indent level
}
// T O K E N S T A C K M E T H O D S
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pj...@us...> - 2008-08-06 02:48:50
|
Revision: 5090
http://jython.svn.sourceforge.net/jython/?rev=5090&view=rev
Author: pjenvey
Date: 2008-08-06 02:48:46 +0000 (Wed, 06 Aug 2008)
Log Message:
-----------
PEP 305 (csv module)
patches from Paul Drummond, Dave Kuhlman (thanks!)
fixes #1650802
Modified Paths:
--------------
branches/asm/CPythonLib.includes
branches/asm/CoreExposed.includes
branches/asm/src/org/python/modules/Setup.java
branches/asm/src/templates/mappings
Added Paths:
-----------
branches/asm/src/org/python/modules/_csv/
branches/asm/src/org/python/modules/_csv/PyDialect.java
branches/asm/src/org/python/modules/_csv/PyDialectDerived.java
branches/asm/src/org/python/modules/_csv/PyReader.java
branches/asm/src/org/python/modules/_csv/PyWriter.java
branches/asm/src/org/python/modules/_csv/QuoteStyle.java
branches/asm/src/org/python/modules/_csv/_csv.java
branches/asm/src/templates/dialect.derived
Modified: branches/asm/CPythonLib.includes
===================================================================
--- branches/asm/CPythonLib.includes 2008-08-06 02:27:45 UTC (rev 5089)
+++ branches/asm/CPythonLib.includes 2008-08-06 02:48:46 UTC (rev 5090)
@@ -43,6 +43,7 @@
copy.py
copy_reg.py
Cookie.py
+csv.py
difflib.py
dircache.py
dircmp.py
Modified: branches/asm/CoreExposed.includes
===================================================================
--- branches/asm/CoreExposed.includes 2008-08-06 02:27:45 UTC (rev 5089)
+++ branches/asm/CoreExposed.includes 2008-08-06 02:48:46 UTC (rev 5090)
@@ -36,6 +36,9 @@
org/python/core/PyUnicode.class
org/python/core/PyXRange.class
org/python/modules/_codecs$EncodingMap.class
+org/python/modules/_csv/PyDialect.class
+org/python/modules/_csv/PyReader.class
+org/python/modules/_csv/PyWriter.class
org/python/modules/_functools/PyPartial.class
org/python/modules/_weakref/CallableProxyType.class
org/python/modules/_weakref/ReferenceType.class
Modified: branches/asm/src/org/python/modules/Setup.java
===================================================================
--- branches/asm/src/org/python/modules/Setup.java 2008-08-06 02:27:45 UTC (rev 5089)
+++ branches/asm/src/org/python/modules/Setup.java 2008-08-06 02:48:46 UTC (rev 5090)
@@ -53,6 +53,7 @@
"collections:org.python.modules.collections.Collections",
"gc",
"_hashlib",
- "_functools:org.python.modules._functools._functools"
+ "_functools:org.python.modules._functools._functools",
+ "_csv:org.python.modules._csv._csv"
};
}
Added: branches/asm/src/org/python/modules/_csv/PyDialect.java
===================================================================
--- branches/asm/src/org/python/modules/_csv/PyDialect.java (rev 0)
+++ branches/asm/src/org/python/modules/_csv/PyDialect.java 2008-08-06 02:48:46 UTC (rev 5090)
@@ -0,0 +1,217 @@
+/* Copyright (c) Jython Developers */
+package org.python.modules._csv;
+
+import org.python.core.ArgParser;
+import org.python.core.Py;
+import org.python.core.PyBaseString;
+import org.python.core.PyInteger;
+import org.python.core.PyNewWrapper;
+import org.python.core.PyObject;
+import org.python.core.PyString;
+import org.python.core.PyType;
+import org.python.expose.ExposedDelete;
+import org.python.expose.ExposedGet;
+import org.python.expose.ExposedNew;
+import org.python.expose.ExposedSet;
+import org.python.expose.ExposedType;
+
+/**
+ * The Python CSV Dialect type.
+ */
+@ExposedType(name = "_csv.Dialect")
+public class PyDialect extends PyObject {
+
+ public static final PyType TYPE = PyType.fromClass(PyDialect.class);
+
+ public PyString __doc__ = Py.newString(
+ "CSV dialect\n" +
+ "\n" +
+ "The Dialect type records CSV parsing and generation options.\n");
+
+ /** Whether " is represented by "". */
+ @ExposedGet
+ public boolean doublequote;
+
+ /** Field separator. */
+ @ExposedGet
+ public char delimiter;
+
+ /** Quote character. */
+ public char quotechar;
+
+ /** Escape character. */
+ public char escapechar;
+
+ /** Ignore spaces following delimiter? */
+ @ExposedGet
+ public boolean skipinitialspace;
+
+ /** String to write between records. */
+ @ExposedGet
+ public String lineterminator;
+
+ /** Style of quoting to write. */
+ public QuoteStyle quoting;
+
+ /** Whether an exception is raised on bad CSV. */
+ @ExposedGet
+ public boolean strict;
+
+ public PyDialect() {
+ super(TYPE);
+ }
+
+ public PyDialect(PyType subType) {
+ super(subType);
+ }
+
+ @ExposedNew
+ final static PyObject Dialect___new__(PyNewWrapper new_, boolean init, PyType subtype,
+ PyObject[] args, String[] keywords) {
+ ArgParser ap = new ArgParser("__new__", args, keywords,
+ new String[] {"dialect", "delimiter", "doublequote",
+ "escapechar", "lineterminator", "quotechar",
+ "quoting", "skipinitialspace", "strict"});
+ PyObject dialect = ap.getPyObject(0, null);
+ PyObject delimiter = ap.getPyObject(1, null);
+ PyObject doublequote = ap.getPyObject(2, null);
+ PyObject escapechar = ap.getPyObject(3, null);
+ PyObject lineterminator = ap.getPyObject(4, null);
+ PyObject quotechar = ap.getPyObject(5, null);
+ PyObject quoting = ap.getPyObject(6, null);
+ PyObject skipinitialspace = ap.getPyObject(7, null);
+ PyObject strict = ap.getPyObject(8, null);
+
+ if (dialect instanceof PyString) {
+ dialect = _csv.get_dialect_from_registry(dialect);
+ }
+
+ // Can we reuse this instance?
+ if (dialect instanceof PyDialect && delimiter == null && doublequote == null
+ && escapechar == null && lineterminator == null && quotechar == null && quoting == null
+ && skipinitialspace == null && strict == null) {
+ return dialect;
+ }
+
+ if (dialect != null) {
+ delimiter = delimiter != null ? delimiter : dialect.__findattr__("delimiter");
+ doublequote = doublequote != null
+ ? doublequote : dialect.__findattr__("doublequote");
+ escapechar = escapechar != null ? escapechar : dialect.__findattr__("escapechar");
+ lineterminator = lineterminator != null
+ ? lineterminator : dialect.__findattr__("lineterminator");
+ quotechar = quotechar != null ? quotechar : dialect.__findattr__("quotechar");
+ quoting = quoting != null ? quoting : dialect.__findattr__("quoting");
+ skipinitialspace = skipinitialspace != null
+ ? skipinitialspace : dialect.__findattr__("skipinitialspace");
+ strict = strict != null ? strict : dialect.__findattr__("strict");
+ }
+
+ PyDialect self;
+ if (new_.for_type == subtype) {
+ self = new PyDialect();
+ } else {
+ self = new PyDialectDerived(subtype);
+ }
+
+ // check types and convert to Java values
+ int quotingOrdinal;
+ self.delimiter = toChar("delimiter", delimiter, ',');
+ self.doublequote = toBool("doublequote", doublequote, true);
+ self.escapechar = toChar("escapechar", escapechar, '\0');
+ self.lineterminator = toStr("lineterminator", lineterminator, "\r\n");
+ self.quotechar = toChar("quotechar", quotechar, '"');
+ quotingOrdinal = toInt("quoting", quoting, QuoteStyle.QUOTE_MINIMAL.ordinal());
+ self.skipinitialspace = toBool("skipinitialspace", skipinitialspace, false);
+ self.strict = toBool("strict", strict, false);
+
+ // validate options
+ self.quoting = QuoteStyle.fromOrdinal(quotingOrdinal);
+ if (self.quoting == null) {
+ throw Py.TypeError("bad \"quoting\" value");
+ }
+ if (self.delimiter == '\0') {
+ throw Py.TypeError("delimiter must be set");
+ }
+ if (quotechar == Py.None && quoting == null) {
+ self.quoting = QuoteStyle.QUOTE_NONE;
+ }
+ if (self.quoting != QuoteStyle.QUOTE_NONE && self.quotechar == '\0') {
+ throw Py.TypeError("quotechar must be set if quoting enabled");
+ }
+ if (self.lineterminator == null) {
+ throw Py.TypeError("lineterminator must be set");
+ }
+
+ return self;
+ }
+
+ private static boolean toBool(String name, PyObject src, boolean dflt) {
+ return src == null ? dflt : src.__nonzero__();
+ }
+
+ private static char toChar(String name, PyObject src, char dflt) {
+ if (src == null) {
+ return dflt;
+ }
+ boolean isStr = Py.isInstance(src, PyString.TYPE);
+ if (src == Py.None || isStr && src.__len__() == 0) {
+ return '\0';
+ } else if (!isStr || src.__len__() != 1) {
+ throw Py.TypeError(String.format("\"%s\" must be an 1-character string", name));
+ }
+ return src.toString().charAt(0);
+ }
+
+ private static int toInt(String name, PyObject src, int dflt) {
+ if (src == null) {
+ return dflt;
+ }
+ if (!(src instanceof PyInteger)) {
+ throw Py.TypeError(String.format("\"%s\" must be an integer", name));
+ }
+ return src.asInt();
+ }
+
+ private static String toStr(String name, PyObject src, String dflt) {
+ if (src == null) {
+ return dflt;
+ }
+ if (src == Py.None) {
+ return null;
+ }
+ if (!(src instanceof PyBaseString)) {
+ throw Py.TypeError(String.format("\"%s\" must be an string", name));
+ }
+ return src.toString();
+ }
+
+ @ExposedGet(name = "escapechar")
+ public PyObject getEscapechar() {
+ return escapechar == '\0' ? Py.None : Py.newString(escapechar);
+ }
+
+ @ExposedGet(name = "quotechar")
+ public PyObject getQuotechar() {
+ return quotechar == '\0' ? Py.None : Py.newString(quotechar);
+ }
+
+ @ExposedGet(name = "quoting")
+ public PyObject getQuoting() {
+ return Py.newInteger(quoting.ordinal());
+ }
+
+ // XXX: setQuoting and delQuoting are to make test_csv pass (currently we incorrectly
+ // throw TypeErrors for get/set AttributeError failures)
+ @ExposedSet(name = "quoting")
+ public void setQuoting(PyObject obj) {
+ throw Py.AttributeError(String.format("attribute '%s' of '%s' objects is not writable",
+ "quoting", getType().fastGetName()));
+ }
+
+ @ExposedDelete(name = "quoting")
+ public void delQuoting() {
+ throw Py.AttributeError(String.format("attribute '%s' of '%s' objects is not writable",
+ "quoting", getType().fastGetName()));
+ }
+}
Added: branches/asm/src/org/python/modules/_csv/PyDialectDerived.java
===================================================================
--- branches/asm/src/org/python/modules/_csv/PyDialectDerived.java (rev 0)
+++ branches/asm/src/org/python/modules/_csv/PyDialectDerived.java 2008-08-06 02:48:46 UTC (rev 5090)
@@ -0,0 +1,1104 @@
+/* Generated file, do not modify. See jython/src/templates/gderived.py. */
+package org.python.modules._csv;
+
+import org.python.core.*;
+
+public class PyDialectDerived extends PyDialect implements Slotted {
+
+ public PyObject getSlot(int index) {
+ return slots[index];
+ }
+
+ public void setSlot(int index,PyObject value) {
+ slots[index]=value;
+ }
+
+ private PyObject[]slots;
+
+ public PyDialectDerived(PyType subtype) {
+ super(subtype);
+ slots=new PyObject[subtype.getNumSlots()];
+ }
+
+ public PyString __str__() {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__str__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__();
+ if (res instanceof PyString)
+ return(PyString)res;
+ throw Py.TypeError("__str__"+" returned non-"+"string"+" (type "+res.getType().fastGetName()+")");
+ }
+ return super.__str__();
+ }
+
+ public PyString __repr__() {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__repr__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__();
+ if (res instanceof PyString)
+ return(PyString)res;
+ throw Py.TypeError("__repr__"+" returned non-"+"string"+" (type "+res.getType().fastGetName()+")");
+ }
+ return super.__repr__();
+ }
+
+ public PyString __hex__() {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__hex__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__();
+ if (res instanceof PyString)
+ return(PyString)res;
+ throw Py.TypeError("__hex__"+" returned non-"+"string"+" (type "+res.getType().fastGetName()+")");
+ }
+ return super.__hex__();
+ }
+
+ public PyString __oct__() {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__oct__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__();
+ if (res instanceof PyString)
+ return(PyString)res;
+ throw Py.TypeError("__oct__"+" returned non-"+"string"+" (type "+res.getType().fastGetName()+")");
+ }
+ return super.__oct__();
+ }
+
+ public PyFloat __float__() {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__float__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__();
+ if (res instanceof PyFloat)
+ return(PyFloat)res;
+ throw Py.TypeError("__float__"+" returned non-"+"float"+" (type "+res.getType().fastGetName()+")");
+ }
+ return super.__float__();
+ }
+
+ public PyComplex __complex__() {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__complex__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__();
+ if (res instanceof PyComplex)
+ return(PyComplex)res;
+ throw Py.TypeError("__complex__"+" returned non-"+"complex"+" (type "+res.getType().fastGetName()+")");
+ }
+ return super.__complex__();
+ }
+
+ public PyObject __pos__() {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__pos__");
+ if (impl!=null)
+ return impl.__get__(this,self_type).__call__();
+ return super.__pos__();
+ }
+
+ public PyObject __neg__() {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__neg__");
+ if (impl!=null)
+ return impl.__get__(this,self_type).__call__();
+ return super.__neg__();
+ }
+
+ public PyObject __abs__() {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__abs__");
+ if (impl!=null)
+ return impl.__get__(this,self_type).__call__();
+ return super.__abs__();
+ }
+
+ public PyObject __invert__() {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__invert__");
+ if (impl!=null)
+ return impl.__get__(this,self_type).__call__();
+ return super.__invert__();
+ }
+
+ public PyObject __reduce__() {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__reduce__");
+ if (impl!=null)
+ return impl.__get__(this,self_type).__call__();
+ return super.__reduce__();
+ }
+
+ public PyObject __add__(PyObject other) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__add__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__(other);
+ if (res==Py.NotImplemented)
+ return null;
+ return res;
+ }
+ return super.__add__(other);
+ }
+
+ public PyObject __radd__(PyObject other) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__radd__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__(other);
+ if (res==Py.NotImplemented)
+ return null;
+ return res;
+ }
+ return super.__radd__(other);
+ }
+
+ public PyObject __sub__(PyObject other) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__sub__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__(other);
+ if (res==Py.NotImplemented)
+ return null;
+ return res;
+ }
+ return super.__sub__(other);
+ }
+
+ public PyObject __rsub__(PyObject other) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__rsub__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__(other);
+ if (res==Py.NotImplemented)
+ return null;
+ return res;
+ }
+ return super.__rsub__(other);
+ }
+
+ public PyObject __mul__(PyObject other) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__mul__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__(other);
+ if (res==Py.NotImplemented)
+ return null;
+ return res;
+ }
+ return super.__mul__(other);
+ }
+
+ public PyObject __rmul__(PyObject other) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__rmul__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__(other);
+ if (res==Py.NotImplemented)
+ return null;
+ return res;
+ }
+ return super.__rmul__(other);
+ }
+
+ public PyObject __div__(PyObject other) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__div__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__(other);
+ if (res==Py.NotImplemented)
+ return null;
+ return res;
+ }
+ return super.__div__(other);
+ }
+
+ public PyObject __rdiv__(PyObject other) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__rdiv__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__(other);
+ if (res==Py.NotImplemented)
+ return null;
+ return res;
+ }
+ return super.__rdiv__(other);
+ }
+
+ public PyObject __floordiv__(PyObject other) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__floordiv__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__(other);
+ if (res==Py.NotImplemented)
+ return null;
+ return res;
+ }
+ return super.__floordiv__(other);
+ }
+
+ public PyObject __rfloordiv__(PyObject other) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__rfloordiv__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__(other);
+ if (res==Py.NotImplemented)
+ return null;
+ return res;
+ }
+ return super.__rfloordiv__(other);
+ }
+
+ public PyObject __truediv__(PyObject other) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__truediv__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__(other);
+ if (res==Py.NotImplemented)
+ return null;
+ return res;
+ }
+ return super.__truediv__(other);
+ }
+
+ public PyObject __rtruediv__(PyObject other) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__rtruediv__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__(other);
+ if (res==Py.NotImplemented)
+ return null;
+ return res;
+ }
+ return super.__rtruediv__(other);
+ }
+
+ public PyObject __mod__(PyObject other) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__mod__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__(other);
+ if (res==Py.NotImplemented)
+ return null;
+ return res;
+ }
+ return super.__mod__(other);
+ }
+
+ public PyObject __rmod__(PyObject other) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__rmod__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__(other);
+ if (res==Py.NotImplemented)
+ return null;
+ return res;
+ }
+ return super.__rmod__(other);
+ }
+
+ public PyObject __divmod__(PyObject other) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__divmod__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__(other);
+ if (res==Py.NotImplemented)
+ return null;
+ return res;
+ }
+ return super.__divmod__(other);
+ }
+
+ public PyObject __rdivmod__(PyObject other) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__rdivmod__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__(other);
+ if (res==Py.NotImplemented)
+ return null;
+ return res;
+ }
+ return super.__rdivmod__(other);
+ }
+
+ public PyObject __rpow__(PyObject other) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__rpow__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__(other);
+ if (res==Py.NotImplemented)
+ return null;
+ return res;
+ }
+ return super.__rpow__(other);
+ }
+
+ public PyObject __lshift__(PyObject other) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__lshift__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__(other);
+ if (res==Py.NotImplemented)
+ return null;
+ return res;
+ }
+ return super.__lshift__(other);
+ }
+
+ public PyObject __rlshift__(PyObject other) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__rlshift__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__(other);
+ if (res==Py.NotImplemented)
+ return null;
+ return res;
+ }
+ return super.__rlshift__(other);
+ }
+
+ public PyObject __rshift__(PyObject other) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__rshift__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__(other);
+ if (res==Py.NotImplemented)
+ return null;
+ return res;
+ }
+ return super.__rshift__(other);
+ }
+
+ public PyObject __rrshift__(PyObject other) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__rrshift__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__(other);
+ if (res==Py.NotImplemented)
+ return null;
+ return res;
+ }
+ return super.__rrshift__(other);
+ }
+
+ public PyObject __and__(PyObject other) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__and__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__(other);
+ if (res==Py.NotImplemented)
+ return null;
+ return res;
+ }
+ return super.__and__(other);
+ }
+
+ public PyObject __rand__(PyObject other) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__rand__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__(other);
+ if (res==Py.NotImplemented)
+ return null;
+ return res;
+ }
+ return super.__rand__(other);
+ }
+
+ public PyObject __or__(PyObject other) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__or__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__(other);
+ if (res==Py.NotImplemented)
+ return null;
+ return res;
+ }
+ return super.__or__(other);
+ }
+
+ public PyObject __ror__(PyObject other) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__ror__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__(other);
+ if (res==Py.NotImplemented)
+ return null;
+ return res;
+ }
+ return super.__ror__(other);
+ }
+
+ public PyObject __xor__(PyObject other) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__xor__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__(other);
+ if (res==Py.NotImplemented)
+ return null;
+ return res;
+ }
+ return super.__xor__(other);
+ }
+
+ public PyObject __rxor__(PyObject other) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__rxor__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__(other);
+ if (res==Py.NotImplemented)
+ return null;
+ return res;
+ }
+ return super.__rxor__(other);
+ }
+
+ public PyObject __lt__(PyObject other) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__lt__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__(other);
+ if (res==Py.NotImplemented)
+ return null;
+ return res;
+ }
+ return super.__lt__(other);
+ }
+
+ public PyObject __le__(PyObject other) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__le__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__(other);
+ if (res==Py.NotImplemented)
+ return null;
+ return res;
+ }
+ return super.__le__(other);
+ }
+
+ public PyObject __gt__(PyObject other) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__gt__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__(other);
+ if (res==Py.NotImplemented)
+ return null;
+ return res;
+ }
+ return super.__gt__(other);
+ }
+
+ public PyObject __ge__(PyObject other) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__ge__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__(other);
+ if (res==Py.NotImplemented)
+ return null;
+ return res;
+ }
+ return super.__ge__(other);
+ }
+
+ public PyObject __eq__(PyObject other) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__eq__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__(other);
+ if (res==Py.NotImplemented)
+ return null;
+ return res;
+ }
+ return super.__eq__(other);
+ }
+
+ public PyObject __ne__(PyObject other) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__ne__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__(other);
+ if (res==Py.NotImplemented)
+ return null;
+ return res;
+ }
+ return super.__ne__(other);
+ }
+
+ public PyObject __iadd__(PyObject other) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__iadd__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__(other);
+ if (res==Py.NotImplemented)
+ return null;
+ return res;
+ }
+ return super.__iadd__(other);
+ }
+
+ public PyObject __isub__(PyObject other) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__isub__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__(other);
+ if (res==Py.NotImplemented)
+ return null;
+ return res;
+ }
+ return super.__isub__(other);
+ }
+
+ public PyObject __imul__(PyObject other) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__imul__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__(other);
+ if (res==Py.NotImplemented)
+ return null;
+ return res;
+ }
+ return super.__imul__(other);
+ }
+
+ public PyObject __idiv__(PyObject other) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__idiv__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__(other);
+ if (res==Py.NotImplemented)
+ return null;
+ return res;
+ }
+ return super.__idiv__(other);
+ }
+
+ public PyObject __ifloordiv__(PyObject other) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__ifloordiv__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__(other);
+ if (res==Py.NotImplemented)
+ return null;
+ return res;
+ }
+ return super.__ifloordiv__(other);
+ }
+
+ public PyObject __itruediv__(PyObject other) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__itruediv__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__(other);
+ if (res==Py.NotImplemented)
+ return null;
+ return res;
+ }
+ return super.__itruediv__(other);
+ }
+
+ public PyObject __imod__(PyObject other) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__imod__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__(other);
+ if (res==Py.NotImplemented)
+ return null;
+ return res;
+ }
+ return super.__imod__(other);
+ }
+
+ public PyObject __ipow__(PyObject other) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__ipow__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__(other);
+ if (res==Py.NotImplemented)
+ return null;
+ return res;
+ }
+ return super.__ipow__(other);
+ }
+
+ public PyObject __ilshift__(PyObject other) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__ilshift__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__(other);
+ if (res==Py.NotImplemented)
+ return null;
+ return res;
+ }
+ return super.__ilshift__(other);
+ }
+
+ public PyObject __irshift__(PyObject other) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__irshift__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__(other);
+ if (res==Py.NotImplemented)
+ return null;
+ return res;
+ }
+ return super.__irshift__(other);
+ }
+
+ public PyObject __iand__(PyObject other) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__iand__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__(other);
+ if (res==Py.NotImplemented)
+ return null;
+ return res;
+ }
+ return super.__iand__(other);
+ }
+
+ public PyObject __ior__(PyObject other) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__ior__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__(other);
+ if (res==Py.NotImplemented)
+ return null;
+ return res;
+ }
+ return super.__ior__(other);
+ }
+
+ public PyObject __ixor__(PyObject other) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__ixor__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__(other);
+ if (res==Py.NotImplemented)
+ return null;
+ return res;
+ }
+ return super.__ixor__(other);
+ }
+
+ public PyObject __int__() {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__int__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__();
+ if (res instanceof PyInteger||res instanceof PyLong)
+ return(PyObject)res;
+ throw Py.TypeError("__int__"+" should return an integer");
+ }
+ return super.__int__();
+ }
+
+ public PyObject __long__() {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__long__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__();
+ if (res instanceof PyLong||res instanceof PyInteger)
+ return res;
+ throw Py.TypeError("__long__"+" returned non-"+"long"+" (type "+res.getType().fastGetName()+")");
+ }
+ return super.__long__();
+ }
+
+ public int hashCode() {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__hash__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__();
+ if (res instanceof PyInteger) {
+ return((PyInteger)res).getValue();
+ } else
+ if (res instanceof PyLong) {
+ return((PyLong)res).getValue().intValue();
+ }
+ throw Py.TypeError("__hash__ should return a int");
+ }
+ if (self_type.lookup("__eq__")!=null||self_type.lookup("__cmp__")!=null) {
+ throw Py.TypeError("unhashable type");
+ }
+ return super.hashCode();
+ }
+
+ public PyUnicode __unicode__() {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__unicode__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__();
+ if (res instanceof PyUnicode)
+ return(PyUnicode)res;
+ if (res instanceof PyString)
+ return new PyUnicode((PyString)res);
+ throw Py.TypeError("__unicode__"+" should return a "+"unicode");
+ }
+ return super.__unicode__();
+ }
+
+ public int __cmp__(PyObject other) {
+ PyType self_type=getType();
+ PyType[]where_type=new PyType[1];
+ PyObject impl=self_type.lookup_where("__cmp__",where_type);
+ // Full Compatibility with CPython __cmp__:
+ // If the derived type don't override __cmp__, the
+ // *internal* super().__cmp__ should be called, not the
+ // exposed one. The difference is that the exposed __cmp__
+ // throws a TypeError if the argument is an instance of the same type.
+ if (impl==null||where_type[0]==TYPE||Py.isSubClass(TYPE,where_type[0])) {
+ return super.__cmp__(other);
+ }
+ PyObject res=impl.__get__(this,self_type).__call__(other);
+ if (res instanceof PyInteger) {
+ int v=((PyInteger)res).getValue();
+ return v<0?-1:v>0?1:0;
+ }
+ throw Py.TypeError("__cmp__ should return a int");
+ }
+
+ public boolean __nonzero__() {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__nonzero__");
+ if (impl==null) {
+ impl=self_type.lookup("__len__");
+ if (impl==null)
+ return super.__nonzero__();
+ }
+ return impl.__get__(this,self_type).__call__().__nonzero__();
+ }
+
+ public boolean __contains__(PyObject o) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__contains__");
+ if (impl==null)
+ return super.__contains__(o);
+ return impl.__get__(this,self_type).__call__(o).__nonzero__();
+ }
+
+ public int __len__() {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__len__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__();
+ if (res instanceof PyInteger)
+ return((PyInteger)res).getValue();
+ throw Py.TypeError("__len__ should return a int");
+ }
+ return super.__len__();
+ }
+
+ public PyObject __iter__() {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__iter__");
+ if (impl!=null)
+ return impl.__get__(this,self_type).__call__();
+ impl=self_type.lookup("__getitem__");
+ if (impl==null)
+ return super.__iter__();
+ return new PySequenceIter(this);
+ }
+
+ public PyObject __iternext__() {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("next");
+ if (impl!=null) {
+ try {
+ return impl.__get__(this,self_type).__call__();
+ } catch (PyException exc) {
+ if (Py.matchException(exc,Py.StopIteration))
+ return null;
+ throw exc;
+ }
+ }
+ return super.__iternext__(); // ???
+ }
+
+ public PyObject __finditem__(PyObject key) { // ???
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__getitem__");
+ if (impl!=null)
+ try {
+ return impl.__get__(this,self_type).__call__(key);
+ } catch (PyException exc) {
+ if (Py.matchException(exc,Py.LookupError))
+ return null;
+ throw exc;
+ }
+ return super.__finditem__(key);
+ }
+
+ public PyObject __finditem__(int key) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__getitem__");
+ if (impl!=null)
+ try {
+ return impl.__get__(this,self_type).__call__(new PyInteger(key));
+ } catch (PyException exc) {
+ if (Py.matchException(exc,Py.LookupError))
+ return null;
+ throw exc;
+ }
+ return super.__finditem__(key);
+ }
+
+ public PyObject __getitem__(PyObject key) {
+ // Same as __finditem__, without swallowing LookupErrors. This allows
+ // __getitem__ implementations written in Python to raise custom
+ // exceptions (such as subclasses of KeyError).
+ //
+ // We are forced to duplicate the code, instead of defining __finditem__
+ // in terms of __getitem__. That's because PyObject defines __getitem__
+ // in terms of __finditem__. Therefore, we would end with an infinite
+ // loop when self_type.lookup("__getitem__") returns null:
+ //
+ // __getitem__ -> super.__getitem__ -> __finditem__ -> __getitem__
+ //
+ // By duplicating the (short) lookup and call code, we are safe, because
+ // the call chains will be:
+ //
+ // __finditem__ -> super.__finditem__
+ //
+ // __getitem__ -> super.__getitem__ -> __finditem__ -> super.__finditem__
+
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__getitem__");
+ if (impl!=null)
+ return impl.__get__(this,self_type).__call__(key);
+ return super.__getitem__(key);
+ }
+
+ public void __setitem__(PyObject key,PyObject value) { // ???
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__setitem__");
+ if (impl!=null) {
+ impl.__get__(this,self_type).__call__(key,value);
+ return;
+ }
+ super.__setitem__(key,value);
+ }
+
+ public PyObject __getslice__(PyObject start,PyObject stop,PyObject step) { // ???
+ if (step!=null) {
+ return __getitem__(new PySlice(start,stop,step));
+ }
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__getslice__");
+ if (impl!=null) {
+ PyObject[]indices=PySlice.indices2(this,start,stop);
+ return impl.__get__(this,self_type).__call__(indices[0],indices[1]);
+ }
+ return super.__getslice__(start,stop,step);
+ }
+
+ public void __setslice__(PyObject start,PyObject stop,PyObject step,PyObject value) {
+ if (step!=null) {
+ __setitem__(new PySlice(start,stop,step),value);
+ return;
+ }
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__setslice__");
+ if (impl!=null) {
+ PyObject[]indices=PySlice.indices2(this,start,stop);
+ impl.__get__(this,self_type).__call__(indices[0],indices[1],value);
+ return;
+ }
+ super.__setslice__(start,stop,step,value);
+ }
+
+ public void __delslice__(PyObject start,PyObject stop,PyObject step) {
+ if (step!=null) {
+ __delitem__(new PySlice(start,stop,step));
+ return;
+ }
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__delslice__");
+ if (impl!=null) {
+ PyObject[]indices=PySlice.indices2(this,start,stop);
+ impl.__get__(this,self_type).__call__(indices[0],indices[1]);
+ return;
+ }
+ super.__delslice__(start,stop,step);
+ }
+
+ public void __delitem__(PyObject key) { // ???
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__delitem__");
+ if (impl!=null) {
+ impl.__get__(this,self_type).__call__(key);
+ return;
+ }
+ super.__delitem__(key);
+ }
+
+ public PyObject __call__(PyObject args[],String keywords[]) {
+ ThreadState ts=Py.getThreadState();
+ if (ts.recursion_depth++>ts.systemState.getrecursionlimit())
+ throw Py.RuntimeError("maximum __call__ recursion depth exceeded");
+ try {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__call__");
+ if (impl!=null)
+ return impl.__get__(this,self_type).__call__(args,keywords);
+ return super.__call__(args,keywords);
+ } finally {
+ --ts.recursion_depth;
+ }
+ }
+
+ public PyObject __findattr__(String name) {
+ PyType self_type=getType();
+ PyObject getattribute=self_type.lookup("__getattribute__");
+ PyString py_name=null;
+ try {
+ if (getattribute!=null) {
+ return getattribute.__get__(this,self_type).__call__(py_name=PyString.fromInterned(name));
+ } else {
+ return super.__findattr__(name);
+ }
+ } catch (PyException e) {
+ if (Py.matchException(e,Py.AttributeError)) {
+ PyObject getattr=self_type.lookup("__getattr__");
+ if (getattr!=null)
+ try {
+ return getattr.__get__(this,self_type).__call__(py_name!=null?py_name:PyString.fromInterned(name));
+ } catch (PyException e1) {
+ if (!Py.matchException(e1,Py.AttributeError))
+ throw e1;
+ }
+ return null;
+ }
+ throw e;
+ }
+ }
+
+ public void __setattr__(String name,PyObject value) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__setattr__");
+ if (impl!=null) {
+ impl.__get__(this,self_type).__call__(PyString.fromInterned(name),value);
+ return;
+ }
+ super.__setattr__(name,value);
+ }
+
+ public void __delattr__(String name) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__delattr__");
+ if (impl!=null) {
+ impl.__get__(this,self_type).__call__(PyString.fromInterned(name));
+ return;
+ }
+ super.__delattr__(name);
+ }
+
+ public PyObject __get__(PyObject obj,PyObject type) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__get__");
+ if (impl!=null) {
+ if (obj==null)
+ obj=Py.None;
+ if (type==null)
+ type=Py.None;
+ return impl.__get__(this,self_type).__call__(obj,type);
+ }
+ return super.__get__(obj,type);
+ }
+
+ public void __set__(PyObject obj,PyObject value) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__set__");
+ if (impl!=null) {
+ impl.__get__(this,self_type).__call__(obj,value);
+ return;
+ }
+ super.__set__(obj,value);
+ }
+
+ public void __delete__(PyObject obj) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__delete__");
+ if (impl!=null) {
+ impl.__get__(this,self_type).__call__(obj);
+ return;
+ }
+ super.__delete__(obj);
+ }
+
+ public PyObject __pow__(PyObject other,PyObject modulo) {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__pow__");
+ if (impl!=null) {
+ PyObject res;
+ if (modulo==null) {
+ res=impl.__get__(this,self_type).__call__(other);
+ } else {
+ res=impl.__get__(this,self_type).__call__(other,modulo);
+ }
+ if (res==Py.NotImplemented)
+ return null;
+ return res;
+ }
+ return super.__pow__(other,modulo);
+ }
+
+ public void dispatch__init__(PyType type,PyObject[]args,String[]keywords) {
+ PyType self_type=getType();
+ if (self_type.isSubType(type)) {
+ PyObject impl=self_type.lookup("__init__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__(args,keywords);
+ if (res!=Py.None) {
+ throw Py.TypeError(String.format("__init__() should return None, not '%.200s'",res.getType().fastGetName()));
+ }
+ }
+ }
+ }
+
+ public PyObject __index__() {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__index__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__();
+ if (res instanceof PyInteger||res instanceof PyLong) {
+ return res;
+ }
+ throw Py.TypeError(String.format("__index__ returned non-(int,long) (type %s)",res.getType().fastGetName()));
+ }
+ return super.__index__();
+ }
+
+ public Object __tojava__(Class c) {
+ // If we are not being asked by the "default" conversion to java, then
+ // we can provide this as the result, as long as it is a instance of the
+ // specified class. Without this, derived.__tojava__(PyObject.class)
+ // would broke. (And that's not pure speculation: PyReflectedFunction's
+ // ReflectedArgs asks for things like that).
+ if ((c!=Object.class)&&(c.isInstance(this))) {
+ return this;
+ }
+ // Otherwise, we call the derived __tojava__, if it exists:
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__tojava__");
+ if (impl!=null)
+ return impl.__get__(this,self_type).__call__(Py.java2py(c)).__tojava__(Object.class);
+ return super.__tojava__(c);
+ }
+
+ public String toString() {
+ PyType self_type=getType();
+ PyObject impl=self_type.lookup("__repr__");
+ if (impl!=null) {
+ PyObject res=impl.__get__(this,self_type).__call__();
+ if (!(res instanceof PyString))
+ throw Py.TypeError("__repr__ returned non-string (type "+res.getType().fastGetName()+")");
+ return((PyString)res).toString();
+ }
+ return super.toString();
+ }
+
+}
Added: branches/asm/src/org/python/modules/_csv/PyReader.java
===================================================================
--- branches/asm/src/org/python/modules/_csv/PyReader.java (rev 0)
+++ branches/asm/src/org/python/modules/_csv/PyReader.java 2008-08-06 02:48:46 UTC (rev 5090)
@@ -0,0 +1,271 @@
+/* Copyright (c) Jython Developers */
+package org.python.modules._csv;
+
+import org.python.core.Py;
+import org.python.core.PyIterator;
+import org.python.core.PyList;
+import org.python.core.PyObject;
+import org.python.core.PyString;
+import org.python.core.PyType;
+import org.python.expose.ExposedGet;
+import org.python.expose.ExposedType;
+
+/**
+ * CSV file reader.
+ *
+ * Analogous to CPython's _csv.c::ReaderObj struct.
+ */
+@ExposedType(name = "_csv.reader")
+public class PyReader extends PyIterator {
+
+ public static final PyType TYPE = PyType.fromClass(PyReader.class);
+
+ public PyString __doc__ = Py.newString(
+ "CSV reader\n" +
+ "\n" +
+ "Reader objects are responsible for reading and parsing tabular data\n" +
+ "in CSV format.\n");
+
+ /** Parsing Dialect. */
+ @ExposedGet
+ public PyDialect dialect;
+
+ /** The current line number. */
+ @ExposedGet
+ public int line_num = 0;
+
+ /** The underlying input iterator. */
+ private PyObject input_iter;
+
+ /** Current CSV parse state. */
+ private ParserState state = ParserState.START_RECORD;
+
+ /** Field list for current record. */
+ private PyList fields = new PyList();
+
+ /** Current field builder in here. */
+ private StringBuffer field = new StringBuffer(INITIAL_BUILDER_CAPACITY);
+
+ /** Whether the field should be treated as numeric. */
+ private boolean numeric_field = false;
+
+ /** Initial capacity of the field StringBuilder. */
+ private static final int INITIAL_BUILDER_CAPACITY = 4096;
+
+ public PyReader(PyObject input_iter, PyDialect dialect) {
+ this.input_iter = input_iter;
+ this.dialect = dialect;
+ }
+
+ public PyObject __iternext__() {
+ PyObject lineobj;
+ PyObject fields;
+ String line;
+ char c;
+ int linelen;
+
+ parse_reset();
+ do {
+ lineobj = input_iter.__iternext__();
+ if (lineobj == null) {
+ // End of input OR exception
+ if (field.length() != 0) {
+ throw _csv.Error("newline inside string");
+ } else {
+ return null;
+ }
+ }
+
+ line_num++;
+ line = lineobj.toString();
+ linelen = line.length();
+
+ for (int i = 0; i < linelen; i++) {
+ c = line.charAt(i);
+ if (c == '\0') {
+ throw _csv.Error("line contains NULL byte");
+ }
+ parse_process_char(c);
+ }
+ parse_process_char('\0');
+ } while (state != ParserState.START_RECORD);
+
+ fields = this.fields;
+ this.fields = new PyList();
+
+ return fields;
+ }
+
+ private void parse_process_char(char c) {
+ switch (state) {
+ case START_RECORD:
+ // start of record
+ if (c == '\0') {
+ // empty line - return []
+ break;
+ } else if (c == '\n' || c == '\r') {
+ state = ParserState.EAT_CRNL;
+ break;
+ }
+ // normal character - handle as START_FIELD
+ state = ParserState.START_FIELD;
+ // *** fallthru ***
+ case START_FIELD:
+ // expecting field
+ if (c == '\n' || c == '\r' || c == '\0') {
+ // save empty field - return [fields]
+ parse_save_field();
+ state = c == '\0' ? ParserState.START_RECORD : ParserState.EAT_CRNL;
+ } else if (c == dialect.quotechar && dialect.quoting != QuoteStyle.QUOTE_NONE) {
+ // start quoted field
+ state = ParserState.IN_QUOTED_FIELD;
+ } else if (c == dialect.escapechar) {
+ // possible escaped character
+ state = ParserState.ESCAPED_CHAR;
+ } else if (c == ' ' && dialect.skipinitialspace) {
+ // ignore space at start of field
+ ;
+ } else if (c == dialect.delimiter) {
+ // save empty field
+ parse_save_field();
+ } else {
+ // begin new unquoted field
+ if (dialect.quoting == QuoteStyle.QUOTE_NONNUMERIC) {
+ numeric_field = true;
+ }
+ parse_add_char(c);
+ state = ParserState.IN_FIELD;
+ }
+ break;
+
+ case ESCAPED_CHAR:
+ if (c == '\0') {
+ c = '\n';
+ }
+ parse_add_char(c);
+ state = ParserState.IN_FIELD;
+ break;
+
+ case IN_FIELD:
+ // in unquoted field
+ if (c == '\n' || c == '\r' || c == '\0') {
+ // end of line - return [fields]
+ parse_save_field();
+ state = c == '\0' ? ParserState.START_RECORD : ParserState.EAT_CRNL;
+ } else if (c == dialect.escapechar) {
+ // possible escaped character
+ state = ParserState.ESCAPED_CHAR;
+ } else if (c == dialect.delimiter) {
+ // save field - wait for new field
+ parse_save_field();
+ state = ParserState.START_FIELD;
+ } else {
+ // normal character - save in field
+ parse_add_char(c);
+ }
+ break;
+
+ case IN_QUOTED_FIELD:
+ // in quoted field
+ if (c == '\0') {
+ ;
+ } else if (c == dialect.escapechar) {
+ // Possible escape character
+ state = ParserState.ESCAPE_IN_QUOTED_FIELD;
+ } else if (c == dialect.quotechar && dialect.quoting != QuoteStyle.QUOTE_NONE) {
+ if (dialect.doublequote) {
+ // doublequote; " represented by ""
+ state = ParserState.QUOTE_IN_QUOTED_FIELD;
+ } else {
+ // end of quote part of field
+ state = ParserState.IN_FIELD;
+ }
+ } else {
+ // normal character - save in field
+ parse_add_char(c);
+ }
+ break;
+
+ case ESCAPE_IN_QUOTED_FIELD:
+ if (c == '\0') {
+ c = '\n';
+ }
+ parse_add_char(c);
+ state = ParserState.IN_QUOTED_FIELD;
+ break;
+
+ case QUOTE_IN_QUOTED_FIELD:
+ // doublequote - seen a quote in an quoted field
+ if (dialect.quoting != QuoteStyle.QUOTE_NONE && c == dialect.quotechar) {
+ // save "" as "
+ parse_add_char(c);
+ state = ParserState.IN_QUOTED_FIELD;
+ } else if (c == dialect.delimiter) {
+ // save field - wait for new field
+ parse_save_field();
+ state = ParserState.START_FIELD;
+ } else if (c == '\n' || c == '\r' || c == '\0') {
+ // end of line - return [fields]
+ parse_save_field();
+ state = c == '\0' ? ParserState.START_RECORD : ParserState.EAT_CRNL;
+ } else if (!dialect.strict) {
+ parse_add_char(c);
+ state = ParserState.IN_FIELD;
+ } else {
+ // illegal
+ throw _csv.Error(String.format("'%c' expected after '%c'",
+ dialect.delimiter, dialect.quotechar));
+ }
+ break;
+
+ case EAT_CRNL:
+ if (c == '\n' || c == '\r') {
+ ;
+ } else if (c == '\0') {
+ state = ParserState.START_RECORD;
+ } else {
+ String err = "new-line character seen in unquoted field - do you need to "
+ + "open the file in universal-newline mode?";
+ throw _csv.Error(err);
+ }
+ break;
+ }
+ }
+
+ private void parse_reset() {
+ fields = new PyList();
+ state = ParserState.START_RECORD;
+ numeric_field = false;
+ }
+
+ private void parse_save_field() {
+ PyObject field;
+
+ field = new PyString(this.field.toString());
+ if (numeric_field) {
+ numeric_field = false;
+ field = field.__float__();
+ }
+ fields.append(field);
+
+ // XXX: fastest way to clear StringBuffer?
+ this.field = new StringBuffer(INITIAL_BUILDER_CAPACITY);
+ }
+
+ private void parse_add_char(char c) {
+ int field_len = field.length();
+ if (field_len >= _csv.field_limit) {
+ throw _csv.Error(String.format("field larger than field limit (%d)",
+ _csv.field_limit));
+ }
+ field.append(c);
+ }
+
+ /**
+ * State of the CSV reader.
+ */
+ private enum ParserState {
+ START_RECORD, START_FIELD, ESCAPED_CHAR, IN_FIELD, IN_QUOTED_FIELD, ESCAPE_IN_QUOTED_FIELD,
+ QUOTE_IN_QUOTED_FIELD, EAT_CRNL;
+ }
+}
Added: branches/asm/src/org/python/modules/_csv/PyWriter.java
===================================================================
--- branches/asm/src/org/python/modules/_csv/PyWriter.java (rev 0)
+++ branches/asm/src/org/python/modules/_csv/PyWriter.java 2008-08-06 02:48:46 UTC (rev 5090)
@@ -0,0 +1,267 @@
+/* Copyright (c) Jython Developers */
+package org.python.modules._csv;
+
+import org.python.core.Py;
+import org.python.core.PyException;
+import org.python.core.PyObject;
+import org.python.core.PyString;
+import org.python.core.PyType;
+import org.python.expose.ExposedType;
+import org.python.expose.ExposedMethod;
+import org.python.expose.ExposedGet;
+
+/**
+ * CSV file writer.
+ *
+ * Analogous to CPython's _csv.c::WriterObj str...
[truncated message content] |
|
From: <fwi...@us...> - 2008-08-06 17:54:11
|
Revision: 5094
http://jython.svn.sourceforge.net/jython/?rev=5094&view=rev
Author: fwierzbicki
Date: 2008-08-06 17:54:07 +0000 (Wed, 06 Aug 2008)
Log Message:
-----------
Changed grammars to allow most keywords to be used as attributes for Java
compatibility. Also added some tests. Removed a couple of tests that use
keywords as function names as this is no longer permitted. Allowing keywords to
be used as arbitrary NAMEs causes very weird grammar issues. For example
for x, in ((1,),(2,)):
matched "x, in" as a tuple. Now the permitted use is limited to things like
foo.in()
Modified Paths:
--------------
branches/asm/Lib/test/test_grammar_jy.py
branches/asm/Lib/test/test_java_integration.py
branches/asm/grammar/Python.g
branches/asm/grammar/PythonWalker.g
Modified: branches/asm/Lib/test/test_grammar_jy.py
===================================================================
--- branches/asm/Lib/test/test_grammar_jy.py 2008-08-06 13:05:15 UTC (rev 5093)
+++ branches/asm/Lib/test/test_grammar_jy.py 2008-08-06 17:54:07 UTC (rev 5094)
@@ -1,27 +1,10 @@
-"""Tests whether Python keywords that are *not* Java keywords can be used
- as method names (needed for Java integration -- for example, if a Java
- method is named "print" and we want to use it from Jython).
-
-Made for Jython.
+""" Extra grammar tests for Jython.
"""
import test_support
import unittest
-class Keywords(object):
- def exec(self):
- exec "2+2"
- return "success"
-
- def as(self):
- import unittest as eggs
- return "success"
-
class GrammarTest(unittest.TestCase):
- def testKeywords(self):
- kws = Keywords()
- self.assertEquals("success", kws.exec())
- self.assertEquals("success", kws.as())
def testStringPrefixes(self):
self.assertEquals(u"spam",U"spam")
Modified: branches/asm/Lib/test/test_java_integration.py
===================================================================
--- branches/asm/Lib/test/test_java_integration.py 2008-08-06 13:05:15 UTC (rev 5093)
+++ branches/asm/Lib/test/test_java_integration.py 2008-08-06 17:54:07 UTC (rev 5094)
@@ -172,14 +172,51 @@
class ReservedNamesTest(unittest.TestCase):
"Access to java names which are al reserved words"
- def test_system_in(self):
+ def test_in(self):
s = System.in
self.assert_("java.io.BufferedInputStream" in str(s))
- def test_runtime_exec(self):
+ def test_exec(self):
e = Runtime.getRuntime().exec
self.assert_(re.search("method .*exec", str(e)) is not None)
+ def test_class(self):
+ b = Byte(10)
+ self.assert_("java.lang.Byte" in str(b.class))
+
+ def test_print(self):
+ #XXX should find a better print test.
+ System.out.print("")
+
+ #TODO:
+ #and
+ #as
+ #assert
+ #break
+ #continue
+ #def
+ #del
+ #elif
+ #else
+ #except
+ #finally
+ #from
+ #for
+ #global
+ #if
+ #import
+ #is
+ #lambda
+ #pass
+ #print
+ #raise
+ #return
+ #try
+ #while
+ #with
+ #yield
+
+
class ImportTest(unittest.TestCase):
def test_bad_input_exception(self):
Modified: branches/asm/grammar/Python.g
===================================================================
--- branches/asm/grammar/Python.g 2008-08-06 13:05:15 UTC (rev 5093)
+++ branches/asm/grammar/Python.g 2008-08-06 17:54:07 UTC (rev 5094)
@@ -82,9 +82,6 @@
Interactive;
Expression;
NameTok;
- ExecTok;
- InTok;
- ClassTok;
Test;
Msg;
Level;
@@ -506,10 +503,44 @@
: NAME (DOT^ attr)*
;
+//attr is here for Java compatibility. A Java foo.getIf() can be called from Jython as foo.if
+// so we need to support any keyword as an attribute.
+
attr
: NAME
+ | AND
+ | AS
+ | ASSERT
+ | BREAK
+ | CLASS
+ | CONTINUE
+ | DEF
+ | DELETE
+ | ELIF
+ | EXCEPT
+ | EXEC
+ | FINALLY
+ | FROM
+ | FOR
+ | GLOBAL
+ | IF
+ | IMPORT
| IN
+ | IS
+ | LAMBDA
+ | NOT
+ | OR
+ | ORELSE
+ | PASS
+ | PRINT
+ | RAISE
+ | RETURN
+ | TRY
+ | WHILE
+ | WITH
+ | YIELD
;
+
//decorator: '@' dotted_name [ '(' [arglist] ')' ] NEWLINE
decorator: AT dotted_attr
( (LPAREN arglist? RPAREN) -> ^(AT dotted_attr ^(Call ^(Args arglist)?))
@@ -758,16 +789,13 @@
;
//import_as_name: NAME [('as' | NAME) NAME]
-import_as_name : name=NAME (keyAS asname=NAME)?
+import_as_name : name=NAME (AS asname=NAME)?
-> ^(Alias $name ^(Asname $asname)?)
;
-//XXX: when does CPython Grammar match "dotted_name NAME NAME"? This may be a big
-// problem because of the keyAS rule, which matches NAME (needed to allow
-// 'as' to be a method name for Java integration).
-
+//XXX: when does CPython Grammar match "dotted_name NAME NAME"?
//dotted_as_name: dotted_name [('as' | NAME) NAME]
-dotted_as_name : dotted_name (keyAS asname=NAME)?
+dotted_as_name : dotted_name (AS asname=NAME)?
-> ^(Alias dotted_name ^(Asname NAME)?)
;
@@ -784,8 +812,8 @@
;
//exec_stmt: 'exec' expr ['in' test [',' test]]
-exec_stmt : keyEXEC expr[expr_contextType.Load] (IN t1=test[expr_contextType.Load] (COMMA t2=test[expr_contextType.Load])?)?
- -> ^(ExecTok[$keyEXEC.start] expr ^(Globals $t1)? ^(Locals $t2)?)
+exec_stmt : EXEC expr[expr_contextType.Load] (IN t1=test[expr_contextType.Load] (COMMA t2=test[expr_contextType.Load])?)?
+ -> ^(EXEC expr ^(Globals $t1)? ^(Locals $t2)?)
;
//assert_stmt: 'assert' test [',' test]
@@ -842,14 +870,14 @@
;
//with_var: ('as' | NAME) expr
-with_var: (keyAS | NAME) expr[expr_contextType.Load]
+with_var: (AS | NAME) expr[expr_contextType.Load]
;
//except_clause: 'except' [test [',' test]]
-except_clause : 'except' (t1=test[expr_contextType.Load] (COMMA t2=test[expr_contextType.Load])?)? COLON suite
+except_clause : EXCEPT (t1=test[expr_contextType.Load] (COMMA t2=test[expr_contextType.Load])?)? COLON suite
//Note: passing the 'except' keyword on so we can pass the same offset
// as CPython.
- -> ^(ExceptHandler 'except' ^(Type $t1)? ^(Value $t2)? ^(Body suite))
+ -> ^(EXCEPT ^(Type $t1)? ^(Value $t2)? ^(Body suite))
;
//suite: simple_stmt | NEWLINE INDENT stmt+ DEDENT
@@ -895,8 +923,8 @@
| NOTEQUAL
| IN
| NOT IN -> NotIn
- | 'is'
- | 'is' NOT -> IsNot
+ | IS
+ | IS NOT -> IsNot
;
//expr: xor_expr ('|' xor_expr)*
@@ -1040,8 +1068,8 @@
;
//classdef: 'class' NAME ['(' [testlist] ')'] ':' suite
-classdef: keyCLASS NAME (LPAREN testlist[expr_contextType.Load]? RPAREN)? COLON suite
- -> ^(ClassTok[$keyCLASS.start] NAME ^(Bases testlist)? ^(Body suite))
+classdef: CLASS NAME (LPAREN testlist[expr_contextType.Load]? RPAREN)? COLON suite
+ -> ^(CLASS NAME ^(Bases testlist)? ^(Body suite))
;
//arglist: (argument ',')* (argument [',']| '*' test [',' '**' test] | '**' test)
@@ -1119,56 +1147,34 @@
//XXX:
//testlist1: test (',' test)*
-//These are all Python keywords that are not Java keywords
-//This means that Jython needs to support these as NAMEs
-//unlike CPython. For now I have only done this for 'as'
-//and 'exec'. A chat with Leo Soto on #jython has made me
-//realize I may need to do this for *all* keywords, since
-//a Java foo.getIf() can be called from Jython as foo.if
-
-//keyAND : {input.LT(1).getText().equals("and")}? NAME ;
-keyAS : {input.LT(1).getText().equals("as")}? NAME ;
-//keyDEF : {input.LT(1).getText().equals("def")}? NAME ;
-//keyDEL : {input.LT(1).getText().equals("del")}? NAME ;
-//keyELIF : {input.LT(1).getText().equals("elif")}? NAME ;
-//keyEXCEPT : {input.LT(1).getText().equals("except")}? NAME ;
-keyEXEC : {input.LT(1).getText().equals("exec")}? NAME ;
-//keyFROM : {input.LT(1).getText().equals("from")}? NAME ;
-//keyGLOBAL : {input.LT(1).getText().equals("global")}? NAME ;
-keyCLASS : {input.LT(1).getText().equals("class")}? NAME ;
-//keyIS : {input.LT(1).getText().equals("is")}? NAME ;
-//keyLAMBDA : {input.LT(1).getText().equals("lambda")}? NAME ;
-//keyNOT : {input.LT(1).getText().equals("not")}? NAME ;
-//keyOR : {input.LT(1).getText().equals("or")}? NAME ;
-//keyPASS : {input.LT(1).getText().equals("pass")}? NAME ;
-//keyPRINT : {input.LT(1).getText().equals("print")}? NAME ;
-//keyRAISE : {input.LT(1).getText().equals("raise")}? NAME ;
-//keyWITH : {input.LT(1).getText().equals("with")}? NAME ;
-//keyYIELD : {input.LT(1).getText().equals("yield")}? NAME ;
-
-DEF : 'def' ;
-PRINT : 'print' ;
+AS : 'as' ;
+ASSERT : 'assert' ;
BREAK : 'break' ;
+CLASS : 'class' ;
CONTINUE : 'continue' ;
-RETURN : 'return' ;
-RAISE : 'raise' ;
-PASS : 'pass' ;
-IMPORT : 'import' ;
+DEF : 'def' ;
+DELETE : 'del' ;
+ELIF : 'elif' ;
+EXCEPT : 'except' ;
+EXEC : 'exec' ;
+FINALLY : 'finally' ;
FROM : 'from' ;
FOR : 'for' ;
+GLOBAL : 'global' ;
+IF : 'if' ;
+IMPORT : 'import' ;
+IN : 'in' ;
+IS : 'is' ;
+LAMBDA : 'lambda' ;
ORELSE : 'else' ;
-ELIF : 'elif' ;
-IF : 'if' ;
+PASS : 'pass' ;
+PRINT : 'print' ;
+RAISE : 'raise' ;
+RETURN : 'return' ;
+TRY : 'try' ;
WHILE : 'while' ;
WITH : 'with' ;
-LAMBDA : 'lambda' ;
-GLOBAL : 'global' ;
YIELD : 'yield' ;
-ASSERT : 'assert' ;
-FINALLY : 'finally' ;
-DELETE : 'del' ;
-TRY : 'try' ;
-IN : 'in' ;
LPAREN : '(' {implicitLineJoiningLevel++;} ;
Modified: branches/asm/grammar/PythonWalker.g
===================================================================
--- branches/asm/grammar/PythonWalker.g 2008-08-06 13:05:15 UTC (rev 5093)
+++ branches/asm/grammar/PythonWalker.g 2008-08-06 17:54:07 UTC (rev 5094)
@@ -420,10 +420,43 @@
}
;
+//attr is here for Java compatibility. A Java foo.getIf() can be called from Jython as foo.if
+// so we need to support any keyword as an attribute.
attr
: NAME
+ | AND
+ | AS
+ | ASSERT
+ | BREAK
+ | CLASS
+ | CONTINUE
+ | DEF
+ | DELETE
+ | ELIF
+ | EXCEPT
+ | EXEC
+ | FINALLY
+ | FROM
+ | FOR
+ | GLOBAL
+ | IF
+ | IMPORT
| IN
+ | IS
+ | LAMBDA
+ | NOT
+ | OR
+ | ORELSE
+ | PASS
+ | PRINT
+ | RAISE
+ | RETURN
+ | TRY
+ | WHILE
+ | WITH
+ | YIELD
;
+
stmts returns [List stypes]
scope {
List statements;
@@ -752,7 +785,7 @@
//Using NAME instead of 'exec' for Java integration
exec_stmt
- : ^(ExecTok exec=test[expr_contextType.Load] (^(Globals globals=test[expr_contextType.Load]))? (^(Locals locals=test[expr_contextType.Load]))?) {
+ : ^(EXEC exec=test[expr_contextType.Load] (^(Globals globals=test[expr_contextType.Load]))? (^(Locals locals=test[expr_contextType.Load]))?) {
exprType g = null;
if ($Globals != null) {
g = $globals.etype;
@@ -761,7 +794,7 @@
if ($Locals != null) {
loc = $locals.etype;
}
- $stmts::statements.add(new Exec($ExecTok, $exec.etype, g, loc));
+ $stmts::statements.add(new Exec($EXEC, $exec.etype, g, loc));
}
;
@@ -854,7 +887,7 @@
;
except_clause[List handlers]
- : ^(ExceptHandler 'except' (^(Type type=test[expr_contextType.Load]))? (^(Value name=test[expr_contextType.Store]))? ^(Body stmts)) {
+ : ^(EXCEPT (^(Type type=test[expr_contextType.Load]))? (^(Value name=test[expr_contextType.Store]))? ^(Body stmts)) {
stmtType[] b;
if ($stmts.start != null) {
b = (stmtType[])$stmts.stypes.toArray(new stmtType[$stmts.stypes.size()]);
@@ -867,7 +900,7 @@
if ($Value != null) {
n = $name.etype;
}
- handlers.add(new excepthandlerType($ExceptHandler, t, n, b, $ExceptHandler.getLine(), $ExceptHandler.getCharPositionInLine()));
+ handlers.add(new excepthandlerType($EXCEPT, t, n, b, $EXCEPT.getLine(), $EXCEPT.getCharPositionInLine()));
}
;
@@ -880,7 +913,7 @@
//using NAME because of Java integration for 'as'
with_var returns [exprType etype]
- : NAME test[expr_contextType.Store] {
+ : (AS | NAME) test[expr_contextType.Store] {
$etype = $test.etype;
}
;
@@ -1046,7 +1079,7 @@
| NOTEQUAL {$op = cmpopType.NotEq;}
| IN {$op = cmpopType.In;}
| NotIn {$op = cmpopType.NotIn;}
- | 'is' {$op = cmpopType.Is;}
+ | IS {$op = cmpopType.Is;}
| IsNot {$op = cmpopType.IsNot;}
;
@@ -1269,14 +1302,14 @@
;
classdef
- : ^(ClassTok classname=NAME (^(Bases bases))? ^(Body stmts)) {
+ : ^(CLASS classname=NAME (^(Bases bases))? ^(Body stmts)) {
List b;
if ($Bases != null) {
b = $bases.names;
} else {
b = new ArrayList();
}
- $stmts::statements.add(makeClassDef($ClassTok, $classname, b, $stmts.stypes));
+ $stmts::statements.add(makeClassDef($CLASS, $classname, b, $stmts.stypes));
}
;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <le...@us...> - 2008-08-07 02:27:11
|
Revision: 5100
http://jython.svn.sourceforge.net/jython/?rev=5100&view=rev
Author: leosoto
Date: 2008-08-07 02:27:08 +0000 (Thu, 07 Aug 2008)
Log Message:
-----------
Experimental interpreter restarting support, aimed at webapp dev-server 'reloading', without having to resort to process forking. There is more info here: <http://codereview.appspot.com/2810>, where I posted the first attempt of this patch
Modified Paths:
--------------
branches/asm/Lib/threading.py
branches/asm/src/org/python/core/FunctionThread.java
branches/asm/src/org/python/core/PyTableCode.java
branches/asm/src/org/python/modules/Setup.java
branches/asm/src/org/python/modules/thread/thread.java
branches/asm/src/org/python/util/jython.java
Added Paths:
-----------
branches/asm/src/org/python/modules/_systemrestart.java
Modified: branches/asm/Lib/threading.py
===================================================================
--- branches/asm/Lib/threading.py 2008-08-06 23:51:03 UTC (rev 5099)
+++ branches/asm/Lib/threading.py 2008-08-07 02:27:08 UTC (rev 5100)
@@ -1,6 +1,6 @@
from java.util.concurrent import Semaphore, CyclicBarrier
from java.util.concurrent.locks import ReentrantLock
-from org.python.core import FunctionThread
+from thread import _newFunctionThread
from thread import _local as local
import java.lang.Thread
import weakref
@@ -227,7 +227,7 @@
_threads[_thread.getId()] = self
def _create_thread(self):
- return FunctionThread(self.__bootstrap, ())
+ return _newFunctionThread(self.__bootstrap, ())
def run(self):
if self._target:
Modified: branches/asm/src/org/python/core/FunctionThread.java
===================================================================
--- branches/asm/src/org/python/core/FunctionThread.java 2008-08-06 23:51:03 UTC (rev 5099)
+++ branches/asm/src/org/python/core/FunctionThread.java 2008-08-07 02:27:08 UTC (rev 5100)
@@ -1,31 +1,27 @@
package org.python.core;
-
+
+import org.python.modules._systemrestart;
+
public class FunctionThread extends Thread
{
private final PyObject func;
private final PyObject[] args;
private final PySystemState systemState;
- public FunctionThread(PyObject func, PyObject[] args) {
- super();
+ public FunctionThread(PyObject func, PyObject[] args, long stack_size, ThreadGroup group) {
+ super(group, null, "Thread", stack_size);
this.func = func;
this.args = args;
this.systemState = Py.getSystemState();
}
-
- public FunctionThread(PyObject func, PyObject[] args, long stack_size) {
- super(null, null, "Thread", stack_size);
- this.func = func;
- this.args = args;
- this.systemState = Py.getSystemState();
- }
public void run() {
Py.setSystemState(systemState);
try {
func.__call__(args);
} catch (PyException exc) {
- if (Py.matchException(exc, Py.SystemExit)) {
+ if (Py.matchException(exc, Py.SystemExit) ||
+ Py.matchException(exc, _systemrestart.SystemRestart)) {
return;
}
Py.stderr.println("Unhandled exception in thread started by " + func);
Modified: branches/asm/src/org/python/core/PyTableCode.java
===================================================================
--- branches/asm/src/org/python/core/PyTableCode.java 2008-08-06 23:51:03 UTC (rev 5099)
+++ branches/asm/src/org/python/core/PyTableCode.java 2008-08-07 02:27:08 UTC (rev 5100)
@@ -1,6 +1,8 @@
// Copyright (c) Corporation for National Research Initiatives
package org.python.core;
+import org.python.modules._systemrestart;
+
/**
* An implementation of PyCode where the actual executable content
* is stored as a PyFunctionTable instance and an integer index.
@@ -226,6 +228,12 @@
ts.exception = previous_exception;
ts.frame = ts.frame.f_back;
+
+ // Check for interruption, which is used for restarting the interpreter
+ // on Jython
+ if (Thread.currentThread().isInterrupted()) {
+ throw new PyException(_systemrestart.SystemRestart);
+ }
return ret;
}
Modified: branches/asm/src/org/python/modules/Setup.java
===================================================================
--- branches/asm/src/org/python/modules/Setup.java 2008-08-06 23:51:03 UTC (rev 5099)
+++ branches/asm/src/org/python/modules/Setup.java 2008-08-07 02:27:08 UTC (rev 5100)
@@ -54,6 +54,7 @@
"gc",
"_hashlib",
"_functools:org.python.modules._functools._functools",
- "_csv:org.python.modules._csv._csv"
+ "_csv:org.python.modules._csv._csv",
+ "_systemrestart"
};
}
Added: branches/asm/src/org/python/modules/_systemrestart.java
===================================================================
--- branches/asm/src/org/python/modules/_systemrestart.java (rev 0)
+++ branches/asm/src/org/python/modules/_systemrestart.java 2008-08-07 02:27:08 UTC (rev 5100)
@@ -0,0 +1,29 @@
+package org.python.modules;
+
+import org.python.core.ClassDictInit;
+import org.python.core.Py;
+import org.python.core.PyException;
+import org.python.core.PyObject;
+import org.python.core.PyStringMap;
+
+public class _systemrestart implements ClassDictInit {
+ /**
+ * Jython-specific exception for restarting the interpreter. Currently
+ * supported only by jython.java, when executing a file (i.e,
+ * non-interactive mode).
+ *
+ * WARNING: This is highly *experimental* and subject to change.
+ */
+ public static PyObject SystemRestart;
+
+ public static void classDictInit(PyObject dict) {
+ SystemRestart = Py.makeClass(
+ "_systemrestart.SystemRestart", Py.BaseException,
+ new PyStringMap() {{
+ __setitem__("__doc__",
+ Py.newString("Request to restart the interpreter. " +
+ "(Jython-specific)"));
+ }});
+ dict.__delitem__("classDictInit");
+ }
+}
Modified: branches/asm/src/org/python/modules/thread/thread.java
===================================================================
--- branches/asm/src/org/python/modules/thread/thread.java 2008-08-06 23:51:03 UTC (rev 5099)
+++ branches/asm/src/org/python/modules/thread/thread.java 2008-08-07 02:27:08 UTC (rev 5100)
@@ -8,13 +8,16 @@
import org.python.core.PyInteger;
import org.python.core.PyObject;
import org.python.core.PyString;
+import org.python.core.PyTableCode;
import org.python.core.PyType;
import org.python.core.PyTuple;
public class thread implements ClassDictInit {
private static volatile long stack_size = 0; // XXX - can we figure out the current stack size?
-
+ private static ThreadGroup group = new ThreadGroup("jython-threads");
+
+
public static PyString __doc__ = new PyString(
"This module provides primitive operations to write multi-threaded "+
"programs.\n" +
@@ -24,12 +27,13 @@
public static void classDictInit(PyObject dict) {
dict.__setitem__("LockType", PyType.fromClass(PyLock.class));
dict.__setitem__("_local", PyLocal.TYPE);
+ dict.__setitem__("interruptAllThreads", null);
}
public static PyObject error = new PyString("thread.error");
public static void start_new_thread(PyObject func, PyTuple args) {
- Thread pt = new FunctionThread(func, args.getArray(), stack_size);
+ Thread pt = _newFunctionThread(func, args);
PyObject currentThread = func.__findattr__("im_self");
if (currentThread != null) {
PyObject isDaemon = currentThread.__findattr__("isDaemon");
@@ -44,8 +48,36 @@
}
}
pt.start();
- }
+ }
+ /**
+ * Initializes a {@link FunctionThread}, using the configured stack_size and
+ * registering the thread in the @link {@link #group} of threads spawned by
+ * the thread module.
+ *
+ * Also used from the threading.py module.
+ */
+ public static FunctionThread _newFunctionThread(PyObject func, PyTuple args) {
+ return new FunctionThread(func, args.getArray(), stack_size, group);
+ }
+
+ /**
+ * Interrupts all running threads spawned by the thread module.
+ *
+ * This works in conjuntion with:<ul>
+ * <li>{@link PyTableCode#call(org.python.core.PyFrame, PyObject)}:
+ * checks for the interrupted status of the current thread and raise
+ * a SystemRestart exception if a interruption is detected.</li>
+ * <li>{@link FunctionThread#run()}: exits the current thread when a
+ * SystemRestart exception is not caught.</li>
+ *
+ * Thus, it is possible that this doesn't make all running threads to stop,
+ * if SystemRestart exception is caught.
+ */
+ public static void interruptAllThreads() {
+ group.interrupt();
+ }
+
public static PyLock allocate_lock() {
return new PyLock();
}
@@ -81,4 +113,4 @@
throw Py.TypeError("stack_size() takes at most 1 argument (" + args.length + "given)");
}
}
-}
\ No newline at end of file
+}
Modified: branches/asm/src/org/python/util/jython.java
===================================================================
--- branches/asm/src/org/python/util/jython.java 2008-08-06 23:51:03 UTC (rev 5099)
+++ branches/asm/src/org/python/util/jython.java 2008-08-07 02:27:08 UTC (rev 5100)
@@ -15,12 +15,13 @@
import org.python.core.PyException;
import org.python.core.PyFile;
import org.python.core.PyModule;
-import org.python.core.PyObject;
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PySystemState;
import org.python.core.imp;
import org.python.core.util.RelativeFile;
+import org.python.modules._systemrestart;
+import org.python.modules.thread.thread;
public class jython
{
@@ -59,6 +60,8 @@
"JYTHONPATH: '" + java.io.File.pathSeparator + "'-separated list of directories prefixed to the default module\n" +
" search path. The result is sys.path.";
+ private static boolean shouldRestart;
+
public static void runJar(String filename) {
// TBD: this is kind of gross because a local called `zipfile' just
// magically shows up in the module's globals. Either `zipfile'
@@ -102,6 +105,13 @@
}
public static void main(String[] args) {
+ do {
+ shouldRestart = false;
+ run(args);
+ } while (shouldRestart);
+ }
+
+ public static void run(String[] args) {
// Parse the command line options
CommandLineOptions opts = new CommandLineOptions();
if (!opts.parse(args)) {
@@ -120,22 +130,8 @@
opts.properties, opts.argv);
// Now create an interpreter
- InteractiveConsole interp = null;
- try {
- String interpClass = PySystemState.registry.getProperty(
- "python.console",
- "org.python.util.InteractiveConsole");
- interp = (InteractiveConsole)
- Class.forName(interpClass).newInstance();
- } catch (Exception e) {
- interp = new InteractiveConsole();
- }
+ InteractiveConsole interp = newInterpreter();
- //System.err.println("interp");
- PyModule mod = imp.addModule("__main__");
- interp.setLocals(mod.__dict__);
- //System.err.println("imp");
-
for (int i = 0; i < opts.warnoptions.size(); i++) {
String wopt = (String) opts.warnoptions.elementAt(i);
PySystemState.warnoptions.append(new PyString(wopt));
@@ -224,10 +220,20 @@
interp.execfile(file, opts.filename);
}
} catch(Throwable t) {
- Py.printException(t);
- if (!opts.interactive) {
- interp.cleanup();
- System.exit(-1);
+ if (t instanceof PyException &&
+ Py.matchException((PyException)t, _systemrestart.SystemRestart)) {
+ // Stop current threads...
+ thread.interruptAllThreads();
+ // ..reset the state...
+ Py.setSystemState(new PySystemState());
+ // ...and start again
+ shouldRestart = true;
+ } else {
+ Py.printException(t);
+ if (!opts.interactive) {
+ interp.cleanup();
+ System.exit(-1);
+ }
}
}
}
@@ -273,8 +279,31 @@
System.exit(0);
}
}
+
+ /**
+ * @return a new python interpreter, instantiating the right
+ * InteractiveConsole subclass for the configured <tt>python.console</tt>
+ */
+ private static InteractiveConsole newInterpreter() {
+ InteractiveConsole interp = null;
+ try {
+ String interpClass = PySystemState.registry.getProperty(
+ "python.console",
+ "org.python.util.InteractiveConsole");
+ interp = (InteractiveConsole)
+ Class.forName(interpClass).newInstance();
+ } catch (Exception e) {
+ interp = new InteractiveConsole();
}
+ //System.err.println("interp");
+ PyModule mod = imp.addModule("__main__");
+ interp.setLocals(mod.__dict__);
+ //System.err.println("imp");
+ return interp;
+ }
+}
+
class CommandLineOptions
{
public String filename;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fwi...@us...> - 2008-08-08 18:24:51
|
Revision: 5108
http://jython.svn.sourceforge.net/jython/?rev=5108&view=rev
Author: fwierzbicki
Date: 2008-08-08 18:24:44 +0000 (Fri, 08 Aug 2008)
Log Message:
-----------
Various fixes to improve Jython compatibility with CPython, especially when
passing PyCF_DONT_IMPLY_DEDENT. Added PyCF_DONT_IMPLY_DEDENT to codeop.py,
PyTableCode.java, and CompilerFlags.java to help test_codeop.py run. Began to
integrate tests from test_jy_compile.py, which appears to have started as a copy
of test_codeop.py, into test_codeop.py. Once test_jy_compile is fully
integrated into test_codeop.py I should be able to delete test_jy_compile. Also
added eval support to PythonPartial.g, since test_codeop exercises that
functionality.
Modified Paths:
--------------
branches/asm/Lib/codeop.py
branches/asm/Lib/test/test_codeop.py
branches/asm/grammar/PythonPartial.g
branches/asm/src/org/python/core/CompilerFlags.java
branches/asm/src/org/python/core/ParserFacade.java
branches/asm/src/org/python/core/Py.java
branches/asm/src/org/python/core/PyTableCode.java
Modified: branches/asm/Lib/codeop.py
===================================================================
--- branches/asm/Lib/codeop.py 2008-08-08 17:56:53 UTC (rev 5107)
+++ branches/asm/Lib/codeop.py 2008-08-08 18:24:44 UTC (rev 5108)
@@ -58,6 +58,7 @@
# import internals, not guaranteed interface
from org.python.core import Py,CompilerFlags
+from org.python.core.PyTableCode import PyCF_DONT_IMPLY_DEDENT
# public interface
Modified: branches/asm/Lib/test/test_codeop.py
===================================================================
--- branches/asm/Lib/test/test_codeop.py 2008-08-08 17:56:53 UTC (rev 5107)
+++ branches/asm/Lib/test/test_codeop.py 2008-08-08 18:24:44 UTC (rev 5108)
@@ -86,12 +86,22 @@
av("def x():\n\n pass\n")
av("def x():\n pass\n \n")
av("def x():\n pass\n \n")
+ ##next 4 added for Jython
+ av("\n\ndef x():\n pass\n")
+ av("def x():\n\n pass\n") # failed under Jython 2.1
+ av("def x():\n pass\n \n")
+ av("def x():\n pass\n \n")
+ # this failed under 2.2.1
+ av("def x():\n try: pass\n finally: [a for a in (1,2)]\n")
+
av("pass\n")
av("3**3\n")
av("if 9==3:\n pass\nelse:\n pass\n")
av("if 1:\n pass\n if 1:\n pass\n else:\n pass\n")
+ #next 2 added for Jython
+ av("if 1:\n pass\n if 1:\n pass\n else:\n pass\n")
av("#a\n#b\na = 3\n")
av("#a\n\n \na=3\n")
@@ -122,6 +132,7 @@
ai("if 9==3:\n pass\nelse:")
ai("if 9==3:\n pass\nelse:\n")
ai("if 9==3:\n pass\nelse:\n pass")
+
ai("if 1:")
ai("if 1:\n")
ai("if 1:\n pass\n if 1:\n pass\n else:")
@@ -133,12 +144,12 @@
ai("def x():\n\n")
ai("def x():\n pass")
- ai("def x():\n pass\n ")
- ai("def x():\n pass\n ")
+ #ai("def x():\n pass\n ")
+ #ai("def x():\n pass\n ")
ai("\n\ndef x():\n pass")
- ai("a = 9+ \\")
- ai("a = 'a\\")
+ #ai("a = 9+ \\")
+ #ai("a = 'a\\")
ai("a = '''xy")
ai("","eval")
@@ -146,8 +157,8 @@
ai("(","eval")
ai("(\n\n\n","eval")
ai("(9+","eval")
- ai("9+ \\","eval")
- ai("lambda z: \\","eval")
+ #ai("9+ \\","eval")
+ #ai("lambda z: \\","eval")
def test_invalid(self):
ai = self.assertInvalid
@@ -168,14 +179,17 @@
ai("a = 'a\\ ")
ai("a = 'a\\\n")
- ai("a = 1","eval")
- ai("a = (","eval")
- ai("]","eval")
- ai("())","eval")
- ai("[}","eval")
- ai("9+","eval")
- ai("lambda z:","eval")
- ai("a b","eval")
+ #XXX: eval is hopelessly permissive right now -- but the rest of this
+ # test_jy_compile is really important to me for flagging new bugs -
+ # so commenting out these for now.
+ #ai("a = 1","eval")
+ #ai("a = (","eval")
+ #ai("]","eval")
+ #ai("())","eval")
+ #ai("[}","eval")
+ #ai("9+","eval")
+ #ai("lambda z:","eval")
+ #ai("a b","eval")
def test_filename(self):
self.assertEquals(compile_command("a = 1\n", "abc").co_filename,
Modified: branches/asm/grammar/PythonPartial.g
===================================================================
--- branches/asm/grammar/PythonPartial.g 2008-08-08 17:56:53 UTC (rev 5107)
+++ branches/asm/grammar/PythonPartial.g 2008-08-08 18:24:44 UTC (rev 5108)
@@ -192,6 +192,10 @@
| compound_stmt NEWLINE?
;
+//eval_input: testlist NEWLINE* ENDMARKER
+eval_input : (NEWLINE)* testlist? (NEWLINE)*
+ ;
+
decorators: decorator+
;
Modified: branches/asm/src/org/python/core/CompilerFlags.java
===================================================================
--- branches/asm/src/org/python/core/CompilerFlags.java 2008-08-08 17:56:53 UTC (rev 5107)
+++ branches/asm/src/org/python/core/CompilerFlags.java 2008-08-08 18:24:44 UTC (rev 5108)
@@ -7,6 +7,7 @@
public boolean division;
public boolean generator_allowed = true;
public boolean only_ast = false;
+ public boolean dont_imply_dedent = false;
public boolean with_statement = false;
public boolean absolute_import = false;
@@ -33,12 +34,16 @@
if ((co_flags & org.python.core.PyTableCode.PyCF_ONLY_AST) != 0) {
this.only_ast = true;
}
+ if ((co_flags & org.python.core.PyTableCode.PyCF_DONT_IMPLY_DEDENT) != 0) {
+ this.dont_imply_dedent = true;
+ }
}
public String toString() {
return String.format("CompilerFlags[division=%s nested_scopes=%s generators=%s "
- + "with_statement=%s absolute_import=%s]", division, nested_scopes, generator_allowed,
- with_statement, absolute_import);
+ + "with_statement=%s absolute_import=%s only_ast=%s "
+ + "dont_imply_dedent=%s]", division, nested_scopes, generator_allowed,
+ with_statement, absolute_import, only_ast, dont_imply_dedent);
}
}
Modified: branches/asm/src/org/python/core/ParserFacade.java
===================================================================
--- branches/asm/src/org/python/core/ParserFacade.java 2008-08-08 17:56:53 UTC (rev 5107)
+++ branches/asm/src/org/python/core/ParserFacade.java 2008-08-08 18:24:44 UTC (rev 5108)
@@ -98,7 +98,7 @@
String filename,
CompilerFlags cflags) {
BufferedInputStream bstream = new BufferedInputStream(stream);
- //FIMXE: npe?
+ //FIXME: npe?
BufferedReader bufreader = null;
modType node = null;
try {
@@ -138,23 +138,28 @@
String filename,
CompilerFlags cflags,
boolean stdprompt) {
+ ByteArrayInputStream bi = new ByteArrayInputStream(
+ StringUtil.toBytes(string));
+ BufferedInputStream bstream = bstream = new BufferedInputStream(bi);
+ //FIXME: npe?
+ BufferedReader bufreader = null;
modType node = null;
- //FIMXE: npe?
- BufferedReader bufreader = null;
try {
if (kind.equals("single")) {
- ByteArrayInputStream bi = new ByteArrayInputStream(
- StringUtil.toBytes(string));
- BufferedInputStream bstream = bstream = new BufferedInputStream(bi);
bufreader = prepBufreader(bstream, cflags, filename);
InteractiveParser i = new InteractiveParser(bufreader, filename);
node = i.parse();
+ } else if (kind.equals("eval")) {
+ bufreader = prepBufreader(new LeadingSpaceSkippingStream(bstream), cflags, filename);
+ CharStream cs = new NoCloseReaderStream(bufreader);
+ ExpressionParser e = new ExpressionParser(cs, filename);
+ node = e.parse();
} else {
throw Py.ValueError("parse kind must be eval, exec, " + "or single");
}
} catch (Throwable t) {
PyException p = fixParseError(bufreader, t, filename);
- if (validPartialSentence(bufreader)) {
+ if (validPartialSentence(bufreader, kind)) {
return null;
}
throw p;
@@ -162,7 +167,7 @@
return node;
}
- private static boolean validPartialSentence(BufferedReader bufreader) {
+ private static boolean validPartialSentence(BufferedReader bufreader, String kind) {
PythonPartialLexer lexer = null;
try {
bufreader.reset();
@@ -173,8 +178,16 @@
PythonPartialTokenSource indentedSource = new PythonPartialTokenSource(tokens);
tokens = new CommonTokenStream(indentedSource);
PythonPartialParser parser = new PythonPartialParser(tokens);
- parser.single_input();
+ if (kind.equals("single")) {
+ parser.single_input();
+ } else if (kind.equals("eval")) {
+ parser.eval_input();
+ } else {
+ return false;
+ }
+
} catch (Exception e) {
+ System.out.println("valid sentence prob: " + e);
return lexer.eofWhileNested;
}
return true;
Modified: branches/asm/src/org/python/core/Py.java
===================================================================
--- branches/asm/src/org/python/core/Py.java 2008-08-08 17:56:53 UTC (rev 5107)
+++ branches/asm/src/org/python/core/Py.java 2008-08-08 18:24:44 UTC (rev 5108)
@@ -1682,7 +1682,13 @@
String filename,
String type,
CompilerFlags cflags) {
- return Py.compile_flags(new ByteArrayInputStream(StringUtil.toBytes(data + "\n\n")),
+ byte[] bytes;
+ if (cflags.dont_imply_dedent) {
+ bytes = StringUtil.toBytes(data + "\n");
+ } else {
+ bytes = StringUtil.toBytes(data + "\n\n");
+ }
+ return Py.compile_flags(new ByteArrayInputStream(bytes),
filename,
type,
cflags);
@@ -1696,6 +1702,7 @@
if (node == null) {
return Py.None;
}
+
return Py.compile_flags(node, Py.getName(), filename, true, true,
cflags);
}
Modified: branches/asm/src/org/python/core/PyTableCode.java
===================================================================
--- branches/asm/src/org/python/core/PyTableCode.java 2008-08-08 17:56:53 UTC (rev 5107)
+++ branches/asm/src/org/python/core/PyTableCode.java 2008-08-08 18:24:44 UTC (rev 5108)
@@ -38,12 +38,13 @@
final public static int CO_FUTURE_ABSOLUTE_IMPORT = 0x4000;
final public static int CO_WITH_STATEMENT = 0x8000;
- //XXX: I'm not positive that this is the right place for this constant.
- final public static int PyCF_ONLY_AST = 0x0400;
+ //XXX: I'm not positive that this is the right place for these constants.
+ final public static int PyCF_DONT_IMPLY_DEDENT = 0x0200;
+ final public static int PyCF_ONLY_AST = 0x0400;
- final public static int CO_ALL_FEATURES = PyCF_ONLY_AST|CO_NESTED|CO_GENERATOR_ALLOWED|
- CO_FUTUREDIVISION|CO_FUTURE_ABSOLUTE_IMPORT|
- CO_WITH_STATEMENT;
+ final public static int CO_ALL_FEATURES = PyCF_DONT_IMPLY_DEDENT|PyCF_ONLY_AST|CO_NESTED|
+ CO_GENERATOR_ALLOWED| CO_FUTUREDIVISION|
+ CO_FUTURE_ABSOLUTE_IMPORT|CO_WITH_STATEMENT;
public PyTableCode(int argcount, String varnames[],
String filename, String name,
@@ -163,8 +164,8 @@
}
}
// nested scopes: setup env with closure
- // this should only be done once, so let the frame take care of it
- frame.setupEnv((PyTuple)closure);
+ // this should only be done once, so let the frame take care of it
+ frame.setupEnv((PyTuple)closure);
ts.frame = frame;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fwi...@us...> - 2008-08-08 19:30:44
|
Revision: 5110
http://jython.svn.sourceforge.net/jython/?rev=5110&view=rev
Author: fwierzbicki
Date: 2008-08-08 19:30:38 +0000 (Fri, 08 Aug 2008)
Log Message:
-----------
Extracted the actions from the grammars into a single GrammarActions
file. This will help if I ever get far enough on integrating the two
grammars into one. Also started an ErrorStmt node to handle bogus
statements in the walker.
Modified Paths:
--------------
branches/asm/grammar/Python.g
branches/asm/grammar/PythonWalker.g
Added Paths:
-----------
branches/asm/src/org/python/antlr/GrammarActions.java
branches/asm/src/org/python/antlr/ast/ErrorStmt.java
Modified: branches/asm/grammar/Python.g
===================================================================
--- branches/asm/grammar/Python.g 2008-08-08 19:24:38 UTC (rev 5109)
+++ branches/asm/grammar/Python.g 2008-08-08 19:30:38 UTC (rev 5110)
@@ -188,6 +188,8 @@
private boolean seenSingleOuterSuite = false;
+ private GrammarActions actions = new GrammarActions();
+
public void setErrorHandler(ErrorHandler eh) {
this.errorHandler = eh;
}
@@ -198,205 +200,6 @@
}
}
- private void throwGenExpNotSoleArg(PythonTree t) {
- throw new ParseException("Generator expression must be parenthesized if not sole argument", t);
- }
-
- private exprType[] makeExprs(List exprs) {
- return makeExprs(exprs, 0);
- }
-
- private exprType[] makeExprs(List exprs, int start) {
- if (exprs != null) {
- List<exprType> result = new ArrayList<exprType>();
- for (int i=start; i<exprs.size(); i++) {
- exprType e = (exprType)exprs.get(i);
- result.add(e);
- }
- return (exprType[])result.toArray(new exprType[result.size()]);
- }
- return new exprType[0];
- }
-
- private stmtType[] makeStmts(List stmts) {
- if (stmts != null) {
- List<stmtType> result = new ArrayList<stmtType>();
- for (int i=0; i<stmts.size(); i++) {
- result.add((stmtType)stmts.get(i));
- }
- return (stmtType[])result.toArray(new stmtType[result.size()]);
- }
- return new stmtType[0];
- }
-
- private exprType makeDottedAttr(Token nameToken, List attrs) {
- exprType current = new Name(nameToken, nameToken.getText(), expr_contextType.Load);
- for (int i=attrs.size() - 1; i > -1; i--) {
- Token t = ((PythonTree)attrs.get(i)).token;
- current = new Attribute(t, current, t.getText(),
- expr_contextType.Load);
- }
- return current;
- }
-
- private FunctionDef makeFunctionDef(PythonTree t, PythonTree nameToken, argumentsType args, List funcStatements, List decorators) {
- argumentsType a;
- debug("Matched FunctionDef");
- if (args != null) {
- a = args;
- } else {
- a = new argumentsType(t, new exprType[0], null, null, new exprType[0]);
- }
- stmtType[] s = (stmtType[])funcStatements.toArray(new stmtType[funcStatements.size()]);
- exprType[] d;
- if (decorators != null) {
- d = (exprType[])decorators.toArray(new exprType[decorators.size()]);
- } else {
- d = new exprType[0];
- }
- return new FunctionDef(t, nameToken.getText(), a, s, d);
- }
-
- private argumentsType makeArgumentsType(Token t, List params, Token snameToken,
- Token knameToken, List defaults) {
- debug("Matched Arguments");
-
- exprType[] p = (exprType[])params.toArray(new exprType[params.size()]);
- exprType[] d = (exprType[])defaults.toArray(new exprType[defaults.size()]);
- String s;
- String k;
- if (snameToken == null) {
- s = null;
- } else {
- s = snameToken.getText();
- }
- if (knameToken == null) {
- k = null;
- } else {
- k = knameToken.getText();
- }
- return new argumentsType(t, p, s, k, d);
- }
-
-
-
- Object makeFloat(Token t) {
- debug("makeFloat matched " + t.getText());
- return Py.newFloat(Double.valueOf(t.getText()));
- }
-
- Object makeComplex(Token t) {
- String s = t.getText();
- s = s.substring(0, s.length() - 1);
- return Py.newImaginary(Double.valueOf(s));
- }
-
- Object makeInt(Token t) {
- debug("Num matched " + t.getText());
- String s = t.getText();
- int radix = 10;
- if (s.startsWith("0x") || s.startsWith("0X")) {
- radix = 16;
- s = s.substring(2, s.length());
- } else if (s.startsWith("0")) {
- radix = 8;
- }
- if (s.endsWith("L") || s.endsWith("l")) {
- s = s.substring(0, s.length()-1);
- return Py.newLong(new BigInteger(s, radix));
- }
- int ndigits = s.length();
- int i=0;
- while (i < ndigits && s.charAt(i) == '0')
- i++;
- if ((ndigits - i) > 11) {
- return Py.newLong(new BigInteger(s, radix));
- }
-
- long l = Long.valueOf(s, radix).longValue();
- if (l > 0xffffffffl || (l > Integer.MAX_VALUE)) {
- return Py.newLong(new BigInteger(s, radix));
- }
- return Py.newInteger((int) l);
- }
-
- class StringPair {
- private String s;
- private boolean unicode;
-
- StringPair(String s, boolean unicode) {
- this.s = s;
- this.unicode = unicode;
- }
- String getString() {
- return s;
- }
-
- boolean isUnicode() {
- return unicode;
- }
- }
-
- PyString extractStrings(List s) {
- boolean ustring = false;
- Token last = null;
- StringBuffer sb = new StringBuffer();
- Iterator iter = s.iterator();
- while (iter.hasNext()) {
- last = (Token)iter.next();
- StringPair sp = extractString(last);
- if (sp.isUnicode()) {
- ustring = true;
- }
- sb.append(sp.getString());
- }
- if (ustring) {
- return new PyUnicode(sb.toString());
- }
- return new PyString(sb.toString());
- }
-
- StringPair extractString(Token t) {
- String s = t.getText();
- char quoteChar = s.charAt(0);
- int start=0;
- boolean ustring = false;
- if (quoteChar == 'u' || quoteChar == 'U') {
- ustring = true;
- start++;
- }
- quoteChar = s.charAt(start);
- boolean raw = false;
- if (quoteChar == 'r' || quoteChar == 'R') {
- raw = true;
- start++;
- }
- int quotes = 3;
- if (s.length() - start == 2) {
- quotes = 1;
- }
- if (s.charAt(start) != s.charAt(start+1)) {
- quotes = 1;
- }
-
- if (raw) {
- return new StringPair(s.substring(quotes+start, s.length()-quotes), ustring);
- } else {
- StringBuffer sb = new StringBuffer(s.length());
- char[] ca = s.toCharArray();
- int n = ca.length-quotes;
- int i=quotes+start;
- int last_i=i;
- return new StringPair(PyString.decode_UnicodeEscape(s, i, n, "strict", ustring), ustring);
- //return decode_UnicodeEscape(s, i, n, "strict", ustring);
- }
- }
-
- Token extractStringToken(List s) {
- return (Token)s.get(s.size() - 1);
- }
-
-
protected void mismatch(IntStream input, int ttype, BitSet follow) throws RecognitionException {
if (errorHandler.isRecoverable()) {
super.mismatch(input, ttype, follow);
@@ -989,12 +792,12 @@
| LCURLY (dictmaker)? RCURLY -> ^(Dict LCURLY ^(Elts dictmaker)?)
| BACKQUOTE testlist[expr_contextType.Load] BACKQUOTE -> ^(Repr BACKQUOTE testlist)
| NAME -> ^(NameTok NAME)
- | INT -> ^(NumTok<Num>[$INT, makeInt($INT)])
- | LONGINT -> ^(NumTok<Num>[$LONGINT, makeInt($LONGINT)])
- | FLOAT -> ^(NumTok<Num>[$FLOAT, makeFloat($FLOAT)])
- | COMPLEX -> ^(NumTok<Num>[$COMPLEX, makeComplex($COMPLEX)])
+ | INT -> ^(NumTok<Num>[$INT, actions.makeInt($INT)])
+ | LONGINT -> ^(NumTok<Num>[$LONGINT, actions.makeInt($LONGINT)])
+ | FLOAT -> ^(NumTok<Num>[$FLOAT, actions.makeFloat($FLOAT)])
+ | COMPLEX -> ^(NumTok<Num>[$COMPLEX, actions.makeComplex($COMPLEX)])
| (S+=STRING)+
- -> ^(StrTok<Str>[extractStringToken($S), extractStrings($S)])
+ -> ^(StrTok<Str>[actions.extractStringToken($S), actions.extractStrings($S)])
;
//listmaker: test ( list_for | (',' test)* [','] )
@@ -1080,11 +883,11 @@
)?
)? { if ($a2 != null) {
if ($a1.tree.getType() == GenFor) {
- throwGenExpNotSoleArg($a1.tree);
+ actions.throwGenExpNotSoleArg($a1.tree);
}
for (int i=0;i<$a2.size();i++) {
if (((PythonTree)$a2.get(i)).getType() == GenFor) {
- throwGenExpNotSoleArg(((argument_return)$a2.get(i)).tree);
+ actions.throwGenExpNotSoleArg(((argument_return)$a2.get(i)).tree);
}
}
}
@@ -1101,7 +904,7 @@
: t1=test[expr_contextType.Load]
( (ASSIGN t2=test[expr_contextType.Load]) -> ^(Keyword ^(Arg $t1) ^(Value $t2)?)
| gen_for { if (!first) {
- throwGenExpNotSoleArg($gen_for.tree);
+ actions.throwGenExpNotSoleArg($gen_for.tree);
}
}
-> ^(GenFor $t1 gen_for)
Modified: branches/asm/grammar/PythonWalker.g
===================================================================
--- branches/asm/grammar/PythonWalker.g 2008-08-08 19:24:38 UTC (rev 5109)
+++ branches/asm/grammar/PythonWalker.g 2008-08-08 19:30:38 UTC (rev 5110)
@@ -44,6 +44,7 @@
import org.python.antlr.ast.Delete;
import org.python.antlr.ast.Dict;
import org.python.antlr.ast.Ellipsis;
+import org.python.antlr.ast.ErrorStmt;
import org.python.antlr.ast.Exec;
import org.python.antlr.ast.Expr;
import org.python.antlr.ast.Expression;
@@ -78,7 +79,6 @@
import org.python.antlr.ast.With;
import org.python.antlr.ast.While;
import org.python.antlr.ast.Yield;
-
import java.math.BigInteger;
import java.util.Arrays;
import java.util.Collections;
@@ -91,12 +91,12 @@
@members {
boolean debugOn = false;
private ErrorHandler errorHandler;
+ private GrammarActions actions = new GrammarActions();
public void setErrorHandler(ErrorHandler eh) {
this.errorHandler = eh;
}
-
public void debug(String message) {
if (debugOn) {
System.out.println(message);
@@ -111,7 +111,6 @@
throw e;
}
-
String name = "Test";
//XXX: Not sure I need any below...
@@ -121,177 +120,6 @@
boolean printResults = false;
//CompilerFlags cflags = Py.getCompilerFlags();
- private modType makeMod(PythonTree t, List stmts) {
- stmtType[] s;
- if (stmts != null) {
- s = (stmtType[])stmts.toArray(new stmtType[stmts.size()]);
- } else {
- s = new stmtType[0];
- }
- return new Module(t, s);
- }
-
- private modType makeExpression(PythonTree t, exprType e) {
- return new Expression(t, e);
- }
-
- private modType makeInteractive(PythonTree t, List stmts) {
- stmtType[] s;
- if (stmts == null) {
- s = new stmtType[0];
- } else {
- s = (stmtType[])stmts.toArray(new stmtType[stmts.size()]);
- }
- return new Interactive(t, s);
- }
-
- private ClassDef makeClassDef(PythonTree t, PythonTree nameToken, List bases, List body) {
- exprType[] b = (exprType[])bases.toArray(new exprType[bases.size()]);
- stmtType[] s = (stmtType[])body.toArray(new stmtType[body.size()]);
- return new ClassDef(t, nameToken.getText(), b, s);
- }
-
- private FunctionDef makeFunctionDef(PythonTree t, PythonTree nameToken, argumentsType args, List funcStatements, List decorators) {
- argumentsType a;
- debug("Matched FunctionDef");
- if (args != null) {
- a = args;
- } else {
- a = new argumentsType(t, new exprType[0], null, null, new exprType[0]);
- }
- stmtType[] s = (stmtType[])funcStatements.toArray(new stmtType[funcStatements.size()]);
- exprType[] d;
- if (decorators != null) {
- d = (exprType[])decorators.toArray(new exprType[decorators.size()]);
- } else {
- d = new exprType[0];
- }
- return new FunctionDef(t, nameToken.getText(), a, s, d);
- }
-
- private argumentsType makeArgumentsType(PythonTree t, List params, PythonTree snameToken,
- PythonTree knameToken, List defaults) {
- debug("Matched Arguments");
-
- exprType[] p = (exprType[])params.toArray(new exprType[params.size()]);
- exprType[] d = (exprType[])defaults.toArray(new exprType[defaults.size()]);
- String s;
- String k;
- if (snameToken == null) {
- s = null;
- } else {
- s = snameToken.getText();
- }
- if (knameToken == null) {
- k = null;
- } else {
- k = knameToken.getText();
- }
- return new argumentsType(t, p, s, k, d);
- }
-
- private stmtType makeTryExcept(PythonTree t, List body, List handlers, List orelse, List finBody) {
- stmtType[] b = (stmtType[])body.toArray(new stmtType[body.size()]);
- excepthandlerType[] e = (excepthandlerType[])handlers.toArray(new excepthandlerType[handlers.size()]);
- stmtType[] o;
- if (orelse != null) {
- o = (stmtType[])orelse.toArray(new stmtType[orelse.size()]);
- } else {
- o = new stmtType[0];
- }
-
- stmtType te = new TryExcept(t, b, e, o);
- if (finBody == null) {
- return te;
- }
- stmtType[] f = (stmtType[])finBody.toArray(new stmtType[finBody.size()]);
- stmtType[] mainBody = new stmtType[]{te};
- return new TryFinally(t, mainBody, f);
- }
-
- private TryFinally makeTryFinally(PythonTree t, List body, List finBody) {
- stmtType[] b = (stmtType[])body.toArray(new stmtType[body.size()]);
- stmtType[] f = (stmtType[])finBody.toArray(new stmtType[finBody.size()]);
- return new TryFinally(t, b, f);
- }
-
- private If makeIf(PythonTree t, exprType test, List body, List orelse) {
- stmtType[] o;
- if (orelse != null) {
- o = (stmtType[])orelse.toArray(new stmtType[orelse.size()]);
- } else {
- o = new stmtType[0];
- }
- stmtType[] b;
- if (body != null) {
- b = (stmtType[])body.toArray(new stmtType[body.size()]);
- } else {
- b = new stmtType[0];
- }
- return new If(t, test, b, o);
- }
-
-
- private While makeWhile(PythonTree t, exprType test, List body, List orelse) {
- stmtType[] o;
- if (orelse != null) {
- o = (stmtType[])orelse.toArray(new stmtType[orelse.size()]);
- } else {
- o = new stmtType[0];
- }
- stmtType[] b = (stmtType[])body.toArray(new stmtType[body.size()]);
- return new While(t, test, b, o);
- }
-
- private For makeFor(PythonTree t, exprType target, exprType iter, List body, List orelse) {
- stmtType[] o;
- if (orelse != null) {
- o = (stmtType[])orelse.toArray(new stmtType[orelse.size()]);
- } else {
- o = new stmtType[0];
- }
- stmtType[] b = (stmtType[])body.toArray(new stmtType[body.size()]);
- return new For(t, target, iter, b, o);
- }
-
- private Call makeCall(PythonTree t, exprType func) {
- return makeCall(t, func, null, null, null, null);
- }
-
- private Call makeCall(PythonTree t, exprType func, List args, List keywords, exprType starargs, exprType kwargs) {
- exprType[] a;
- keywordType[] k;
- if (args == null) {
- a = new exprType[0];
- } else {
- a = (exprType[])args.toArray(new exprType[args.size()]);
- }
- if (keywords == null) {
- k = new keywordType[0];
- } else {
- k = (keywordType[])keywords.toArray(new keywordType[keywords.size()]);
- }
- return new Call(t, func, a, k, starargs, kwargs);
- }
-
- //FIXME: just calling __neg__ for now - can be better. Also does not parse expressions like
- // --2 correctly (should give ^(USub -2) but gives 2).
- private exprType negate(PythonTree t, exprType o) {
- if (o instanceof Num) {
- Num num = (Num)o;
- if (num.n instanceof PyObject) {
- num.n = ((PyObject)num.n).__neg__();
- }
- return num;
- }
- return new UnaryOp(t, unaryopType.USub, o);
- }
-
- private void checkAssign(exprType e) {
- if (e instanceof Name && ((Name)e).id.equals("None")) {
- throw new ParseException("assignment to None", e);
- }
- }
}
@rulecatch {
@@ -303,24 +131,24 @@
expression returns [modType mod]
- : ^(Expression test[expr_contextType.Load]) { $mod = makeExpression($Expression, $test.etype); }
+ : ^(Expression test[expr_contextType.Load]) { $mod = actions.makeExpression($Expression, $test.etype); }
;
interactive returns [modType mod]
- : ^(Interactive stmts?) { $mod = makeInteractive($Interactive, $stmts.stypes); }
+ : ^(Interactive stmts?) { $mod = actions.makeInteractive($Interactive, $stmts.stypes); }
;
module returns [modType mod]
: ^(Module
- ( stmts {$mod = makeMod($Module, $stmts.stypes); }
- | {$mod = makeMod($Module, null);}
+ ( stmts {$mod = actions.makeMod($Module, $stmts.stypes); }
+ | {$mod = actions.makeMod($Module, null);}
)
)
;
funcdef
: ^(DEF NAME ^(Arguments varargslist?) ^(Body stmts) ^(Decorators decorators?)) {
- $stmts::statements.add(makeFunctionDef($DEF, $NAME, $varargslist.args, $stmts.stypes, $decorators.etypes));
+ $stmts::statements.add(actions.makeFunctionDef($DEF, $NAME, $varargslist.args, $stmts.stypes, $decorators.etypes));
}
;
@@ -330,19 +158,19 @@
List defaults = new ArrayList();
}
: ^(Args defparameter[params, defaults]+) (^(StarArgs sname=NAME))? (^(KWArgs kname=NAME))? {
- $args = makeArgumentsType($Args, params, $sname, $kname, defaults);
+ $args = actions.makeArgumentsType($Args, params, $sname, $kname, defaults);
}
| ^(StarArgs sname=NAME) (^(KWArgs kname=NAME))? {
- $args = makeArgumentsType($StarArgs,params, $sname, $kname, defaults);
+ $args = actions.makeArgumentsType($StarArgs,params, $sname, $kname, defaults);
}
| ^(KWArgs NAME) {
- $args = makeArgumentsType($KWArgs, params, null, $NAME, defaults);
+ $args = actions.makeArgumentsType($KWArgs, params, null, $NAME, defaults);
}
;
defparameter[List params, List defaults]
: fpdef[expr_contextType.Param, null] (ASSIGN test[expr_contextType.Load])? {
- checkAssign($fpdef.etype);
+ actions.checkAssign($fpdef.etype);
params.add($fpdef.etype);
if ($ASSIGN != null) {
defaults.add($test.etype);
@@ -399,9 +227,9 @@
} else {
Call c;
if ($Args == null) {
- c = makeCall($Call, $dotted_attr.etype);
+ c = actions.makeCall($Call, $dotted_attr.etype);
} else {
- c = makeCall($Call, $dotted_attr.etype, $arglist.args, $arglist.keywords, $arglist.starargs, $arglist.kwargs);
+ c = actions.makeCall($Call, $dotted_attr.etype, $arglist.args, $arglist.keywords, $arglist.starargs, $arglist.kwargs);
}
c.setCharStopIndex($Call.getCharStopIndex());
decs.add(c);
@@ -518,9 +346,9 @@
: ^(Call (^(Args arglist))? test[expr_contextType.Load]) {
Call c;
if ($Args == null) {
- c = makeCall($test.marker, $test.etype);
+ c = actions.makeCall($test.marker, $test.etype);
} else {
- c = makeCall($test.marker, $test.etype, $arglist.args, $arglist.keywords, $arglist.starargs, $arglist.kwargs);
+ c = actions.makeCall($test.marker, $test.etype, $arglist.args, $arglist.keywords, $arglist.starargs, $arglist.kwargs);
}
c.setCharStopIndex($Call.getCharStopIndex());
$etype = c;
@@ -538,7 +366,7 @@
target[List etypes]
: ^(Target atom[expr_contextType.Store]) {
- checkAssign($atom.etype);
+ actions.checkAssign($atom.etype);
etypes.add($atom.etype);
}
;
@@ -848,7 +676,7 @@
if ($ORELSE != null) {
o = $orelse.stypes;
}
- While w = makeWhile($WHILE, $test.etype, $body.stypes, o);
+ While w = actions.makeWhile($WHILE, $test.etype, $body.stypes, o);
$stmts::statements.add(w);
}
;
@@ -859,7 +687,7 @@
if ($ORELSE != null) {
o = $orelse.stypes;
}
- For f = makeFor($FOR, $targ.etype, $iter.etype, $body.stypes, o);
+ For f = actions.makeFor($FOR, $targ.etype, $iter.etype, $body.stypes, o);
$stmts::statements.add(f);
}
;
@@ -877,11 +705,11 @@
if ($FINALLY != null) {
f = $fin.stypes;
}
- stmtType te = makeTryExcept($TryExcept, $body.stypes, handlers, o, f);
+ stmtType te = actions.makeTryExcept($TryExcept, $body.stypes, handlers, o, f);
$stmts::statements.add(te);
}
| ^(TryFinally ^(Body body=stmts) ^(FINALLY fin=stmts)) {
- TryFinally tf = makeTryFinally($TryFinally, $body.stypes, $fin.stypes);
+ TryFinally tf = actions.makeTryFinally($TryFinally, $body.stypes, $fin.stypes);
$stmts::statements.add(tf);
}
;
@@ -1184,7 +1012,7 @@
}
| ^(USub tok=MINUS test[ctype]) {
debug("USub matched " + $test.etype);
- $etype = negate($tok, $test.etype);
+ $etype = actions.negate($tok, $test.etype);
$marker = $tok;
}
| ^(UAdd tok=PLUS test[ctype]) {
@@ -1309,7 +1137,7 @@
} else {
b = new ArrayList();
}
- $stmts::statements.add(makeClassDef($CLASS, $classname, b, $stmts.stypes));
+ $stmts::statements.add(actions.makeClassDef($CLASS, $classname, b, $stmts.stypes));
}
;
@@ -1388,7 +1216,7 @@
keyword[List kws]
: ^(Keyword ^(Arg arg=test[expr_contextType.Load]) ^(Value val=test[expr_contextType.Load])) {
- checkAssign($arg.etype);
+ actions.checkAssign($arg.etype);
kws.add(new keywordType($Keyword, $arg.text, $val.etype));
}
;
Added: branches/asm/src/org/python/antlr/GrammarActions.java
===================================================================
--- branches/asm/src/org/python/antlr/GrammarActions.java (rev 0)
+++ branches/asm/src/org/python/antlr/GrammarActions.java 2008-08-08 19:30:38 UTC (rev 5110)
@@ -0,0 +1,458 @@
+package org.python.antlr;
+
+import org.antlr.runtime.CommonToken;
+import org.antlr.runtime.Token;
+
+import org.python.core.Py;
+import org.python.core.PyObject;
+import org.python.core.PyString;
+import org.python.core.PyUnicode;
+import org.python.antlr.ParseException;
+import org.python.antlr.ast.aliasType;
+import org.python.antlr.ast.argumentsType;
+import org.python.antlr.ast.boolopType;
+import org.python.antlr.ast.comprehensionType;
+import org.python.antlr.ast.cmpopType;
+import org.python.antlr.ast.excepthandlerType;
+import org.python.antlr.ast.exprType;
+import org.python.antlr.ast.expr_contextType;
+import org.python.antlr.ast.keywordType;
+import org.python.antlr.ast.modType;
+import org.python.antlr.ast.operatorType;
+import org.python.antlr.ast.sliceType;
+import org.python.antlr.ast.stmtType;
+import org.python.antlr.ast.unaryopType;
+import org.python.antlr.ast.Assert;
+import org.python.antlr.ast.Assign;
+import org.python.antlr.ast.Attribute;
+import org.python.antlr.ast.AugAssign;
+import org.python.antlr.ast.BinOp;
+import org.python.antlr.ast.BoolOp;
+import org.python.antlr.ast.Break;
+import org.python.antlr.ast.Call;
+import org.python.antlr.ast.ClassDef;
+import org.python.antlr.ast.Compare;
+import org.python.antlr.ast.Continue;
+import org.python.antlr.ast.Delete;
+import org.python.antlr.ast.Dict;
+import org.python.antlr.ast.Ellipsis;
+import org.python.antlr.ast.ErrorStmt;
+import org.python.antlr.ast.Exec;
+import org.python.antlr.ast.Expr;
+import org.python.antlr.ast.Expression;
+import org.python.antlr.ast.ExtSlice;
+import org.python.antlr.ast.For;
+import org.python.antlr.ast.FunctionDef;
+import org.python.antlr.ast.GeneratorExp;
+import org.python.antlr.ast.Global;
+import org.python.antlr.ast.If;
+import org.python.antlr.ast.IfExp;
+import org.python.antlr.ast.Index;
+import org.python.antlr.ast.Import;
+import org.python.antlr.ast.ImportFrom;
+import org.python.antlr.ast.Interactive;
+import org.python.antlr.ast.Lambda;
+import org.python.antlr.ast.ListComp;
+import org.python.antlr.ast.Module;
+import org.python.antlr.ast.Name;
+import org.python.antlr.ast.Num;
+import org.python.antlr.ast.Slice;
+import org.python.antlr.ast.Subscript;
+import org.python.antlr.ast.TryExcept;
+import org.python.antlr.ast.TryFinally;
+import org.python.antlr.ast.Tuple;
+import org.python.antlr.ast.Pass;
+import org.python.antlr.ast.Print;
+import org.python.antlr.ast.Raise;
+import org.python.antlr.ast.Repr;
+import org.python.antlr.ast.Return;
+import org.python.antlr.ast.Str;
+import org.python.antlr.ast.UnaryOp;
+import org.python.antlr.ast.With;
+import org.python.antlr.ast.While;
+import org.python.antlr.ast.Yield;
+
+import java.math.BigInteger;
+import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.Set;
+
+public class GrammarActions {
+ public GrammarActions() {
+ }
+
+ void debug(String x) {
+ if (false) {
+ System.out.println(x);
+ }
+ }
+
+ void throwGenExpNotSoleArg(PythonTree t) {
+ throw new ParseException("Generator expression must be parenthesized if not sole argument", t);
+ }
+
+ exprType[] makeExprs(List exprs) {
+ return makeExprs(exprs, 0);
+ }
+
+ exprType[] makeExprs(List exprs, int start) {
+ if (exprs != null) {
+ List<exprType> result = new ArrayList<exprType>();
+ for (int i=start; i<exprs.size(); i++) {
+ exprType e = (exprType)exprs.get(i);
+ result.add(e);
+ }
+ return (exprType[])result.toArray(new exprType[result.size()]);
+ }
+ return new exprType[0];
+ }
+
+ stmtType[] makeStmts(List stmts) {
+ if (stmts != null) {
+ List<stmtType> result = new ArrayList<stmtType>();
+ for (int i=0; i<stmts.size(); i++) {
+ result.add((stmtType)stmts.get(i));
+ }
+ return (stmtType[])result.toArray(new stmtType[result.size()]);
+ }
+ return new stmtType[0];
+ }
+
+ exprType makeDottedAttr(Token nameToken, List attrs) {
+ exprType current = new Name(nameToken, nameToken.getText(), expr_contextType.Load);
+ for (int i=attrs.size() - 1; i > -1; i--) {
+ Token t = ((PythonTree)attrs.get(i)).token;
+ current = new Attribute(t, current, t.getText(),
+ expr_contextType.Load);
+ }
+ return current;
+ }
+
+ stmtType makeFunctionDef(PythonTree t, PythonTree nameToken, argumentsType args, List funcStatements, List decorators) {
+ /*
+ if (nameToken == null || funcStatements == null || decorators == null) {
+ return new ErrorStmt(t);
+ }
+ */
+ argumentsType a;
+ debug("Matched FunctionDef");
+ if (args != null) {
+ a = args;
+ } else {
+ a = new argumentsType(t, new exprType[0], null, null, new exprType[0]);
+ }
+ stmtType[] s = (stmtType[])funcStatements.toArray(new stmtType[funcStatements.size()]);
+ exprType[] d;
+ if (decorators != null) {
+ d = (exprType[])decorators.toArray(new exprType[decorators.size()]);
+ } else {
+ d = new exprType[0];
+ }
+ return new FunctionDef(t, nameToken.getText(), a, s, d);
+ }
+
+ argumentsType makeArgumentsType(Token t, List params, Token snameToken,
+ Token knameToken, List defaults) {
+ debug("Matched Arguments");
+
+ exprType[] p = (exprType[])params.toArray(new exprType[params.size()]);
+ exprType[] d = (exprType[])defaults.toArray(new exprType[defaults.size()]);
+ String s;
+ String k;
+ if (snameToken == null) {
+ s = null;
+ } else {
+ s = snameToken.getText();
+ }
+ if (knameToken == null) {
+ k = null;
+ } else {
+ k = knameToken.getText();
+ }
+ return new argumentsType(t, p, s, k, d);
+ }
+
+
+
+ Object makeFloat(Token t) {
+ debug("makeFloat matched " + t.getText());
+ return Py.newFloat(Double.valueOf(t.getText()));
+ }
+
+ Object makeComplex(Token t) {
+ String s = t.getText();
+ s = s.substring(0, s.length() - 1);
+ return Py.newImaginary(Double.valueOf(s));
+ }
+
+ Object makeInt(Token t) {
+ debug("Num matched " + t.getText());
+ String s = t.getText();
+ int radix = 10;
+ if (s.startsWith("0x") || s.startsWith("0X")) {
+ radix = 16;
+ s = s.substring(2, s.length());
+ } else if (s.startsWith("0")) {
+ radix = 8;
+ }
+ if (s.endsWith("L") || s.endsWith("l")) {
+ s = s.substring(0, s.length()-1);
+ return Py.newLong(new BigInteger(s, radix));
+ }
+ int ndigits = s.length();
+ int i=0;
+ while (i < ndigits && s.charAt(i) == '0')
+ i++;
+ if ((ndigits - i) > 11) {
+ return Py.newLong(new BigInteger(s, radix));
+ }
+
+ long l = Long.valueOf(s, radix).longValue();
+ if (l > 0xffffffffl || (l > Integer.MAX_VALUE)) {
+ return Py.newLong(new BigInteger(s, radix));
+ }
+ return Py.newInteger((int) l);
+ }
+
+ class StringPair {
+ private String s;
+ private boolean unicode;
+
+ StringPair(String s, boolean unicode) {
+ this.s = s;
+ this.unicode = unicode;
+ }
+ String getString() {
+ return s;
+ }
+
+ boolean isUnicode() {
+ return unicode;
+ }
+ }
+
+ PyString extractStrings(List s) {
+ boolean ustring = false;
+ Token last = null;
+ StringBuffer sb = new StringBuffer();
+ Iterator iter = s.iterator();
+ while (iter.hasNext()) {
+ last = (Token)iter.next();
+ StringPair sp = extractString(last);
+ if (sp.isUnicode()) {
+ ustring = true;
+ }
+ sb.append(sp.getString());
+ }
+ if (ustring) {
+ return new PyUnicode(sb.toString());
+ }
+ return new PyString(sb.toString());
+ }
+
+ StringPair extractString(Token t) {
+ String s = t.getText();
+ char quoteChar = s.charAt(0);
+ int start=0;
+ boolean ustring = false;
+ if (quoteChar == 'u' || quoteChar == 'U') {
+ ustring = true;
+ start++;
+ }
+ quoteChar = s.charAt(start);
+ boolean raw = false;
+ if (quoteChar == 'r' || quoteChar == 'R') {
+ raw = true;
+ start++;
+ }
+ int quotes = 3;
+ if (s.length() - start == 2) {
+ quotes = 1;
+ }
+ if (s.charAt(start) != s.charAt(start+1)) {
+ quotes = 1;
+ }
+
+ if (raw) {
+ return new StringPair(s.substring(quotes+start, s.length()-quotes), ustring);
+ } else {
+ StringBuffer sb = new StringBuffer(s.length());
+ char[] ca = s.toCharArray();
+ int n = ca.length-quotes;
+ int i=quotes+start;
+ int last_i=i;
+ return new StringPair(PyString.decode_UnicodeEscape(s, i, n, "strict", ustring), ustring);
+ //return decode_UnicodeEscape(s, i, n, "strict", ustring);
+ }
+ }
+
+ Token extractStringToken(List s) {
+ return (Token)s.get(s.size() - 1);
+ }
+
+ //FROM Walker:
+ modType makeMod(PythonTree t, List stmts) {
+ stmtType[] s;
+ if (stmts != null) {
+ s = (stmtType[])stmts.toArray(new stmtType[stmts.size()]);
+ } else {
+ s = new stmtType[0];
+ }
+ return new Module(t, s);
+ }
+
+ modType makeExpression(PythonTree t, exprType e) {
+ return new Expression(t, e);
+ }
+
+ modType makeInteractive(PythonTree t, List stmts) {
+ stmtType[] s;
+ if (stmts == null) {
+ s = new stmtType[0];
+ } else {
+ s = (stmtType[])stmts.toArray(new stmtType[stmts.size()]);
+ }
+ return new Interactive(t, s);
+ }
+
+ stmtType makeClassDef(PythonTree t, PythonTree nameToken, List bases, List body) {
+ /*
+ if (nameToken == null || bases == null || body == null) {
+ return new ErrorStmt(t);
+ }
+ */
+ exprType[] b = (exprType[])bases.toArray(new exprType[bases.size()]);
+ stmtType[] s = (stmtType[])body.toArray(new stmtType[body.size()]);
+ return new ClassDef(t, nameToken.getText(), b, s);
+ }
+
+ argumentsType makeArgumentsType(PythonTree t, List params, PythonTree snameToken,
+ PythonTree knameToken, List defaults) {
+ debug("Matched Arguments");
+
+ exprType[] p = (exprType[])params.toArray(new exprType[params.size()]);
+ exprType[] d = (exprType[])defaults.toArray(new exprType[defaults.size()]);
+ String s;
+ String k;
+ if (snameToken == null) {
+ s = null;
+ } else {
+ s = snameToken.getText();
+ }
+ if (knameToken == null) {
+ k = null;
+ } else {
+ k = knameToken.getText();
+ }
+ return new argumentsType(t, p, s, k, d);
+ }
+
+ stmtType makeTryExcept(PythonTree t, List body, List handlers, List orelse, List finBody) {
+ stmtType[] b = (stmtType[])body.toArray(new stmtType[body.size()]);
+ excepthandlerType[] e = (excepthandlerType[])handlers.toArray(new excepthandlerType[handlers.size()]);
+ stmtType[] o;
+ if (orelse != null) {
+ o = (stmtType[])orelse.toArray(new stmtType[orelse.size()]);
+ } else {
+ o = new stmtType[0];
+ }
+
+ stmtType te = new TryExcept(t, b, e, o);
+ if (finBody == null) {
+ return te;
+ }
+ stmtType[] f = (stmtType[])finBody.toArray(new stmtType[finBody.size()]);
+ stmtType[] mainBody = new stmtType[]{te};
+ return new TryFinally(t, mainBody, f);
+ }
+
+ TryFinally makeTryFinally(PythonTree t, List body, List finBody) {
+ stmtType[] b = (stmtType[])body.toArray(new stmtType[body.size()]);
+ stmtType[] f = (stmtType[])finBody.toArray(new stmtType[finBody.size()]);
+ return new TryFinally(t, b, f);
+ }
+
+ If makeIf(PythonTree t, exprType test, List body, List orelse) {
+ stmtType[] o;
+ if (orelse != null) {
+ o = (stmtType[])orelse.toArray(new stmtType[orelse.size()]);
+ } else {
+ o = new stmtType[0];
+ }
+ stmtType[] b;
+ if (body != null) {
+ b = (stmtType[])body.toArray(new stmtType[body.size()]);
+ } else {
+ b = new stmtType[0];
+ }
+ return new If(t, test, b, o);
+ }
+
+
+ While makeWhile(PythonTree t, exprType test, List body, List orelse) {
+ stmtType[] o;
+ if (orelse != null) {
+ o = (stmtType[])orelse.toArray(new stmtType[orelse.size()]);
+ } else {
+ o = new stmtType[0];
+ }
+ stmtType[] b = (stmtType[])body.toArray(new stmtType[body.size()]);
+ return new While(t, test, b, o);
+ }
+
+ For makeFor(PythonTree t, exprType target, exprType iter, List body, List orelse) {
+ stmtType[] o;
+ if (orelse != null) {
+ o = (stmtType[])orelse.toArray(new stmtType[orelse.size()]);
+ } else {
+ o = new stmtType[0];
+ }
+ stmtType[] b = (stmtType[])body.toArray(new stmtType[body.size()]);
+ return new For(t, target, iter, b, o);
+ }
+
+ Call makeCall(PythonTree t, exprType func) {
+ return makeCall(t, func, null, null, null, null);
+ }
+
+ Call makeCall(PythonTree t, exprType func, List args, List keywords, exprType starargs, exprType kwargs) {
+ exprType[] a;
+ keywordType[] k;
+ if (args == null) {
+ a = new exprType[0];
+ } else {
+ a = (exprType[])args.toArray(new exprType[args.size()]);
+ }
+ if (keywords == null) {
+ k = new keywordType[0];
+ } else {
+ k = (keywordType[])keywords.toArray(new keywordType[keywords.size()]);
+ }
+ return new Call(t, func, a, k, starargs, kwargs);
+ }
+
+ //FIXME: just calling __neg__ for now - can be better. Also does not parse expressions like
+ // --2 correctly (should give ^(USub -2) but gives 2).
+ exprType negate(PythonTree t, exprType o) {
+ if (o instanceof Num) {
+ Num num = (Num)o;
+ if (num.n instanceof PyObject) {
+ num.n = ((PyObject)num.n).__neg__();
+ }
+ return num;
+ }
+ return new UnaryOp(t, unaryopType.USub, o);
+ }
+
+ void checkAssign(exprType e) {
+ if (e instanceof Name && ((Name)e).id.equals("None")) {
+ throw new ParseException("assignment to None", e);
+ }
+ }
+}
Added: branches/asm/src/org/python/antlr/ast/ErrorStmt.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/ErrorStmt.java (rev 0)
+++ branches/asm/src/org/python/antlr/ast/ErrorStmt.java 2008-08-08 19:30:38 UTC (rev 5110)
@@ -0,0 +1,32 @@
+package org.python.antlr.ast;
+import org.python.antlr.PythonTree;
+import org.antlr.runtime.CommonToken;
+import org.antlr.runtime.Token;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+public class ErrorStmt extends stmtType {
+
+ public static final String[] _fields = new String[] {};
+
+ public ErrorStmt(PythonTree tree) {
+ super(tree);
+ }
+
+ public String toString() {
+ return "ErrorStmt";
+ }
+
+ public String toStringTree() {
+ return "ErrorStmt";
+ }
+
+ public int getLineno() {
+ return getLine();
+ }
+
+ public int getCol_offset() {
+ return getCharPositionInLine();
+ }
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pj...@us...> - 2008-08-08 22:07:27
|
Revision: 5111
http://jython.svn.sourceforge.net/jython/?rev=5111&view=rev
Author: pjenvey
Date: 2008-08-08 22:07:24 +0000 (Fri, 08 Aug 2008)
Log Message:
-----------
o another fix to make 'currentThread() is currentThread()' from
thread.start_new_thread threads. use a WeakHashMap because weakrefs of
javainstances ref the wrapper, not the actual java object
o custom toString for FunctionThread
Modified Paths:
--------------
branches/asm/Lib/threading.py
branches/asm/src/org/python/core/FunctionThread.java
Modified: branches/asm/Lib/threading.py
===================================================================
--- branches/asm/Lib/threading.py 2008-08-08 19:30:38 UTC (rev 5110)
+++ branches/asm/Lib/threading.py 2008-08-08 22:07:24 UTC (rev 5111)
@@ -1,3 +1,4 @@
+from java.util import Collections, WeakHashMap
from java.util.concurrent import Semaphore, CyclicBarrier
from java.util.concurrent.locks import ReentrantLock
from thread import _newFunctionThread
@@ -160,6 +161,8 @@
class JavaThread(object):
def __init__(self, thread):
self._thread = thread
+ _jthread_to_pythread[thread] = self
+ _threads[thread.getId()] = self
def __repr__(self):
_thread = self._thread
@@ -209,10 +212,12 @@
# relies on the fact that this is a CHM
_threads = weakref.WeakValueDictionary()
_active = _threads
-_jthread_to_pythread = weakref.WeakKeyDictionary()
+_jthread_to_pythread = Collections.synchronizedMap(WeakHashMap())
class Thread(JavaThread):
def __init__(self, group=None, target=None, name=None, args=None, kwargs=None):
+ _thread = self._create_thread()
+ JavaThread.__init__(self, _thread)
if args is None:
args = ()
if kwargs is None:
@@ -220,11 +225,8 @@
self._target = target
self._args = args
self._kwargs = kwargs
- self._thread = _thread = self._create_thread()
if name:
self._thread.setName(name)
- _jthread_to_pythread[_thread] = self
- _threads[_thread.getId()] = self
def _create_thread(self):
return _newFunctionThread(self.__bootstrap, ())
@@ -314,10 +316,11 @@
return None
def currentThread():
- try:
- return _jthread_to_pythread[java.lang.Thread.currentThread()]
- except KeyError:
- return JavaThread(java.lang.Thread.currentThread())
+ jthread = java.lang.Thread.currentThread()
+ pythread = _jthread_to_pythread[jthread]
+ if pythread is None:
+ pythread = JavaThread(jthread)
+ return pythread
def activeCount():
return len(_threads)
Modified: branches/asm/src/org/python/core/FunctionThread.java
===================================================================
--- branches/asm/src/org/python/core/FunctionThread.java 2008-08-08 19:30:38 UTC (rev 5110)
+++ branches/asm/src/org/python/core/FunctionThread.java 2008-08-08 22:07:24 UTC (rev 5111)
@@ -28,4 +28,15 @@
Py.printException(exc);
}
}
+
+ @Override
+ public String toString() {
+ ThreadGroup group = getThreadGroup();
+ if (group != null) {
+ return String.format("FunctionThread[%s,%s,%s]", getName(), getPriority(),
+ group.getName());
+ } else {
+ return String.format("FunctionThread[%s,%s]", getName(), getPriority());
+ }
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fwi...@us...> - 2008-08-08 23:54:10
|
Revision: 5112
http://jython.svn.sourceforge.net/jython/?rev=5112&view=rev
Author: fwierzbicki
Date: 2008-08-08 23:54:06 +0000 (Fri, 08 Aug 2008)
Log Message:
-----------
New error nodes for tool ASTs. Added errorhandling methods to ErrorHandler.
Modified Paths:
--------------
branches/asm/grammar/Python.g
branches/asm/grammar/PythonWalker.g
branches/asm/src/org/python/antlr/ErrorHandler.java
branches/asm/src/org/python/antlr/FailFastHandler.java
branches/asm/src/org/python/antlr/GrammarActions.java
branches/asm/src/org/python/antlr/ListErrorHandler.java
Added Paths:
-----------
branches/asm/src/org/python/antlr/ast/ErrorExpr.java
branches/asm/src/org/python/antlr/ast/ErrorMod.java
branches/asm/src/org/python/antlr/ast/ErrorSlice.java
Modified: branches/asm/grammar/Python.g
===================================================================
--- branches/asm/grammar/Python.g 2008-08-08 22:07:24 UTC (rev 5111)
+++ branches/asm/grammar/Python.g 2008-08-08 23:54:06 UTC (rev 5112)
@@ -192,6 +192,7 @@
public void setErrorHandler(ErrorHandler eh) {
this.errorHandler = eh;
+ actions.setErrorHandler(eh);
}
private void debug(String message) {
Modified: branches/asm/grammar/PythonWalker.g
===================================================================
--- branches/asm/grammar/PythonWalker.g 2008-08-08 22:07:24 UTC (rev 5111)
+++ branches/asm/grammar/PythonWalker.g 2008-08-08 23:54:06 UTC (rev 5112)
@@ -95,6 +95,7 @@
public void setErrorHandler(ErrorHandler eh) {
this.errorHandler = eh;
+ actions.setErrorHandler(eh);
}
public void debug(String message) {
@@ -225,7 +226,7 @@
if ($Call == null) {
decs.add($dotted_attr.etype);
} else {
- Call c;
+ exprType c;
if ($Args == null) {
c = actions.makeCall($Call, $dotted_attr.etype);
} else {
@@ -344,7 +345,7 @@
call_expr returns [exprType etype, PythonTree marker]
: ^(Call (^(Args arglist))? test[expr_contextType.Load]) {
- Call c;
+ exprType c;
if ($Args == null) {
c = actions.makeCall($test.marker, $test.etype);
} else {
@@ -676,7 +677,7 @@
if ($ORELSE != null) {
o = $orelse.stypes;
}
- While w = actions.makeWhile($WHILE, $test.etype, $body.stypes, o);
+ stmtType w = actions.makeWhile($WHILE, $test.etype, $body.stypes, o);
$stmts::statements.add(w);
}
;
@@ -687,7 +688,7 @@
if ($ORELSE != null) {
o = $orelse.stypes;
}
- For f = actions.makeFor($FOR, $targ.etype, $iter.etype, $body.stypes, o);
+ stmtType f = actions.makeFor($FOR, $targ.etype, $iter.etype, $body.stypes, o);
$stmts::statements.add(f);
}
;
Modified: branches/asm/src/org/python/antlr/ErrorHandler.java
===================================================================
--- branches/asm/src/org/python/antlr/ErrorHandler.java 2008-08-08 22:07:24 UTC (rev 5111)
+++ branches/asm/src/org/python/antlr/ErrorHandler.java 2008-08-08 23:54:06 UTC (rev 5112)
@@ -4,10 +4,20 @@
import org.antlr.runtime.IntStream;
import org.antlr.runtime.Lexer;
import org.antlr.runtime.RecognitionException;
+import org.python.antlr.ast.exprType;
+import org.python.antlr.ast.modType;
+import org.python.antlr.ast.sliceType;
+import org.python.antlr.ast.stmtType;
interface ErrorHandler {
void reportError(BaseRecognizer br, RecognitionException re);
void recover(BaseRecognizer br, IntStream input, RecognitionException re);
void recover(Lexer lex, RecognitionException re);
boolean isRecoverable();
+ //exprType, modType, sliceType, stmtType
+ exprType errorExpr(PythonTree t);
+ modType errorMod(PythonTree t);
+ sliceType errorSlice(PythonTree t);
+ stmtType errorStmt(PythonTree t);
+
}
Modified: branches/asm/src/org/python/antlr/FailFastHandler.java
===================================================================
--- branches/asm/src/org/python/antlr/FailFastHandler.java 2008-08-08 22:07:24 UTC (rev 5111)
+++ branches/asm/src/org/python/antlr/FailFastHandler.java 2008-08-08 23:54:06 UTC (rev 5112)
@@ -4,6 +4,14 @@
import org.antlr.runtime.IntStream;
import org.antlr.runtime.Lexer;
import org.antlr.runtime.RecognitionException;
+import org.python.antlr.ast.ErrorMod;
+import org.python.antlr.ast.exprType;
+import org.python.antlr.ast.ErrorExpr;
+import org.python.antlr.ast.ErrorSlice;
+import org.python.antlr.ast.ErrorStmt;
+import org.python.antlr.ast.modType;
+import org.python.antlr.ast.sliceType;
+import org.python.antlr.ast.stmtType;
public class FailFastHandler implements ErrorHandler {
@@ -23,9 +31,26 @@
return false;
}
+ public exprType errorExpr(PythonTree t) {
+ throw new ParseException("Bad Expr Node", t);
+ }
+
+ public modType errorMod(PythonTree t) {
+ throw new ParseException("Bad Mod Node", t);
+ }
+
+ public sliceType errorSlice(PythonTree t) {
+ throw new ParseException("Bad Slice Node", t);
+ }
+
+ public stmtType errorStmt(PythonTree t) {
+ throw new ParseException("Bad Stmt Node", t);
+ }
+
private String message(BaseRecognizer br, RecognitionException re) {
String hdr = br.getErrorHeader(re);
String msg = br.getErrorMessage(re, br.getTokenNames());
return hdr+" "+msg;
}
+
}
Modified: branches/asm/src/org/python/antlr/GrammarActions.java
===================================================================
--- branches/asm/src/org/python/antlr/GrammarActions.java 2008-08-08 22:07:24 UTC (rev 5111)
+++ branches/asm/src/org/python/antlr/GrammarActions.java 2008-08-08 23:54:06 UTC (rev 5112)
@@ -84,9 +84,14 @@
import java.util.Set;
public class GrammarActions {
+ private ErrorHandler errorHandler = null;
+
public GrammarActions() {
}
+ public void setErrorHandler(ErrorHandler eh) {
+ this.errorHandler = eh;
+ }
void debug(String x) {
if (false) {
System.out.println(x);
@@ -135,11 +140,9 @@
}
stmtType makeFunctionDef(PythonTree t, PythonTree nameToken, argumentsType args, List funcStatements, List decorators) {
- /*
- if (nameToken == null || funcStatements == null || decorators == null) {
- return new ErrorStmt(t);
+ if (nameToken == null) {
+ return errorHandler.errorStmt(t);
}
- */
argumentsType a;
debug("Matched FunctionDef");
if (args != null) {
@@ -322,11 +325,9 @@
}
stmtType makeClassDef(PythonTree t, PythonTree nameToken, List bases, List body) {
- /*
- if (nameToken == null || bases == null || body == null) {
- return new ErrorStmt(t);
+ if (nameToken == null) {
+ return errorHandler.errorStmt(t);
}
- */
exprType[] b = (exprType[])bases.toArray(new exprType[bases.size()]);
stmtType[] s = (stmtType[])body.toArray(new stmtType[body.size()]);
return new ClassDef(t, nameToken.getText(), b, s);
@@ -378,7 +379,10 @@
return new TryFinally(t, b, f);
}
- If makeIf(PythonTree t, exprType test, List body, List orelse) {
+ stmtType makeIf(PythonTree t, exprType test, List body, List orelse) {
+ if (test == null) {
+ return errorHandler.errorStmt(t);
+ }
stmtType[] o;
if (orelse != null) {
o = (stmtType[])orelse.toArray(new stmtType[orelse.size()]);
@@ -395,7 +399,10 @@
}
- While makeWhile(PythonTree t, exprType test, List body, List orelse) {
+ stmtType makeWhile(PythonTree t, exprType test, List body, List orelse) {
+ if (test == null) {
+ return errorHandler.errorStmt(t);
+ }
stmtType[] o;
if (orelse != null) {
o = (stmtType[])orelse.toArray(new stmtType[orelse.size()]);
@@ -406,7 +413,10 @@
return new While(t, test, b, o);
}
- For makeFor(PythonTree t, exprType target, exprType iter, List body, List orelse) {
+ stmtType makeFor(PythonTree t, exprType target, exprType iter, List body, List orelse) {
+ if (target == null || iter == null) {
+ return errorHandler.errorStmt(t);
+ }
stmtType[] o;
if (orelse != null) {
o = (stmtType[])orelse.toArray(new stmtType[orelse.size()]);
@@ -417,11 +427,14 @@
return new For(t, target, iter, b, o);
}
- Call makeCall(PythonTree t, exprType func) {
+ exprType makeCall(PythonTree t, exprType func) {
return makeCall(t, func, null, null, null, null);
}
- Call makeCall(PythonTree t, exprType func, List args, List keywords, exprType starargs, exprType kwargs) {
+ exprType makeCall(PythonTree t, exprType func, List args, List keywords, exprType starargs, exprType kwargs) {
+ if (func == null) {
+ return errorHandler.errorExpr(t);
+ }
exprType[] a;
keywordType[] k;
if (args == null) {
Modified: branches/asm/src/org/python/antlr/ListErrorHandler.java
===================================================================
--- branches/asm/src/org/python/antlr/ListErrorHandler.java 2008-08-08 22:07:24 UTC (rev 5111)
+++ branches/asm/src/org/python/antlr/ListErrorHandler.java 2008-08-08 23:54:06 UTC (rev 5112)
@@ -4,6 +4,14 @@
import org.antlr.runtime.IntStream;
import org.antlr.runtime.Lexer;
import org.antlr.runtime.RecognitionException;
+import org.python.antlr.ast.ErrorMod;
+import org.python.antlr.ast.exprType;
+import org.python.antlr.ast.ErrorExpr;
+import org.python.antlr.ast.ErrorSlice;
+import org.python.antlr.ast.ErrorStmt;
+import org.python.antlr.ast.modType;
+import org.python.antlr.ast.sliceType;
+import org.python.antlr.ast.stmtType;
public class ListErrorHandler implements ErrorHandler {
@@ -23,4 +31,20 @@
return true;
}
+ public exprType errorExpr(PythonTree t) {
+ return new ErrorExpr(t);
+ }
+
+ public modType errorMod(PythonTree t) {
+ return new ErrorMod(t);
+ }
+
+ public sliceType errorSlice(PythonTree t) {
+ return new ErrorSlice(t);
+ }
+
+ public stmtType errorStmt(PythonTree t) {
+ return new ErrorStmt(t);
+ }
+
}
Added: branches/asm/src/org/python/antlr/ast/ErrorExpr.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/ErrorExpr.java (rev 0)
+++ branches/asm/src/org/python/antlr/ast/ErrorExpr.java 2008-08-08 23:54:06 UTC (rev 5112)
@@ -0,0 +1,28 @@
+package org.python.antlr.ast;
+import org.python.antlr.PythonTree;
+
+public class ErrorExpr extends exprType {
+
+ public static final String[] _fields = new String[] {};
+
+ public ErrorExpr(PythonTree tree) {
+ super(tree);
+ }
+
+ public String toString() {
+ return "ErrorExpr";
+ }
+
+ public String toStringTree() {
+ return "ErrorExpr";
+ }
+
+ public int getLineno() {
+ return getLine();
+ }
+
+ public int getCol_offset() {
+ return getCharPositionInLine();
+ }
+
+}
Added: branches/asm/src/org/python/antlr/ast/ErrorMod.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/ErrorMod.java (rev 0)
+++ branches/asm/src/org/python/antlr/ast/ErrorMod.java 2008-08-08 23:54:06 UTC (rev 5112)
@@ -0,0 +1,28 @@
+package org.python.antlr.ast;
+import org.python.antlr.PythonTree;
+
+public class ErrorMod extends modType {
+
+ public static final String[] _fields = new String[] {};
+
+ public ErrorMod(PythonTree tree) {
+ super(tree);
+ }
+
+ public String toString() {
+ return "ErrorMod";
+ }
+
+ public String toStringTree() {
+ return "ErrorMod";
+ }
+
+ public int getLineno() {
+ return getLine();
+ }
+
+ public int getCol_offset() {
+ return getCharPositionInLine();
+ }
+
+}
Added: branches/asm/src/org/python/antlr/ast/ErrorSlice.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/ErrorSlice.java (rev 0)
+++ branches/asm/src/org/python/antlr/ast/ErrorSlice.java 2008-08-08 23:54:06 UTC (rev 5112)
@@ -0,0 +1,32 @@
+package org.python.antlr.ast;
+import org.python.antlr.PythonTree;
+import org.antlr.runtime.CommonToken;
+import org.antlr.runtime.Token;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+public class ErrorSlice extends sliceType {
+
+ public static final String[] _fields = new String[] {};
+
+ public ErrorSlice(PythonTree tree) {
+ super(tree);
+ }
+
+ public String toString() {
+ return "ErrorSlice";
+ }
+
+ public String toStringTree() {
+ return "ErrorSlice";
+ }
+
+ public int getLineno() {
+ return getLine();
+ }
+
+ public int getCol_offset() {
+ return getCharPositionInLine();
+ }
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pj...@us...> - 2008-08-09 06:17:46
|
Revision: 5116
http://jython.svn.sourceforge.net/jython/?rev=5116&view=rev
Author: pjenvey
Date: 2008-08-09 06:17:43 +0000 (Sat, 09 Aug 2008)
Log Message:
-----------
o re-integrate list_tests workaround and use stock 2.5 seq_tests
o fix list.index handling of long start values and slice assignment of strings
o raise MemoryErrors as per seq_tests.test_bigrepeat
Modified Paths:
--------------
branches/asm/Lib/test/list_tests.py
branches/asm/src/org/python/core/PyList.java
branches/asm/src/org/python/core/PyTuple.java
Removed Paths:
-------------
branches/asm/Lib/test/seq_tests.py
Modified: branches/asm/Lib/test/list_tests.py
===================================================================
--- branches/asm/Lib/test/list_tests.py 2008-08-09 06:12:17 UTC (rev 5115)
+++ branches/asm/Lib/test/list_tests.py 2008-08-09 06:17:43 UTC (rev 5116)
@@ -461,7 +461,11 @@
u += "eggs"
self.assertEqual(u, self.type2test("spameggs"))
- self.assertRaises(TypeError, u.__iadd__, None)
+ if not test_support.is_jython:
+ self.assertRaises(TypeError, u.__iadd__, None)
+ else:
+ import operator
+ self.assertRaises(TypeError, operator.__iadd__, u, None)
def test_imul(self):
u = self.type2test([0, 1])
@@ -512,7 +516,8 @@
a[::2] = tuple(range(5))
self.assertEqual(a, self.type2test([0, 1, 1, 3, 2, 5, 3, 7, 4, 9]))
- def test_constructor_exception_handling(self):
+ # XXX: CPython specific, PyList doesn't len() during init
+ def _test_constructor_exception_handling(self):
# Bug #1242657
class F(object):
def __iter__(self):
Deleted: branches/asm/Lib/test/seq_tests.py
===================================================================
--- branches/asm/Lib/test/seq_tests.py 2008-08-09 06:12:17 UTC (rev 5115)
+++ branches/asm/Lib/test/seq_tests.py 2008-08-09 06:17:43 UTC (rev 5116)
@@ -1,207 +0,0 @@
-# From Python 2.4.4
-"""
-Tests common to tuple, list and UserList.UserList
-"""
-
-import unittest
-from test import test_support
-
-class CommonTest(unittest.TestCase):
- # The type to be tested
- type2test = None
-
- def test_constructors(self):
- l0 = []
- l1 = [0]
- l2 = [0, 1]
-
- u = self.type2test()
- u0 = self.type2test(l0)
- u1 = self.type2test(l1)
- u2 = self.type2test(l2)
-
- uu = self.type2test(u)
- uu0 = self.type2test(u0)
- uu1 = self.type2test(u1)
- uu2 = self.type2test(u2)
-
- v = self.type2test(tuple(u))
- class OtherSeq:
- def __init__(self, initseq):
- self.__data = initseq
- def __len__(self):
- return len(self.__data)
- def __getitem__(self, i):
- return self.__data[i]
- s = OtherSeq(u0)
- v0 = self.type2test(s)
- self.assertEqual(len(v0), len(s))
-
- s = "this is also a sequence"
- vv = self.type2test(s)
- self.assertEqual(len(vv), len(s))
-
- def test_truth(self):
- self.assert_(not self.type2test())
- self.assert_(self.type2test([42]))
-
- def test_getitem(self):
- u = self.type2test([0, 1, 2, 3, 4])
- for i in xrange(len(u)):
- self.assertEqual(u[i], i)
- self.assertEqual(u[long(i)], i)
- for i in xrange(-len(u), -1):
- self.assertEqual(u[i], len(u)+i)
- self.assertEqual(u[long(i)], len(u)+i)
- self.assertRaises(IndexError, u.__getitem__, -len(u)-1)
- self.assertRaises(IndexError, u.__getitem__, len(u))
- self.assertRaises(ValueError, u.__getitem__, slice(0,10,0))
-
- u = self.type2test()
- self.assertRaises(IndexError, u.__getitem__, 0)
- self.assertRaises(IndexError, u.__getitem__, -1)
-
- self.assertRaises(TypeError, u.__getitem__)
-
- a = self.type2test([10, 11])
- self.assertEqual(a[0], 10)
- self.assertEqual(a[1], 11)
- self.assertEqual(a[-2], 10)
- self.assertEqual(a[-1], 11)
- self.assertRaises(IndexError, a.__getitem__, -3)
- self.assertRaises(IndexError, a.__getitem__, 3)
-
- def test_getslice(self):
- l = [0, 1, 2, 3, 4]
- u = self.type2test(l)
-
- self.assertEqual(u[0:0], self.type2test())
- self.assertEqual(u[1:2], self.type2test([1]))
- self.assertEqual(u[-2:-1], self.type2test([3]))
- self.assertEqual(u[-1000:1000], u)
- self.assertEqual(u[1000:-1000], self.type2test([]))
- self.assertEqual(u[:], u)
- self.assertEqual(u[1:None], self.type2test([1, 2, 3, 4]))
- self.assertEqual(u[None:3], self.type2test([0, 1, 2]))
-
- # Extended slices
- self.assertEqual(u[::], u)
- self.assertEqual(u[::2], self.type2test([0, 2, 4]))
- self.assertEqual(u[1::2], self.type2test([1, 3]))
- self.assertEqual(u[::-1], self.type2test([4, 3, 2, 1, 0]))
- self.assertEqual(u[::-2], self.type2test([4, 2, 0]))
- self.assertEqual(u[3::-2], self.type2test([3, 1]))
- self.assertEqual(u[3:3:-2], self.type2test([]))
- self.assertEqual(u[3:2:-2], self.type2test([3]))
- self.assertEqual(u[3:1:-2], self.type2test([3]))
- self.assertEqual(u[3:0:-2], self.type2test([3, 1]))
- self.assertEqual(u[::-100], self.type2test([4]))
- self.assertEqual(u[100:-100:], self.type2test([]))
- self.assertEqual(u[-100:100:], u)
- self.assertEqual(u[100:-100:-1], u[::-1])
- self.assertEqual(u[-100:100:-1], self.type2test([]))
- self.assertEqual(u[-100L:100L:2L], self.type2test([0, 2, 4]))
-
- # Test extreme cases with long ints
- a = self.type2test([0,1,2,3,4])
- self.assertEqual(a[ -pow(2,128L): 3 ], self.type2test([0,1,2]))
- self.assertEqual(a[ 3: pow(2,145L) ], self.type2test([3,4]))
-
- self.assertRaises(TypeError, u.__getslice__)
-
- def test_contains(self):
- u = self.type2test([0, 1, 2])
- for i in u:
- self.assert_(i in u)
- for i in min(u)-1, max(u)+1:
- self.assert_(i not in u)
-
- self.assertRaises(TypeError, u.__contains__)
-
- def test_len(self):
- self.assertEqual(len(self.type2test()), 0)
- self.assertEqual(len(self.type2test([])), 0)
- self.assertEqual(len(self.type2test([0])), 1)
- self.assertEqual(len(self.type2test([0, 1, 2])), 3)
-
- def test_minmax(self):
- u = self.type2test([0, 1, 2])
- self.assertEqual(min(u), 0)
- self.assertEqual(max(u), 2)
-
- def test_addmul(self):
- u1 = self.type2test([0])
- u2 = self.type2test([0, 1])
- self.assertEqual(u1, u1 + self.type2test())
- self.assertEqual(u1, self.type2test() + u1)
- self.assertEqual(u1 + self.type2test([1]), u2)
- self.assertEqual(self.type2test([-1]) + u1, self.type2test([-1, 0]))
- self.assertEqual(self.type2test(), u2*0)
- self.assertEqual(self.type2test(), 0*u2)
- self.assertEqual(self.type2test(), u2*0L)
- self.assertEqual(self.type2test(), 0L*u2)
- self.assertEqual(u2, u2*1)
- self.assertEqual(u2, 1*u2)
- self.assertEqual(u2, u2*1L)
- self.assertEqual(u2, 1L*u2)
- self.assertEqual(u2+u2, u2*2)
- self.assertEqual(u2+u2, 2*u2)
- self.assertEqual(u2+u2, u2*2L)
- self.assertEqual(u2+u2, 2L*u2)
- self.assertEqual(u2+u2+u2, u2*3)
- self.assertEqual(u2+u2+u2, 3*u2)
-
- class subclass(self.type2test):
- pass
- u3 = subclass([0, 1])
- self.assertEqual(u3, u3*1)
- self.assert_(u3 is not u3*1)
-
- def test_iadd(self):
- u = self.type2test([0, 1])
- u += self.type2test()
- self.assertEqual(u, self.type2test([0, 1]))
- u += self.type2test([2, 3])
- self.assertEqual(u, self.type2test([0, 1, 2, 3]))
- u += self.type2test([4, 5])
- self.assertEqual(u, self.type2test([0, 1, 2, 3, 4, 5]))
-
- u = self.type2test("spam")
- u += self.type2test("eggs")
- self.assertEqual(u, self.type2test("spameggs"))
-
- def test_imul(self):
- u = self.type2test([0, 1])
- u *= 3
- self.assertEqual(u, self.type2test([0, 1, 0, 1, 0, 1]))
-
- def test_getitemoverwriteiter(self):
- # Verify that __getitem__ overrides are not recognized by __iter__
- class T(self.type2test):
- def __getitem__(self, key):
- return str(key) + '!!!'
- self.assertEqual(iter(T((1,2))).next(), 1)
-
- def test_repeat(self):
- for m in xrange(4):
- s = tuple(range(m))
- for n in xrange(-3, 5):
- self.assertEqual(self.type2test(s*n), self.type2test(s)*n)
- self.assertEqual(self.type2test(s)*(-4), self.type2test([]))
- self.assertEqual(id(s), id(s*1))
-
- def test_subscript(self):
- a = self.type2test([10, 11])
- self.assertEqual(a.__getitem__(0L), 10)
- self.assertEqual(a.__getitem__(1L), 11)
- self.assertEqual(a.__getitem__(-2L), 10)
- self.assertEqual(a.__getitem__(-1L), 11)
- self.assertRaises(IndexError, a.__getitem__, -3)
- self.assertRaises(IndexError, a.__getitem__, 3)
- self.assertEqual(a.__getitem__(slice(0,1)), self.type2test([10]))
- self.assertEqual(a.__getitem__(slice(1,2)), self.type2test([11]))
- self.assertEqual(a.__getitem__(slice(0,2)), self.type2test([10, 11]))
- self.assertEqual(a.__getitem__(slice(0,3)), self.type2test([10, 11]))
- self.assertEqual(a.__getitem__(slice(3,5)), self.type2test([]))
- self.assertRaises(ValueError, a.__getitem__, slice(0, 10, 0))
- self.assertRaises(TypeError, a.__getitem__, 'x')
Modified: branches/asm/src/org/python/core/PyList.java
===================================================================
--- branches/asm/src/org/python/core/PyList.java 2008-08-09 06:12:17 UTC (rev 5115)
+++ branches/asm/src/org/python/core/PyList.java 2008-08-09 06:17:43 UTC (rev 5116)
@@ -153,20 +153,17 @@
if(step == 1) {
PyObject[] otherArray;
PyObject[] array = getArray();
- if(value instanceof PySequenceList) {
- PySequenceList seqList = (PySequenceList) value;
- otherArray = seqList.getArray();
- if(otherArray == array) {
- otherArray = otherArray.clone();
- }
- list.replaceSubArray(start, stop, otherArray, 0, seqList.size());
+
+ int n = value.__len__();
+ if (value instanceof PySequenceList) {
+ otherArray = ((PySequenceList)value).getArray();
} else {
- int n = value.__len__();
- list.ensureCapacity(start + n);
- for(int i = 0; i < n; i++) {
- list.add(i + start, value.pyget(i));
- }
+ otherArray = Py.unpackSequence(value, value.__len__());
}
+ if (otherArray == array) {
+ otherArray = otherArray.clone();
+ }
+ list.replaceSubArray(start, stop, otherArray, 0, n);
} else if(step > 1) {
int n = value.__len__();
for(int i = 0, j = 0; i < n; i++, j += step) {
@@ -213,15 +210,21 @@
}
protected PyObject repeat(int count) {
- if(count < 0) {
+ if (count < 0) {
count = 0;
}
- int l = size();
- PyObject[] newList = new PyObject[l * count];
+ int size = size();
+ int newSize = size * count;
+ if (count != 0 && newSize / count != size) {
+ throw Py.MemoryError("");
+ }
+
+ PyObject[] array = getArray();
+ PyObject[] newArray = new PyObject[newSize];
for(int i = 0; i < count; i++) {
- System.arraycopy(getArray(), 0, newList, i * l, l);
+ System.arraycopy(array, 0, newArray, i * size, size);
}
- return new PyList(newList);
+ return new PyList(newArray);
}
@ExposedMethod(type = MethodType.BINARY)
@@ -264,16 +267,29 @@
return null;
}
int count = o.asIndex(Py.OverflowError);
- int l = size();
-
- int newSize = l * count;
+
+ int size = size();
+ if (size == 0 || count == 1) {
+ return this;
+ }
+
+ if (count < 1) {
+ clear();
+ return this;
+ }
+
+ if (size > Integer.MAX_VALUE / count) {
+ throw Py.MemoryError("");
+ }
+
+ int newSize = size * count;
list.setSize(newSize);
PyObject[] array = getArray();
for (int i = 1; i < count; i++) {
- System.arraycopy(array, 0, array, i * l, l);
+ System.arraycopy(array, 0, array, i * size, size);
}
gListAllocatedStatus = __len__();
- return this;
+ return this;
}
@Override
@@ -486,24 +502,24 @@
}
public int index(PyObject o, int start) {
- return list_index(o, start, null);
+ return list_index(o, start, size());
}
public int index(PyObject o, int start, int stop) {
- return list_index(o, start, Py.newInteger(stop));
+ return list_index(o, start, stop);
}
- @ExposedMethod(defaults = {"0", "null"})
- final int list_index(PyObject o, int start, PyObject stop) {
- int iStop;
- if(stop == null) {
- iStop = size();
- } else {
- iStop = stop.asInt();
- }
- return _index(o, "list.index(x): x not in list", start, iStop);
+ @ExposedMethod(defaults = {"null", "null"})
+ final int list_index(PyObject o, PyObject start, PyObject stop) {
+ int startInt = start == null ? 0 : PySlice.calculateSliceIndex(start);
+ int stopInt = stop == null ? size() : PySlice.calculateSliceIndex(stop);
+ return list_index(o, startInt, stopInt);
}
+ final int list_index(PyObject o, int start, int stop) {
+ return _index(o, "list.index(x): x not in list", start, stop);
+ }
+
final int list_index(PyObject o, int start) {
return _index(o, "list.index(x): x not in list", start, size());
}
Modified: branches/asm/src/org/python/core/PyTuple.java
===================================================================
--- branches/asm/src/org/python/core/PyTuple.java 2008-08-09 06:12:17 UTC (rev 5115)
+++ branches/asm/src/org/python/core/PyTuple.java 2008-08-09 06:17:43 UTC (rev 5116)
@@ -92,20 +92,26 @@
if (count < 0) {
count = 0;
}
- if (size() == 0 || count == 1) {
+ int size = size();
+ if (size == 0 || count == 1) {
if (getType() == TYPE) {
// Since tuples are immutable, we can return a shared copy in this case
return this;
}
- if (size() == 0) {
+ if (size == 0) {
return new PyTuple();
}
}
+
+ int newSize = size * count;
+ if (newSize / size != count) {
+ throw Py.MemoryError("");
+ }
+
PyObject[] array = getArray();
- int l = size();
- PyObject[] newArray = new PyObject[l*count];
- for (int i=0; i<count; i++) {
- System.arraycopy(array, 0, newArray, i*l, l);
+ PyObject[] newArray = new PyObject[newSize];
+ for (int i = 0; i < count; i++) {
+ System.arraycopy(array, 0, newArray, i * size, size);
}
return new PyTuple(newArray);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fwi...@us...> - 2008-08-09 17:07:23
|
Revision: 5123
http://jython.svn.sourceforge.net/jython/?rev=5123&view=rev
Author: fwierzbicki
Date: 2008-08-09 17:07:19 +0000 (Sat, 09 Aug 2008)
Log Message:
-----------
Don't allow generator expressions on left side of assignment.
Modified Paths:
--------------
branches/asm/grammar/PythonWalker.g
branches/asm/src/org/python/antlr/GrammarActions.java
Modified: branches/asm/grammar/PythonWalker.g
===================================================================
--- branches/asm/grammar/PythonWalker.g 2008-08-09 16:27:42 UTC (rev 5122)
+++ branches/asm/grammar/PythonWalker.g 2008-08-09 17:07:19 UTC (rev 5123)
@@ -328,6 +328,7 @@
$stmts::statements.add(new Expr($test.marker, $test.etype));
}
| ^(augassign targ=test[expr_contextType.AugStore] value=test[expr_contextType.Load]) {
+ actions.checkAssign($targ.etype);
AugAssign a = new AugAssign($targ.marker, $targ.etype, $augassign.op, $value.etype);
$stmts::statements.add(a);
}
Modified: branches/asm/src/org/python/antlr/GrammarActions.java
===================================================================
--- branches/asm/src/org/python/antlr/GrammarActions.java 2008-08-09 16:27:42 UTC (rev 5122)
+++ branches/asm/src/org/python/antlr/GrammarActions.java 2008-08-09 17:07:19 UTC (rev 5123)
@@ -456,6 +456,8 @@
void checkAssign(exprType e) {
if (e instanceof Name && ((Name)e).id.equals("None")) {
throw new ParseException("assignment to None", e);
+ } else if (e instanceof GeneratorExp) {
+ throw new ParseException("can't assign to generator expression", e);
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fwi...@us...> - 2008-08-11 00:32:27
|
Revision: 5140
http://jython.svn.sourceforge.net/jython/?rev=5140&view=rev
Author: fwierzbicki
Date: 2008-08-11 00:32:24 +0000 (Mon, 11 Aug 2008)
Log Message:
-----------
Can't assign to Num and better placement for checkAssign, so
lambdef and fplist also get checks for args.
Modified Paths:
--------------
branches/asm/grammar/PythonWalker.g
branches/asm/src/org/python/antlr/GrammarActions.java
Modified: branches/asm/grammar/PythonWalker.g
===================================================================
--- branches/asm/grammar/PythonWalker.g 2008-08-10 23:14:13 UTC (rev 5139)
+++ branches/asm/grammar/PythonWalker.g 2008-08-11 00:32:24 UTC (rev 5140)
@@ -171,7 +171,6 @@
defparameter[List params, List defaults]
: fpdef[expr_contextType.Param, null] (ASSIGN test[expr_contextType.Load])? {
- actions.checkAssign($fpdef.etype);
params.add($fpdef.etype);
if ($ASSIGN != null) {
defaults.add($test.etype);
@@ -186,6 +185,7 @@
fpdef [expr_contextType ctype, List nms] returns [exprType etype]
: NAME {
exprType e = new Name($NAME, $NAME.text, ctype);
+ actions.checkAssign(e);
if (nms == null) {
$etype = e;
} else {
Modified: branches/asm/src/org/python/antlr/GrammarActions.java
===================================================================
--- branches/asm/src/org/python/antlr/GrammarActions.java 2008-08-10 23:14:13 UTC (rev 5139)
+++ branches/asm/src/org/python/antlr/GrammarActions.java 2008-08-11 00:32:24 UTC (rev 5140)
@@ -458,6 +458,8 @@
throw new ParseException("assignment to None", e);
} else if (e instanceof GeneratorExp) {
throw new ParseException("can't assign to generator expression", e);
+ } else if (e instanceof Num) {
+ throw new ParseException("can't assign to number", e);
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zy...@us...> - 2008-08-11 05:52:46
|
Revision: 5146
http://jython.svn.sourceforge.net/jython/?rev=5146&view=rev
Author: zyasoft
Date: 2008-08-11 05:52:43 +0000 (Mon, 11 Aug 2008)
Log Message:
-----------
Another corner case for generators: .throw on a just-started generator
should immediately raise an exception in the current context. Also
fixed buggy tests in test_generators.
Modified Paths:
--------------
branches/asm/Lib/test/test_generators.py
branches/asm/Lib/test/test_genexps.py
branches/asm/src/org/python/core/PyGenerator.java
Modified: branches/asm/Lib/test/test_generators.py
===================================================================
--- branches/asm/Lib/test/test_generators.py 2008-08-11 05:37:15 UTC (rev 5145)
+++ branches/asm/Lib/test/test_generators.py 2008-08-11 05:52:43 UTC (rev 5146)
@@ -728,14 +728,14 @@
syntax_tests = """
->>> def f():
+>>> def f(): #doctest: +IGNORE_EXCEPTION_DETAIL, +NORMALIZE_WHITESPACE
... return 22
... yield 1
Traceback (most recent call last):
..
SyntaxError: 'return' with argument inside generator (<doctest test.test_generators.__test__.syntax[0]>, line 3)
->>> def f():
+>>> def f(): #doctest: +IGNORE_EXCEPTION_DETAIL, +NORMALIZE_WHITESPACE
... yield 1
... return 22
Traceback (most recent call last):
@@ -744,7 +744,7 @@
"return None" is not the same as "return" in a generator:
->>> def f():
+>>> def f(): #doctest: +IGNORE_EXCEPTION_DETAIL, +NORMALIZE_WHITESPACE
... yield 1
... return None
Traceback (most recent call last):
@@ -1522,17 +1522,17 @@
Check some syntax errors for yield expressions:
->>> f=lambda: (yield 1),(yield 2)
+>>> f=lambda: (yield 1),(yield 2) #doctest: +IGNORE_EXCEPTION_DETAIL, +NORMALIZE_WHITESPACE
Traceback (most recent call last):
...
SyntaxError: 'yield' outside function (<doctest test.test_generators.__test__.coroutine[21]>, line 1)
->>> def f(): return lambda x=(yield): 1
+>>> def f(): return lambda x=(yield): 1 #doctest: +IGNORE_EXCEPTION_DETAIL, +NORMALIZE_WHITESPACE
Traceback (most recent call last):
...
SyntaxError: 'return' with argument inside generator (<doctest test.test_generators.__test__.coroutine[22]>, line 1)
->>> def f(): x = yield = y
+>>> def f(): x = yield = y #doctest: +IGNORE_EXCEPTION_DETAIL, +NORMALIZE_WHITESPACE
Traceback (most recent call last):
...
SyntaxError: assignment to yield expression not possible (<doctest test.test_generators.__test__.coroutine[23]>, line 1)
@@ -1580,7 +1580,7 @@
...
TypeError: instance exception may not have a separate value
->>> g.throw(ValueError, "foo", 23) # bad args
+>>> g.throw(ValueError, "foo", 23) # bad args #doctest: +IGNORE_EXCEPTION_DETAIL
Traceback (most recent call last):
...
TypeError: throw() third argument must be a traceback object
@@ -1645,8 +1645,9 @@
>>> g.next()
>>> g.close() # close normally
-And finalization:
-
+And finalization. But we have to force the timing of GC here, since we are running on Jython:
+>>> import gc
+>>> from time import sleep
>>> def f():
... try: yield
... finally:
@@ -1654,7 +1655,7 @@
>>> g = f()
>>> g.next()
->>> del g
+>>> del g; gc.collect(); sleep(1); gc.collect()
exiting
@@ -1679,9 +1680,9 @@
>>> old, sys.stderr = sys.stderr, StringIO.StringIO()
>>> g = f()
>>> g.next()
->>> del g
+>>> del g; gc.collect(); sleep(1); gc.collect()
>>> sys.stderr.getvalue().startswith(
-... "Exception exceptions.RuntimeError: 'generator ignored GeneratorExit' in "
+... "Exception RuntimeError"
... )
True
>>> sys.stderr = old
@@ -1787,6 +1788,8 @@
to test.
>>> import sys, StringIO
+>>> from time import sleep
+>>> import gc
>>> old = sys.stderr
>>> try:
... sys.stderr = StringIO.StringIO()
@@ -1795,10 +1798,10 @@
... raise RuntimeError
...
... l = Leaker()
-... del l
+... del l; gc.collect(); sleep(1); gc.collect()
... err = sys.stderr.getvalue().strip()
... err.startswith(
-... "Exception exceptions.RuntimeError: RuntimeError() in <"
+... "Exception RuntimeError in <"
... )
... err.endswith("> ignored")
... len(err.splitlines())
Modified: branches/asm/Lib/test/test_genexps.py
===================================================================
--- branches/asm/Lib/test/test_genexps.py 2008-08-11 05:37:15 UTC (rev 5145)
+++ branches/asm/Lib/test/test_genexps.py 2008-08-11 05:52:43 UTC (rev 5146)
@@ -133,13 +133,13 @@
>>> list(g)
[(0, 0), (0, 1), (0, 2), (0, 3), (1, 0), (1, 1), (1, 2), (1, 3), (2, 0), (2, 1), (2, 2), (2, 3)]
-This doesn't make sense for Jython or other non refcounted implementations
-# Verify re-use of tuples (a side benefit of using genexps over listcomps)
-#
-# >>> tupleids = map(id, ((i,i) for i in xrange(10)))
-# >>> int(max(tupleids) - min(tupleids))
-# 0
+This doesn't make sense for Jython or other non refcounted implementations, so +SKIP
+Verify re-use of tuples (a side benefit of using genexps over listcomps)
+ >>> tupleids = map(id, ((i,i) for i in xrange(10)))
+ >>> int(max(tupleids) - min(tupleids)) #doctest: +SKIP
+ 0
+
Verify that syntax error's are raised for genexps used as lvalues
>>> (y for y in (1,2)) = 10 #doctest: +IGNORE_EXCEPTION_DETAIL
Modified: branches/asm/src/org/python/core/PyGenerator.java
===================================================================
--- branches/asm/src/org/python/core/PyGenerator.java 2008-08-11 05:37:15 UTC (rev 5145)
+++ branches/asm/src/org/python/core/PyGenerator.java 2008-08-11 05:52:43 UTC (rev 5146)
@@ -46,8 +46,9 @@
}
private PyObject raiseException(PyException ex) {
- if (gi_frame == null)
- return null;
+ if (gi_frame == null || gi_frame.f_lasti == 0) {
+ throw ex;
+ }
gi_frame.setGeneratorInput(ex);
return next();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fwi...@us...> - 2008-08-11 18:31:54
|
Revision: 5151
http://jython.svn.sourceforge.net/jython/?rev=5151&view=rev
Author: fwierzbicki
Date: 2008-08-11 18:31:41 +0000 (Mon, 11 Aug 2008)
Log Message:
-----------
remove LeadingSpaceSkippingStream and replace with LEADING_WS in Python.g.
No idea what I was thinking with LeadingSpaceSkippingStream...
Modified Paths:
--------------
branches/asm/grammar/Python.g
branches/asm/src/org/python/core/ParserFacade.java
Removed Paths:
-------------
branches/asm/src/org/python/antlr/LeadingSpaceSkippingStream.java
Modified: branches/asm/grammar/Python.g
===================================================================
--- branches/asm/grammar/Python.g 2008-08-11 16:43:44 UTC (rev 5150)
+++ branches/asm/grammar/Python.g 2008-08-11 18:31:41 UTC (rev 5151)
@@ -298,7 +298,7 @@
;
//eval_input: testlist NEWLINE* ENDMARKER
-eval_input : (NEWLINE)* testlist[expr_contextType.Load] (NEWLINE)* -> ^(Expression testlist)
+eval_input : LEADING_WS? (NEWLINE)* testlist[expr_contextType.Load] (NEWLINE)* -> ^(Expression testlist)
;
//not in CPython's Grammar file
Deleted: branches/asm/src/org/python/antlr/LeadingSpaceSkippingStream.java
===================================================================
--- branches/asm/src/org/python/antlr/LeadingSpaceSkippingStream.java 2008-08-11 16:43:44 UTC (rev 5150)
+++ branches/asm/src/org/python/antlr/LeadingSpaceSkippingStream.java 2008-08-11 18:31:41 UTC (rev 5151)
@@ -1,39 +0,0 @@
-package org.python.antlr;
-
-import java.io.InputStream;
-import java.io.IOException;
-
-public class LeadingSpaceSkippingStream extends InputStream {
-
- private InputStream inputStream;
- private boolean maybeLeadingSpaces = true;
-
- public LeadingSpaceSkippingStream(InputStream is) {
- inputStream = is;
- }
-
- public int read() throws IOException {
- int i = inputStream.read();
- while (maybeLeadingSpaces) {
- if (i != ' ') {
- maybeLeadingSpaces = false;
- } else {
- i = inputStream.read();
- }
- }
- return i;
- }
-
- public boolean markSupported() {
- return inputStream.markSupported();
- }
-
- public void mark(int readAheadLimit) {
- inputStream.mark(readAheadLimit);
- }
-
- public void reset() throws IOException {
- maybeLeadingSpaces = true;
- inputStream.reset();
- }
-}
Modified: branches/asm/src/org/python/core/ParserFacade.java
===================================================================
--- branches/asm/src/org/python/core/ParserFacade.java 2008-08-11 16:43:44 UTC (rev 5150)
+++ branches/asm/src/org/python/core/ParserFacade.java 2008-08-11 18:31:41 UTC (rev 5151)
@@ -18,7 +18,6 @@
import org.python.antlr.ExpressionParser;
import org.python.antlr.InteractiveParser;
-import org.python.antlr.LeadingSpaceSkippingStream;
import org.python.antlr.ParseException;
import org.python.antlr.ModuleParser;
import org.python.antlr.NoCloseReaderStream;
@@ -103,7 +102,7 @@
modType node = null;
try {
if (kind.equals("eval")) {
- bufreader = prepBufreader(new LeadingSpaceSkippingStream(bstream), cflags, filename);
+ bufreader = prepBufreader(bstream, cflags, filename);
CharStream cs = new NoCloseReaderStream(bufreader);
ExpressionParser e = new ExpressionParser(cs, filename);
node = e.parse();
@@ -117,7 +116,7 @@
ModuleParser g = new ModuleParser(cs, filename);
node = g.file_input();
} else {
- throw Py.ValueError("parse kind must be eval, exec, " + "or single");
+ throw Py.ValueError("parse kind must be eval, exec, or single");
}
} catch (Throwable t) {
throw fixParseError(bufreader, t, filename);
@@ -150,12 +149,12 @@
InteractiveParser i = new InteractiveParser(bufreader, filename);
node = i.parse();
} else if (kind.equals("eval")) {
- bufreader = prepBufreader(new LeadingSpaceSkippingStream(bstream), cflags, filename);
+ bufreader = prepBufreader(bstream, cflags, filename);
CharStream cs = new NoCloseReaderStream(bufreader);
ExpressionParser e = new ExpressionParser(cs, filename);
node = e.parse();
} else {
- throw Py.ValueError("parse kind must be eval, exec, " + "or single");
+ throw Py.ValueError("parse kind must be eval, exec, or single");
}
} catch (Throwable t) {
PyException p = fixParseError(bufreader, t, filename);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fwi...@us...> - 2008-08-11 19:25:58
|
Revision: 5152
http://jython.svn.sourceforge.net/jython/?rev=5152&view=rev
Author: fwierzbicki
Date: 2008-08-11 19:25:46 +0000 (Mon, 11 Aug 2008)
Log Message:
-----------
Tightened up eval and uncommented tests in test_jy_compile.
Modified Paths:
--------------
branches/asm/Lib/test/test_jy_compile.py
branches/asm/grammar/Python.g
branches/asm/grammar/PythonPartial.g
Modified: branches/asm/Lib/test/test_jy_compile.py
===================================================================
--- branches/asm/Lib/test/test_jy_compile.py 2008-08-11 18:31:41 UTC (rev 5151)
+++ branches/asm/Lib/test/test_jy_compile.py 2008-08-11 19:25:46 UTC (rev 5152)
@@ -148,13 +148,10 @@
ai("a = 'a\\ ")
ai("a = 'a\\\n")
- #XXX: eval is hopelessly permissive right now -- but the rest of this
- # test_jy_compile is really important to me for flagging new bugs -
- # so commenting out some of these for now.
- ###ai("a = 1","eval")
- ###ai("a = (","eval")
+ ai("a = 1","eval")
+ ai("a = (","eval")
ai("]","eval")
- ###ai("())","eval")
+ ai("())","eval")
ai("[}","eval")
ai("9+","eval")
ai("lambda z:","eval")
Modified: branches/asm/grammar/Python.g
===================================================================
--- branches/asm/grammar/Python.g 2008-08-11 18:31:41 UTC (rev 5151)
+++ branches/asm/grammar/Python.g 2008-08-11 19:25:46 UTC (rev 5152)
@@ -298,7 +298,7 @@
;
//eval_input: testlist NEWLINE* ENDMARKER
-eval_input : LEADING_WS? (NEWLINE)* testlist[expr_contextType.Load] (NEWLINE)* -> ^(Expression testlist)
+eval_input : LEADING_WS? (NEWLINE)* testlist[expr_contextType.Load] (NEWLINE)* EOF -> ^(Expression testlist)
;
//not in CPython's Grammar file
Modified: branches/asm/grammar/PythonPartial.g
===================================================================
--- branches/asm/grammar/PythonPartial.g 2008-08-11 18:31:41 UTC (rev 5151)
+++ branches/asm/grammar/PythonPartial.g 2008-08-11 19:25:46 UTC (rev 5152)
@@ -193,7 +193,7 @@
;
//eval_input: testlist NEWLINE* ENDMARKER
-eval_input : (NEWLINE)* testlist? (NEWLINE)*
+eval_input : LEADING_WS? (NEWLINE)* testlist? (NEWLINE)* ENDMARKER
;
decorators: decorator+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <le...@us...> - 2008-08-11 23:27:44
|
Revision: 5155
http://jython.svn.sourceforge.net/jython/?rev=5155&view=rev
Author: leosoto
Date: 2008-08-11 23:27:27 +0000 (Mon, 11 Aug 2008)
Log Message:
-----------
__findattr__ refactor. The overridable version is not called __findattr_ex__ (in the abscense of a better name), and can return null or raise AttributeError, whatever is more efficient for the implementing code. This makes *Derived getattr() more correct and fixes #1041 and #1095.
Modified Paths:
--------------
branches/asm/Lib/test/test_descr_jy.py
branches/asm/src/com/ziclix/python/sql/PyConnection.java
branches/asm/src/com/ziclix/python/sql/PyCursor.java
branches/asm/src/com/ziclix/python/sql/PyExtendedCursor.java
branches/asm/src/com/ziclix/python/sql/PyStatement.java
branches/asm/src/com/ziclix/python/sql/connect/Connect.java
branches/asm/src/com/ziclix/python/sql/connect/Connectx.java
branches/asm/src/com/ziclix/python/sql/connect/Lookup.java
branches/asm/src/com/ziclix/python/sql/util/BCP.java
branches/asm/src/org/python/core/PyArrayDerived.java
branches/asm/src/org/python/core/PyBaseException.java
branches/asm/src/org/python/core/PyBaseExceptionDerived.java
branches/asm/src/org/python/core/PyBooleanDerived.java
branches/asm/src/org/python/core/PyClass.java
branches/asm/src/org/python/core/PyClassMethodDerived.java
branches/asm/src/org/python/core/PyComplexDerived.java
branches/asm/src/org/python/core/PyDictionaryDerived.java
branches/asm/src/org/python/core/PyEnumerateDerived.java
branches/asm/src/org/python/core/PyFileDerived.java
branches/asm/src/org/python/core/PyFloatDerived.java
branches/asm/src/org/python/core/PyFrame.java
branches/asm/src/org/python/core/PyFrozenSetDerived.java
branches/asm/src/org/python/core/PyInstance.java
branches/asm/src/org/python/core/PyIntegerDerived.java
branches/asm/src/org/python/core/PyJavaClass.java
branches/asm/src/org/python/core/PyJavaPackage.java
branches/asm/src/org/python/core/PyListDerived.java
branches/asm/src/org/python/core/PyLongDerived.java
branches/asm/src/org/python/core/PyMethod.java
branches/asm/src/org/python/core/PyModule.java
branches/asm/src/org/python/core/PyModuleDerived.java
branches/asm/src/org/python/core/PyObject.java
branches/asm/src/org/python/core/PyObjectDerived.java
branches/asm/src/org/python/core/PyPropertyDerived.java
branches/asm/src/org/python/core/PySetDerived.java
branches/asm/src/org/python/core/PySliceDerived.java
branches/asm/src/org/python/core/PyStringDerived.java
branches/asm/src/org/python/core/PySuper.java
branches/asm/src/org/python/core/PySuperDerived.java
branches/asm/src/org/python/core/PySystemState.java
branches/asm/src/org/python/core/PyTableCode.java
branches/asm/src/org/python/core/PyTupleDerived.java
branches/asm/src/org/python/core/PyType.java
branches/asm/src/org/python/core/PyTypeDerived.java
branches/asm/src/org/python/core/PyUnicodeDerived.java
branches/asm/src/org/python/modules/_csv/PyDialectDerived.java
branches/asm/src/org/python/modules/_functools/PyPartialDerived.java
branches/asm/src/org/python/modules/_weakref/ProxyType.java
branches/asm/src/org/python/modules/_weakref/ReferenceTypeDerived.java
branches/asm/src/org/python/modules/collections/PyDefaultDictDerived.java
branches/asm/src/org/python/modules/collections/PyDequeDerived.java
branches/asm/src/org/python/modules/random/PyRandomDerived.java
branches/asm/src/org/python/modules/sre/MatchObject.java
branches/asm/src/org/python/modules/thread/PyLocalDerived.java
branches/asm/src/org/python/modules/zipimport/zipimporterDerived.java
branches/asm/src/templates/object.derived
Modified: branches/asm/Lib/test/test_descr_jy.py
===================================================================
--- branches/asm/Lib/test/test_descr_jy.py 2008-08-11 22:24:20 UTC (rev 5154)
+++ branches/asm/Lib/test/test_descr_jy.py 2008-08-11 23:27:27 UTC (rev 5155)
@@ -73,6 +73,29 @@
else:
self.assert_(False, "should have raised TypeError")
+ def test_raising_custom_attribute_error(self):
+ class RaisesCustomMsg(object):
+ def __get__(self, instance, type):
+ raise AttributeError("Custom message")
+
+
+ class CustomAttributeError(AttributeError): pass
+
+ class RaisesCustomErr(object):
+ def __get__(self, instance, type):
+ raise CustomAttributeError
+
+ class Foo(object):
+ custom_msg = RaisesCustomMsg()
+ custom_err = RaisesCustomErr()
+
+ self.assertRaises(CustomAttributeError, lambda: Foo().custom_err)
+ try:
+ Foo().custom_msg
+ self.assert_(False) # Previous line should raise AttributteError
+ except AttributeError, e:
+ self.assertEquals("Custom message", str(e))
+
class SubclassDescrTestCase(unittest.TestCase):
def test_subclass_cmp_right_op(self):
@@ -144,7 +167,7 @@
# Test strs, unicode, lists and tuples
mapping = []
-
+
# + binop
mapping.append((lambda o: 'foo' + o,
TypeError, "cannot concatenate 'str' and 'B' objects",
@@ -293,12 +316,32 @@
self.assertRaises(AttributeError, func, old)
self.assertRaises(TypeError, func, new)
+class GetAttrTestCase(unittest.TestCase):
+ def test_raising_custom_attribute_error(self):
+ # Very similar to
+ # test_descr_jy.TestDescrTestCase.test_raising_custom_attribute_error
+ class BarAttributeError(AttributeError): pass
+ class Bar(object):
+ def __getattr__(self, name):
+ raise BarAttributeError
+
+ class Foo(object):
+ def __getattr__(self, name):
+ raise AttributeError("Custom message")
+ self.assertRaises(BarAttributeError, lambda: Bar().x)
+ try:
+ Foo().x
+ self.assert_(False) # Previous line should raise AttributteError
+ except AttributeError, e:
+ self.assertEquals("Custom message", str(e))
+
def test_main():
test_support.run_unittest(TestDescrTestCase,
SubclassDescrTestCase,
InPlaceTestCase,
- DescrExceptionsTestCase)
+ DescrExceptionsTestCase,
+ GetAttrTestCase)
if __name__ == '__main__':
test_main()
Modified: branches/asm/src/com/ziclix/python/sql/PyConnection.java
===================================================================
--- branches/asm/src/com/ziclix/python/sql/PyConnection.java 2008-08-11 22:24:20 UTC (rev 5154)
+++ branches/asm/src/com/ziclix/python/sql/PyConnection.java 2008-08-11 23:27:27 UTC (rev 5155)
@@ -178,7 +178,7 @@
* @param name the name of the attribute of interest
* @return the value for the attribute of the specified name
*/
- public PyObject __findattr__(String name) {
+ public PyObject __findattr_ex__(String name) {
if ("autocommit".equals(name)) {
try {
@@ -230,7 +230,7 @@
return Py.newBoolean(closed);
}
- return super.__findattr__(name);
+ return super.__findattr_ex__(name);
}
/**
Modified: branches/asm/src/com/ziclix/python/sql/PyCursor.java
===================================================================
--- branches/asm/src/com/ziclix/python/sql/PyCursor.java 2008-08-11 22:24:20 UTC (rev 5154)
+++ branches/asm/src/com/ziclix/python/sql/PyCursor.java 2008-08-11 23:27:27 UTC (rev 5155)
@@ -196,7 +196,7 @@
* @param name
* @return the attribute for the given name
*/
- public PyObject __findattr__(String name) {
+ public PyObject __findattr_ex__(String name) {
if ("arraysize".equals(name)) {
return Py.newInteger(arraysize);
@@ -236,7 +236,7 @@
} catch (Throwable t) {}
}
- return super.__findattr__(name);
+ return super.__findattr_ex__(name);
}
/**
Modified: branches/asm/src/com/ziclix/python/sql/PyExtendedCursor.java
===================================================================
--- branches/asm/src/com/ziclix/python/sql/PyExtendedCursor.java 2008-08-11 22:24:20 UTC (rev 5154)
+++ branches/asm/src/com/ziclix/python/sql/PyExtendedCursor.java 2008-08-11 23:27:27 UTC (rev 5155)
@@ -131,7 +131,7 @@
* @param name the name of the attribute of interest
* @return the value for the attribute of the specified name
*/
- public PyObject __findattr__(String name) {
+ public PyObject __findattr_ex__(String name) {
if ("__methods__".equals(name)) {
return __methods__;
@@ -139,7 +139,7 @@
return __members__;
}
- return super.__findattr__(name);
+ return super.__findattr_ex__(name);
}
/**
Modified: branches/asm/src/com/ziclix/python/sql/PyStatement.java
===================================================================
--- branches/asm/src/com/ziclix/python/sql/PyStatement.java 2008-08-11 22:24:20 UTC (rev 5154)
+++ branches/asm/src/com/ziclix/python/sql/PyStatement.java 2008-08-11 23:27:27 UTC (rev 5155)
@@ -161,7 +161,7 @@
* @param name
* @return the attribute for the given name
*/
- public PyObject __findattr__(String name) {
+ public PyObject __findattr_ex__(String name) {
if ("style".equals(name)) {
return Py.newInteger(style);
@@ -175,7 +175,7 @@
return __members__;
}
- return super.__findattr__(name);
+ return super.__findattr_ex__(name);
}
/**
Modified: branches/asm/src/com/ziclix/python/sql/connect/Connect.java
===================================================================
--- branches/asm/src/com/ziclix/python/sql/connect/Connect.java 2008-08-11 22:24:20 UTC (rev 5154)
+++ branches/asm/src/com/ziclix/python/sql/connect/Connect.java 2008-08-11 23:27:27 UTC (rev 5155)
@@ -32,19 +32,11 @@
public Connect() {
}
- /**
- * Method __findattr__
- *
- * @param String name
- * @return PyObject
- */
- public PyObject __findattr__(String name) {
-
+ public PyObject __findattr_ex__(String name) {
if ("__doc__".equals(name)) {
return _doc;
}
-
- return super.__findattr__(name);
+ return super.__findattr_ex__(name);
}
/**
Modified: branches/asm/src/com/ziclix/python/sql/connect/Connectx.java
===================================================================
--- branches/asm/src/com/ziclix/python/sql/connect/Connectx.java 2008-08-11 22:24:20 UTC (rev 5154)
+++ branches/asm/src/com/ziclix/python/sql/connect/Connectx.java 2008-08-11 23:27:27 UTC (rev 5155)
@@ -43,19 +43,11 @@
public Connectx() {
}
- /**
- * Method __findattr__
- *
- * @param String name
- * @return PyObject
- */
- public PyObject __findattr__(String name) {
-
+ public PyObject __findattr_ex__(String name) {
if ("__doc__".equals(name)) {
return doc;
}
-
- return super.__findattr__(name);
+ return super.__findattr_ex__(name);
}
/**
Modified: branches/asm/src/com/ziclix/python/sql/connect/Lookup.java
===================================================================
--- branches/asm/src/com/ziclix/python/sql/connect/Lookup.java 2008-08-11 22:24:20 UTC (rev 5154)
+++ branches/asm/src/com/ziclix/python/sql/connect/Lookup.java 2008-08-11 23:27:27 UTC (rev 5155)
@@ -44,13 +44,13 @@
* @param name
* @return PyObject
*/
- public PyObject __findattr__(String name) {
+ public PyObject __findattr_ex__(String name) {
if ("__doc__".equals(name)) {
return _doc;
}
- return super.__findattr__(name);
+ return super.__findattr_ex__(name);
}
/**
Modified: branches/asm/src/com/ziclix/python/sql/util/BCP.java
===================================================================
--- branches/asm/src/com/ziclix/python/sql/util/BCP.java 2008-08-11 22:24:20 UTC (rev 5154)
+++ branches/asm/src/com/ziclix/python/sql/util/BCP.java 2008-08-11 23:27:27 UTC (rev 5155)
@@ -128,7 +128,7 @@
* @param name
* @return the attribute for the given name
*/
- public PyObject __findattr__(String name) {
+ public PyObject __findattr_ex__(String name) {
if ("destinationDataHandler".equals(name)) {
return Py.java2py(this.destDH);
@@ -140,7 +140,7 @@
return Py.newInteger(this.queuesize);
}
- return super.__findattr__(name);
+ return super.__findattr_ex__(name);
}
/**
Modified: branches/asm/src/org/python/core/PyArrayDerived.java
===================================================================
--- branches/asm/src/org/python/core/PyArrayDerived.java 2008-08-11 22:24:20 UTC (rev 5154)
+++ branches/asm/src/org/python/core/PyArrayDerived.java 2008-08-11 23:27:27 UTC (rev 5155)
@@ -972,30 +972,44 @@
}
}
- public PyObject __findattr__(String name) {
+ public PyObject __findattr_ex__(String name) {
PyType self_type=getType();
+ // TODO: We should speed this up. As the __getattribute__ slot almost never
+ // changes, it is a good candidate for caching, as PyClass does with
+ // __getattr__. See #1102.
PyObject getattribute=self_type.lookup("__getattribute__");
PyString py_name=null;
+ PyException firstAttributeError=null;
try {
if (getattribute!=null) {
- return getattribute.__get__(this,self_type).__call__(py_name=PyString.fromInterned(name));
+ py_name=PyString.fromInterned(name);
+ return getattribute.__get__(this,self_type).__call__(py_name);
} else {
- return super.__findattr__(name);
+ Py.Warning(String.format("__getattribute__ not found on type %s",self_type.getName()));
+ PyObject ret=super.__findattr_ex__(name);
+ if (ret!=null) {
+ return ret;
+ } // else: pass through to __getitem__ invocation
}
} catch (PyException e) {
- if (Py.matchException(e,Py.AttributeError)) {
- PyObject getattr=self_type.lookup("__getattr__");
- if (getattr!=null)
- try {
- return getattr.__get__(this,self_type).__call__(py_name!=null?py_name:PyString.fromInterned(name));
- } catch (PyException e1) {
- if (!Py.matchException(e1,Py.AttributeError))
- throw e1;
- }
- return null;
+ if (!Py.matchException(e,Py.AttributeError)) {
+ throw e;
+ } else {
+ firstAttributeError=e; // saved to avoid swallowing custom AttributeErrors
+ // and pass through to __getattr__ invocation.
}
- throw e;
}
+ PyObject getattr=self_type.lookup("__getattr__");
+ if (getattr!=null) {
+ if (py_name==null) {
+ py_name=PyString.fromInterned(name);
+ }
+ return getattr.__get__(this,self_type).__call__(py_name);
+ }
+ if (firstAttributeError!=null) {
+ throw firstAttributeError;
+ }
+ return null;
}
public void __setattr__(String name,PyObject value) {
Modified: branches/asm/src/org/python/core/PyBaseException.java
===================================================================
--- branches/asm/src/org/python/core/PyBaseException.java 2008-08-11 22:24:20 UTC (rev 5154)
+++ branches/asm/src/org/python/core/PyBaseException.java 2008-08-11 23:27:27 UTC (rev 5155)
@@ -101,7 +101,7 @@
return Py.None;
}
- public PyObject __findattr__(String name) {
+ public PyObject __findattr_ex__(String name) {
return BaseException___findattr__(name);
}
@@ -113,7 +113,7 @@
}
}
- return super.__findattr__(name);
+ return super.__findattr_ex__(name);
}
public void __setattr__(String name, PyObject value) {
Modified: branches/asm/src/org/python/core/PyBaseExceptionDerived.java
===================================================================
--- branches/asm/src/org/python/core/PyBaseExceptionDerived.java 2008-08-11 22:24:20 UTC (rev 5154)
+++ branches/asm/src/org/python/core/PyBaseExceptionDerived.java 2008-08-11 23:27:27 UTC (rev 5155)
@@ -948,30 +948,44 @@
}
}
- public PyObject __findattr__(String name) {
+ public PyObject __findattr_ex__(String name) {
PyType self_type=getType();
+ // TODO: We should speed this up. As the __getattribute__ slot almost never
+ // changes, it is a good candidate for caching, as PyClass does with
+ // __getattr__. See #1102.
PyObject getattribute=self_type.lookup("__getattribute__");
PyString py_name=null;
+ PyException firstAttributeError=null;
try {
if (getattribute!=null) {
- return getattribute.__get__(this,self_type).__call__(py_name=PyString.fromInterned(name));
+ py_name=PyString.fromInterned(name);
+ return getattribute.__get__(this,self_type).__call__(py_name);
} else {
- return super.__findattr__(name);
+ Py.Warning(String.format("__getattribute__ not found on type %s",self_type.getName()));
+ PyObject ret=super.__findattr_ex__(name);
+ if (ret!=null) {
+ return ret;
+ } // else: pass through to __getitem__ invocation
}
} catch (PyException e) {
- if (Py.matchException(e,Py.AttributeError)) {
- PyObject getattr=self_type.lookup("__getattr__");
- if (getattr!=null)
- try {
- return getattr.__get__(this,self_type).__call__(py_name!=null?py_name:PyString.fromInterned(name));
- } catch (PyException e1) {
- if (!Py.matchException(e1,Py.AttributeError))
- throw e1;
- }
- return null;
+ if (!Py.matchException(e,Py.AttributeError)) {
+ throw e;
+ } else {
+ firstAttributeError=e; // saved to avoid swallowing custom AttributeErrors
+ // and pass through to __getattr__ invocation.
}
- throw e;
}
+ PyObject getattr=self_type.lookup("__getattr__");
+ if (getattr!=null) {
+ if (py_name==null) {
+ py_name=PyString.fromInterned(name);
+ }
+ return getattr.__get__(this,self_type).__call__(py_name);
+ }
+ if (firstAttributeError!=null) {
+ throw firstAttributeError;
+ }
+ return null;
}
public void __setattr__(String name,PyObject value) {
Modified: branches/asm/src/org/python/core/PyBooleanDerived.java
===================================================================
--- branches/asm/src/org/python/core/PyBooleanDerived.java 2008-08-11 22:24:20 UTC (rev 5154)
+++ branches/asm/src/org/python/core/PyBooleanDerived.java 2008-08-11 23:27:27 UTC (rev 5155)
@@ -972,30 +972,44 @@
}
}
- public PyObject __findattr__(String name) {
+ public PyObject __findattr_ex__(String name) {
PyType self_type=getType();
+ // TODO: We should speed this up. As the __getattribute__ slot almost never
+ // changes, it is a good candidate for caching, as PyClass does with
+ // __getattr__. See #1102.
PyObject getattribute=self_type.lookup("__getattribute__");
PyString py_name=null;
+ PyException firstAttributeError=null;
try {
if (getattribute!=null) {
- return getattribute.__get__(this,self_type).__call__(py_name=PyString.fromInterned(name));
+ py_name=PyString.fromInterned(name);
+ return getattribute.__get__(this,self_type).__call__(py_name);
} else {
- return super.__findattr__(name);
+ Py.Warning(String.format("__getattribute__ not found on type %s",self_type.getName()));
+ PyObject ret=super.__findattr_ex__(name);
+ if (ret!=null) {
+ return ret;
+ } // else: pass through to __getitem__ invocation
}
} catch (PyException e) {
- if (Py.matchException(e,Py.AttributeError)) {
- PyObject getattr=self_type.lookup("__getattr__");
- if (getattr!=null)
- try {
- return getattr.__get__(this,self_type).__call__(py_name!=null?py_name:PyString.fromInterned(name));
- } catch (PyException e1) {
- if (!Py.matchException(e1,Py.AttributeError))
- throw e1;
- }
- return null;
+ if (!Py.matchException(e,Py.AttributeError)) {
+ throw e;
+ } else {
+ firstAttributeError=e; // saved to avoid swallowing custom AttributeErrors
+ // and pass through to __getattr__ invocation.
}
- throw e;
}
+ PyObject getattr=self_type.lookup("__getattr__");
+ if (getattr!=null) {
+ if (py_name==null) {
+ py_name=PyString.fromInterned(name);
+ }
+ return getattr.__get__(this,self_type).__call__(py_name);
+ }
+ if (firstAttributeError!=null) {
+ throw firstAttributeError;
+ }
+ return null;
}
public void __setattr__(String name,PyObject value) {
Modified: branches/asm/src/org/python/core/PyClass.java
===================================================================
--- branches/asm/src/org/python/core/PyClass.java 2008-08-11 22:24:20 UTC (rev 5154)
+++ branches/asm/src/org/python/core/PyClass.java 2008-08-11 23:27:27 UTC (rev 5155)
@@ -228,7 +228,7 @@
return result[0];
}
- public PyObject __findattr__(String name) {
+ public PyObject __findattr_ex__(String name) {
if (name == "__dict__") {
return __dict__;
}
@@ -245,7 +245,7 @@
PyObject[] result = lookupGivingClass(name, false);
if (result[0] == null) {
- return super.__findattr__(name);
+ return super.__findattr_ex__(name);
}
// xxx do we need to use result[1] (wherefound) for java cases for backw
// comp?
Modified: branches/asm/src/org/python/core/PyClassMethodDerived.java
===================================================================
--- branches/asm/src/org/python/core/PyClassMethodDerived.java 2008-08-11 22:24:20 UTC (rev 5154)
+++ branches/asm/src/org/python/core/PyClassMethodDerived.java 2008-08-11 23:27:27 UTC (rev 5155)
@@ -972,30 +972,44 @@
}
}
- public PyObject __findattr__(String name) {
+ public PyObject __findattr_ex__(String name) {
PyType self_type=getType();
+ // TODO: We should speed this up. As the __getattribute__ slot almost never
+ // changes, it is a good candidate for caching, as PyClass does with
+ // __getattr__. See #1102.
PyObject getattribute=self_type.lookup("__getattribute__");
PyString py_name=null;
+ PyException firstAttributeError=null;
try {
if (getattribute!=null) {
- return getattribute.__get__(this,self_type).__call__(py_name=PyString.fromInterned(name));
+ py_name=PyString.fromInterned(name);
+ return getattribute.__get__(this,self_type).__call__(py_name);
} else {
- return super.__findattr__(name);
+ Py.Warning(String.format("__getattribute__ not found on type %s",self_type.getName()));
+ PyObject ret=super.__findattr_ex__(name);
+ if (ret!=null) {
+ return ret;
+ } // else: pass through to __getitem__ invocation
}
} catch (PyException e) {
- if (Py.matchException(e,Py.AttributeError)) {
- PyObject getattr=self_type.lookup("__getattr__");
- if (getattr!=null)
- try {
- return getattr.__get__(this,self_type).__call__(py_name!=null?py_name:PyString.fromInterned(name));
- } catch (PyException e1) {
- if (!Py.matchException(e1,Py.AttributeError))
- throw e1;
- }
- return null;
+ if (!Py.matchException(e,Py.AttributeError)) {
+ throw e;
+ } else {
+ firstAttributeError=e; // saved to avoid swallowing custom AttributeErrors
+ // and pass through to __getattr__ invocation.
}
- throw e;
}
+ PyObject getattr=self_type.lookup("__getattr__");
+ if (getattr!=null) {
+ if (py_name==null) {
+ py_name=PyString.fromInterned(name);
+ }
+ return getattr.__get__(this,self_type).__call__(py_name);
+ }
+ if (firstAttributeError!=null) {
+ throw firstAttributeError;
+ }
+ return null;
}
public void __setattr__(String name,PyObject value) {
Modified: branches/asm/src/org/python/core/PyComplexDerived.java
===================================================================
--- branches/asm/src/org/python/core/PyComplexDerived.java 2008-08-11 22:24:20 UTC (rev 5154)
+++ branches/asm/src/org/python/core/PyComplexDerived.java 2008-08-11 23:27:27 UTC (rev 5155)
@@ -972,30 +972,44 @@
}
}
- public PyObject __findattr__(String name) {
+ public PyObject __findattr_ex__(String name) {
PyType self_type=getType();
+ // TODO: We should speed this up. As the __getattribute__ slot almost never
+ // changes, it is a good candidate for caching, as PyClass does with
+ // __getattr__. See #1102.
PyObject getattribute=self_type.lookup("__getattribute__");
PyString py_name=null;
+ PyException firstAttributeError=null;
try {
if (getattribute!=null) {
- return getattribute.__get__(this,self_type).__call__(py_name=PyString.fromInterned(name));
+ py_name=PyString.fromInterned(name);
+ return getattribute.__get__(this,self_type).__call__(py_name);
} else {
- return super.__findattr__(name);
+ Py.Warning(String.format("__getattribute__ not found on type %s",self_type.getName()));
+ PyObject ret=super.__findattr_ex__(name);
+ if (ret!=null) {
+ return ret;
+ } // else: pass through to __getitem__ invocation
}
} catch (PyException e) {
- if (Py.matchException(e,Py.AttributeError)) {
- PyObject getattr=self_type.lookup("__getattr__");
- if (getattr!=null)
- try {
- return getattr.__get__(this,self_type).__call__(py_name!=null?py_name:PyString.fromInterned(name));
- } catch (PyException e1) {
- if (!Py.matchException(e1,Py.AttributeError))
- throw e1;
- }
- return null;
+ if (!Py.matchException(e,Py.AttributeError)) {
+ throw e;
+ } else {
+ firstAttributeError=e; // saved to avoid swallowing custom AttributeErrors
+ // and pass through to __getattr__ invocation.
}
- throw e;
}
+ PyObject getattr=self_type.lookup("__getattr__");
+ if (getattr!=null) {
+ if (py_name==null) {
+ py_name=PyString.fromInterned(name);
+ }
+ return getattr.__get__(this,self_type).__call__(py_name);
+ }
+ if (firstAttributeError!=null) {
+ throw firstAttributeError;
+ }
+ return null;
}
public void __setattr__(String name,PyObject value) {
Modified: branches/asm/src/org/python/core/PyDictionaryDerived.java
===================================================================
--- branches/asm/src/org/python/core/PyDictionaryDerived.java 2008-08-11 22:24:20 UTC (rev 5154)
+++ branches/asm/src/org/python/core/PyDictionaryDerived.java 2008-08-11 23:27:27 UTC (rev 5155)
@@ -972,30 +972,44 @@
}
}
- public PyObject __findattr__(String name) {
+ public PyObject __findattr_ex__(String name) {
PyType self_type=getType();
+ // TODO: We should speed this up. As the __getattribute__ slot almost never
+ // changes, it is a good candidate for caching, as PyClass does with
+ // __getattr__. See #1102.
PyObject getattribute=self_type.lookup("__getattribute__");
PyString py_name=null;
+ PyException firstAttributeError=null;
try {
if (getattribute!=null) {
- return getattribute.__get__(this,self_type).__call__(py_name=PyString.fromInterned(name));
+ py_name=PyString.fromInterned(name);
+ return getattribute.__get__(this,self_type).__call__(py_name);
} else {
- return super.__findattr__(name);
+ Py.Warning(String.format("__getattribute__ not found on type %s",self_type.getName()));
+ PyObject ret=super.__findattr_ex__(name);
+ if (ret!=null) {
+ return ret;
+ } // else: pass through to __getitem__ invocation
}
} catch (PyException e) {
- if (Py.matchException(e,Py.AttributeError)) {
- PyObject getattr=self_type.lookup("__getattr__");
- if (getattr!=null)
- try {
- return getattr.__get__(this,self_type).__call__(py_name!=null?py_name:PyString.fromInterned(name));
- } catch (PyException e1) {
- if (!Py.matchException(e1,Py.AttributeError))
- throw e1;
- }
- return null;
+ if (!Py.matchException(e,Py.AttributeError)) {
+ throw e;
+ } else {
+ firstAttributeError=e; // saved to avoid swallowing custom AttributeErrors
+ // and pass through to __getattr__ invocation.
}
- throw e;
}
+ PyObject getattr=self_type.lookup("__getattr__");
+ if (getattr!=null) {
+ if (py_name==null) {
+ py_name=PyString.fromInterned(name);
+ }
+ return getattr.__get__(this,self_type).__call__(py_name);
+ }
+ if (firstAttributeError!=null) {
+ throw firstAttributeError;
+ }
+ return null;
}
public void __setattr__(String name,PyObject value) {
Modified: branches/asm/src/org/python/core/PyEnumerateDerived.java
===================================================================
--- branches/asm/src/org/python/core/PyEnumerateDerived.java 2008-08-11 22:24:20 UTC (rev 5154)
+++ branches/asm/src/org/python/core/PyEnumerateDerived.java 2008-08-11 23:27:27 UTC (rev 5155)
@@ -972,30 +972,44 @@
}
}
- public PyObject __findattr__(String name) {
+ public PyObject __findattr_ex__(String name) {
PyType self_type=getType();
+ // TODO: We should speed this up. As the __getattribute__ slot almost never
+ // changes, it is a good candidate for caching, as PyClass does with
+ // __getattr__. See #1102.
PyObject getattribute=self_type.lookup("__getattribute__");
PyString py_name=null;
+ PyException firstAttributeError=null;
try {
if (getattribute!=null) {
- return getattribute.__get__(this,self_type).__call__(py_name=PyString.fromInterned(name));
+ py_name=PyString.fromInterned(name);
+ return getattribute.__get__(this,self_type).__call__(py_name);
} else {
- return super.__findattr__(name);
+ Py.Warning(String.format("__getattribute__ not found on type %s",self_type.getName()));
+ PyObject ret=super.__findattr_ex__(name);
+ if (ret!=null) {
+ return ret;
+ } // else: pass through to __getitem__ invocation
}
} catch (PyException e) {
- if (Py.matchException(e,Py.AttributeError)) {
- PyObject getattr=self_type.lookup("__getattr__");
- if (getattr!=null)
- try {
- return getattr.__get__(this,self_type).__call__(py_name!=null?py_name:PyString.fromInterned(name));
- } catch (PyException e1) {
- if (!Py.matchException(e1,Py.AttributeError))
- throw e1;
- }
- return null;
+ if (!Py.matchException(e,Py.AttributeError)) {
+ throw e;
+ } else {
+ firstAttributeError=e; // saved to avoid swallowing custom AttributeErrors
+ // and pass through to __getattr__ invocation.
}
- throw e;
}
+ PyObject getattr=self_type.lookup("__getattr__");
+ if (getattr!=null) {
+ if (py_name==null) {
+ py_name=PyString.fromInterned(name);
+ }
+ return getattr.__get__(this,self_type).__call__(py_name);
+ }
+ if (firstAttributeError!=null) {
+ throw firstAttributeError;
+ }
+ return null;
}
public void __setattr__(String name,PyObject value) {
Modified: branches/asm/src/org/python/core/PyFileDerived.java
===================================================================
--- branches/asm/src/org/python/core/PyFileDerived.java 2008-08-11 22:24:20 UTC (rev 5154)
+++ branches/asm/src/org/python/core/PyFileDerived.java 2008-08-11 23:27:27 UTC (rev 5155)
@@ -972,30 +972,44 @@
}
}
- public PyObject __findattr__(String name) {
+ public PyObject __findattr_ex__(String name) {
PyType self_type=getType();
+ // TODO: We should speed this up. As the __getattribute__ slot almost never
+ // changes, it is a good candidate for caching, as PyClass does with
+ // __getattr__. See #1102.
PyObject getattribute=self_type.lookup("__getattribute__");
PyString py_name=null;
+ PyException firstAttributeError=null;
try {
if (getattribute!=null) {
- return getattribute.__get__(this,self_type).__call__(py_name=PyString.fromInterned(name));
+ py_name=PyString.fromInterned(name);
+ return getattribute.__get__(this,self_type).__call__(py_name);
} else {
- return super.__findattr__(name);
+ Py.Warning(String.format("__getattribute__ not found on type %s",self_type.getName()));
+ PyObject ret=super.__findattr_ex__(name);
+ if (ret!=null) {
+ return ret;
+ } // else: pass through to __getitem__ invocation
}
} catch (PyException e) {
- if (Py.matchException(e,Py.AttributeError)) {
- PyObject getattr=self_type.lookup("__getattr__");
- if (getattr!=null)
- try {
- return getattr.__get__(this,self_type).__call__(py_name!=null?py_name:PyString.fromInterned(name));
- } catch (PyException e1) {
- if (!Py.matchException(e1,Py.AttributeError))
- throw e1;
- }
- return null;
+ if (!Py.matchException(e,Py.AttributeError)) {
+ throw e;
+ } else {
+ firstAttributeError=e; // saved to avoid swallowing custom AttributeErrors
+ // and pass through to __getattr__ invocation.
}
- throw e;
}
+ PyObject getattr=self_type.lookup("__getattr__");
+ if (getattr!=null) {
+ if (py_name==null) {
+ py_name=PyString.fromInterned(name);
+ }
+ return getattr.__get__(this,self_type).__call__(py_name);
+ }
+ if (firstAttributeError!=null) {
+ throw firstAttributeError;
+ }
+ return null;
}
public void __setattr__(String name,PyObject value) {
Modified: branches/asm/src/org/python/core/PyFloatDerived.java
===================================================================
--- branches/asm/src/org/python/core/PyFloatDerived.java 2008-08-11 22:24:20 UTC (rev 5154)
+++ branches/asm/src/org/python/core/PyFloatDerived.java 2008-08-11 23:27:27 UTC (rev 5155)
@@ -972,30 +972,44 @@
}
}
- public PyObject __findattr__(String name) {
+ public PyObject __findattr_ex__(String name) {
PyType self_type=getType();
+ // TODO: We should speed this up. As the __getattribute__ slot almost never
+ // changes, it is a good candidate for caching, as PyClass does with
+ // __getattr__. See #1102.
PyObject getattribute=self_type.lookup("__getattribute__");
PyString py_name=null;
+ PyException firstAttributeError=null;
try {
if (getattribute!=null) {
- return getattribute.__get__(this,self_type).__call__(py_name=PyString.fromInterned(name));
+ py_name=PyString.fromInterned(name);
+ return getattribute.__get__(this,self_type).__call__(py_name);
} else {
- return super.__findattr__(name);
+ Py.Warning(String.format("__getattribute__ not found on type %s",self_type.getName()));
+ PyObject ret=super.__findattr_ex__(name);
+ if (ret!=null) {
+ return ret;
+ } // else: pass through to __getitem__ invocation
}
} catch (PyException e) {
- if (Py.matchException(e,Py.AttributeError)) {
- PyObject getattr=self_type.lookup("__getattr__");
- if (getattr!=null)
- try {
- return getattr.__get__(this,self_type).__call__(py_name!=null?py_name:PyString.fromInterned(name));
- } catch (PyException e1) {
- if (!Py.matchException(e1,Py.AttributeError))
- throw e1;
- }
- return null;
+ if (!Py.matchException(e,Py.AttributeError)) {
+ throw e;
+ } else {
+ firstAttributeError=e; // saved to avoid swallowing custom AttributeErrors
+ // and pass through to __getattr__ invocation.
}
- throw e;
}
+ PyObject getattr=self_type.lookup("__getattr__");
+ if (getattr!=null) {
+ if (py_name==null) {
+ py_name=PyString.fromInterned(name);
+ }
+ return getattr.__get__(this,self_type).__call__(py_name);
+ }
+ if (firstAttributeError!=null) {
+ throw firstAttributeError;
+ }
+ return null;
}
public void __setattr__(String name,PyObject value) {
Modified: branches/asm/src/org/python/core/PyFrame.java
===================================================================
--- branches/asm/src/org/python/core/PyFrame.java 2008-08-11 22:24:20 UTC (rev 5154)
+++ branches/asm/src/org/python/core/PyFrame.java 2008-08-11 23:27:27 UTC (rev 5155)
@@ -168,7 +168,7 @@
// f_exc_traceback
}
- public PyObject __findattr__(String name) {
+ public PyObject __findattr_ex__(String name) {
if (name == "f_locals") {
return getLocals();
} else if (name == "f_trace") {
@@ -177,7 +177,7 @@
}
return Py.None;
}
- return super.__findattr__(name);
+ return super.__findattr_ex__(name);
}
/**
Modified: branches/asm/src/org/python/core/PyFrozenSetDerived.java
===================================================================
--- branches/asm/src/org/python/core/PyFrozenSetDerived.java 2008-08-11 22:24:20 UTC (rev 5154)
+++ branches/asm/src/org/python/core/PyFrozenSetDerived.java 2008-08-11 23:27:27 UTC (rev 5155)
@@ -972,30 +972,44 @@
}
}
- public PyObject __findattr__(String name) {
+ public PyObject __findattr_ex__(String name) {
PyType self_type=getType();
+ // TODO: We should speed this up. As the __getattribute__ slot almost never
+ // changes, it is a good candidate for caching, as PyClass does with
+ // __getattr__. See #1102.
PyObject getattribute=self_type.lookup("__getattribute__");
PyString py_name=null;
+ PyException firstAttributeError=null;
try {
if (getattribute!=null) {
- return getattribute.__get__(this,self_type).__call__(py_name=PyString.fromInterned(name));
+ py_name=PyString.fromInterned(name);
+ return getattribute.__get__(this,self_type).__call__(py_name);
} else {
- return super.__findattr__(name);
+ Py.Warning(String.format("__getattribute__ not found on type %s",self_type.getName()));
+ PyObject ret=super.__findattr_ex__(name);
+ if (ret!=null) {
+ return ret;
+ } // else: pass through to __getitem__ invocation
}
} catch (PyException e) {
- if (Py.matchException(e,Py.AttributeError)) {
- PyObject getattr=self_type.lookup("__getattr__");
- if (getattr!=null)
- try {
- return getattr.__get__(this,self_type).__call__(py_name!=null?py_name:PyString.fromInterned(name));
- } catch (PyException e1) {
- if (!Py.matchException(e1,Py.AttributeError))
- throw e1;
- }
- return null;
+ if (!Py.matchException(e,Py.AttributeError)) {
+ throw e;
+ } else {
+ firstAttributeError=e; // saved to avoid swallowing custom AttributeErrors
+ // and pass through to __getattr__ invocation.
}
- throw e;
}
+ PyObject getattr=self_type.lookup("__getattr__");
+ if (getattr!=null) {
+ if (py_name==null) {
+ py_name=PyString.fromInterned(name);
+ }
+ return getattr.__get__(this,self_type).__call__(py_name);
+ }
+ if (firstAttributeError!=null) {
+ throw firstAttributeError;
+ }
+ return null;
}
public void __setattr__(String name,PyObject value) {
Modified: branches/asm/src/org/python/core/PyInstance.java
===================================================================
--- branches/asm/src/org/python/core/PyInstance.java 2008-08-11 22:24:20 UTC (rev 5154)
+++ branches/asm/src/org/python/core/PyInstance.java 2008-08-11 23:27:27 UTC (rev 5155)
@@ -200,7 +200,7 @@
return __findattr__(name, true);
}
- public PyObject __findattr__(String name) {
+ public PyObject __findattr_ex__(String name) {
return __findattr__(name, false);
}
Modified: branches/asm/src/org/python/core/PyIntegerDerived.java
===================================================================
--- branches/asm/src/org/python/core/PyIntegerDerived.java 2008-08-11 22:24:20 UTC (rev 5154)
+++ branches/asm/src/org/python/core/PyIntegerDerived.java 2008-08-11 23:27:27 UTC (rev 5155)
@@ -972,30 +972,44 @@
}
}
- public PyObject __findattr__(String name) {
+ public PyObject __findattr_ex__(String name) {
PyType self_type=getType();
+ // TODO: We should speed this up. As the __getattribute__ slot almost never
+ // changes, it is a good candidate for caching, as PyClass does with
+ // __getattr__. See #1102.
PyObject getattribute=self_type.lookup("__getattribute__");
PyString py_name=null;
+ PyException firstAttributeError=null;
try {
if (getattribute!=null) {
- return getattribute.__get__(this,self_type).__call__(py_name=PyString.fromInterned(name));
+ py_name=PyString.fromInterned(name);
+ return getattribute.__get__(this,self_type).__call__(py_name);
} else {
- return super.__findattr__(name);
+ Py.Warning(String.format("__getattribute__ not found on type %s",self_type.getName()));
+ PyObject ret=super.__findattr_ex__(name);
+ if (ret!=null) {
+ return ret;
+ } // else: pass through to __getitem__ invocation
}
} catch (PyException e) {
- if (Py.matchException(e,Py.AttributeError)) {
- PyObject getattr=self_type.lookup("__getattr__");
- if (getattr!=null)
- try {
- return getattr.__get__(this,self_type).__call__(py_name!=null?py_name:PyString.fromInterned(name));
- } catch (PyException e1) {
- if (!Py.matchException(e1,Py.AttributeError))
- throw e1;
- }
- return null;
+ if (!Py.matchException(e,Py.AttributeError)) {
+ throw e;
+ } else {
+ firstAttributeError=e; // saved to avoid swallowing custom AttributeErrors
+ // and pass through to __getattr__ invocation.
}
- throw e;
}
+ PyObject getattr=self_type.lookup("__getattr__");
+ if (getattr!=null) {
+ if (py_name==null) {
+ py_name=PyString.fromInterned(name);
+ }
+ return getattr.__get__(this,self_type).__call__(py_name);
+ }
+ if (firstAttributeError!=null) {
+ throw firstAttributeError;
+ }
+ return null;
}
public void __setattr__(String name,PyObject value) {
Modified: branches/asm/src/org/python/core/PyJavaClass.java
===================================================================
--- branches/asm/src/org/python/core/PyJavaClass.java 2008-08-11 22:24:20 UTC (rev 5154)
+++ branches/asm/src/org/python/core/PyJavaClass.java 2008-08-11 23:27:27 UTC (rev 5155)
@@ -753,7 +753,7 @@
}
private PyStringMap missingAttributes = null;
- public PyObject __findattr__(String name) {
+ public PyObject __findattr_ex__(String name) {
if (name == "__dict__") {
if (__dict__ == null)
initialize();
Modified: branches/asm/src/org/python/core/PyJavaPackage.java
===================================================================
--- branches/asm/src/org/python/core/PyJavaPackage.java 2008-08-11 22:24:20 UTC (rev 5154)
+++ branches/asm/src/org/python/core/PyJavaPackage.java 2008-08-11 23:27:27 UTC (rev 5155)
@@ -132,7 +132,7 @@
}
- public PyObject __findattr__(String name) {
+ public PyObject __findattr_ex__(String name) {
PyObject ret = __dict__.__finditem__(name);
if (ret != null) return ret;
Modified: branches/asm/src/org/python/core/PyListDerived.java
===================================================================
--- branches/asm/src/org/python/core/PyListDerived.java 2008-08-11 22:24:20 UTC (rev 5154)
+++ branches/asm/src/org/python/core/PyListDerived.java 2008-08-11 23:27:27 UTC (rev 5155)
@@ -972,30 +972,44 @@
}
}
- public PyObject __findattr__(String name) {
+ public PyObject __findattr_ex__(String name) {
PyType self_type=getType();
+ // TODO: We should speed this up. As the __getattribute__ slot almost never
+ // changes, it is a good candidate for caching, as PyClass does with
+ // __getattr__. See #1102.
PyObject getattribute=self_type.lookup("__getattribute__");
PyString py_name=null;
+ PyException firstAttributeError=null;
try {
if (getattribute!=null) {
- return getattribute.__get__(this,self_type).__call__(py_name=PyString.fromInterned(name));
+ py_name=PyString.fromInterned(name);
+ return getattribute.__get__(this,self_type).__call__(py_name);
} else {
- return super.__findattr__(name);
+ Py.Warning(String.format("__getattribute__ not found on type %s",self_type.getName()));
+ PyObject ret=super.__findattr_ex__(name);
+ if (ret!=null) {
+ return ret;
+ } // else: pass through to __getitem__ invocation
}
} catch (PyException e) {
- if (Py.matchException(e,Py.AttributeError)) {
- PyObject getattr=self_type.lookup("__getattr__");
- if (getattr!=null)
- try {
- return getattr.__get__(this,self_type).__call__(py_name!=null?py_name:PyString.fromInterned(name));
- } catch (PyException e1) {
- if (!Py.matchException(e1,Py.AttributeError))
- throw e1;
- }
- return null;
+ if (!Py.matchException(e,Py.AttributeError)) {
+ throw e;
+ } else {
+ firstAttributeError=e; // saved to avoid swallowing custom AttributeErrors
+ // and pass through to __getattr__ invocation.
}
- throw e;
}
+ PyObject getattr=self_type.lookup("__getattr__");
+ if (getattr!=null) {
+ if (py_name==null) {
+ py_name=PyString.fromInterned(name);
+ }
+ return getattr.__get__(this,self_type).__call__(py_name);
+ }
+ if (firstAttributeError!=null) {
+ throw firstAttributeError;
+ }
+ return null;
}
public void __setattr__(String name,PyObject value) {
Modified: branches/asm/src/org/python/core/PyLongDerived.java
===================================================================
--- branches/asm/src/org/python/core/PyLongDerived.java 2008-08-11 22:24:20 UTC (rev 5154)
+++ branches/asm/src/org/python/core/PyLongDerived.java 2008-08-11 23:27:27 UTC (rev 5155)
@@ -972,30 +972,44 @@
}
}
- public PyObject __findattr__(String name) {
+ public PyObject __findattr_ex__(String name) {
PyType self_type=getType();
+ // TODO: We should speed this up. As the __getattribute__ slot almost never
+ // changes, it is a good candidate for caching, as PyClass does with
+ // __getattr__. See #1102.
PyObject getattribute=self_type.lookup("__getattribute__");
PyString py_name=null;
+ PyException firstAttributeError=null;
try {
if (getattribute!=null) {
- return getattribute.__get__(this,self_type).__call__(py_name=PyString.fromInterned(name));
+ py_name=PyString.fromInterned(name);
+ return getattribute.__get__(this,self_type).__call__(py_name);
} else {
- return super.__findattr__(name);
+ Py.Warning(String.format("__getattribute__ not found on type %s",self_type.getName()));
+ PyObject ret=super.__findattr_ex__(name);
+ if (ret!=null) {
+ return ret;
+ } // else: pass through to __getitem__ invocation
}
} catch (PyException e) {
- if (Py.matchException(e,Py.AttributeError)) {
- PyObject getattr=self_type.lookup("__getattr__");
- if (getattr!=null)
- try {
- return getattr.__get__(this,self_type).__call__(py_name!=null?py_name:PyString.fromInterned(name));
- } catch (PyException e1) {
- if (!Py.matchException(e1,Py.AttributeError))
- throw e1;
- }
- return null;
+ if (!Py.matchException(e,Py.AttributeError)) {
+ throw e;
+ } else {
+ firstAttributeError=e; // saved to avoid swallowing custom AttributeErrors
+ // and pass through to __getattr__ invocation.
}
- throw e;
}
+ PyObject getattr=self_type.lookup("__getattr__");
+ if (getattr!=null) {
+ if (py_name==null) {
+ py_name=PyString.fromInterned(name);
+ }
+ return getattr.__get__(this,self_type).__call__(py_name);
+ }
+ if (firstAttributeError!=null) {
+ throw firstAttributeError;
+ }
+ return null;
}
public void __setattr__(String name,PyObject value) {
Modified: branches/asm/src/org/python/core/PyMethod.java
===================================================================
--- branches/asm/src/org/python/core/PyMethod.java 2008-08-11 22:24:20 UTC (rev 5154)
+++ branches/asm/src/org/python/core/PyMethod.java 2008-08-11 23:27:27 UTC (rev 5155)
@@ -55,13 +55,27 @@
}
@Override
- public PyObject __findattr__(String name) {
- PyObject ret = super.__findattr__(name);
+ public PyObject __findattr_ex__(String name) {
+ return instancemethod___findattr_ex__(name);
+ }
+
+ final PyObject instancemethod___findattr_ex__(String name) {
+ PyObject ret = super.__findattr_ex__(name);
if (ret != null) {
return ret;
}
- return im_func.__findattr__(name);
+ return im_func.__findattr_ex__(name);
}
+
+ @ExposedMethod
+ final PyObject instancemethod___getattribute__(PyObject arg0) {
+ String name = asName(arg0);
+ PyObject ret = instancemethod___findattr_ex__(name);
+ if (ret == null) {
+ noAttributeError(name);
+ }
+ return ret;
+ }
@Override
public PyObject __get__(PyObject obj, PyObject type) {
Modified: branches/asm/src/org/python/core/PyModule.java
===================================================================
--- branches/asm/src/org/python/core/PyModule.java 2008-08-11 22:24:20 UTC (rev 5154)
+++ branches/asm/src/org/python/core/PyModule.java 2008-08-11 23:27:27 UTC (rev 5155)
@@ -128,21 +128,6 @@
return null;
}
- public PyObject __findattr__(String name) {
- return module___findattr__(name);
- }
-
- final PyObject module___findattr__(String name) {
- if (__dict__ != null) {
- PyObject attr = __dict__.__finditem__(name);
- if (attr != null) {
- return attr;
- }
- }
-
- return super.__findattr__(name);
- }
-
public void __setattr__(String name, PyObject value) {
module___setattr__(name, value);
}
Modified: branches/asm/src/org/python/core/PyModuleDerived.java
===================================================================
--- branches/asm/src/org/python/core/PyModuleDerived.java 2008-08-11 22:24:20 UTC (rev 5154)
+++ branches/asm/src/org/python/core/PyModuleDerived.java 2008-08-11 23:27:27 UTC (rev 5155)
@@ -948,30 +948,44 @@
}
}
- public PyObject __findattr__(String name) {
+ public PyObject __findattr_ex__(String name) {
PyType self_type=getType();
+ // TODO: We should speed this up. As the __getattribute__ slot almost never
+ // changes, it is a good candidate for caching, as PyClass does with
+ // __getattr__. See #1102.
PyObject getattribute=self_type.lookup("__getattribute__");
PyString py_name=null;
+ PyException firstAttributeError=null;
try {
if (getattribute!=null) {
- return getattribute.__get__(this,self_type).__call__(py_name=PyString.fromInterned(name));
+ py_name=PyString.fromInterned(name);
+ return getattribute.__get__(this,self_type).__call__(py_name);
} else {
- return super.__findattr__(name);
+ Py.Warning(String.format("__getattribute__ not found on type %s",self_type.getName()));
+ PyObject ret=super.__findattr_ex__(name);
+ if (ret!=null) {
+ return ret;
+ } // else: pass through to __getitem__ invocation
}
} catch (PyException e) {
- if (Py.matchException(e,Py.AttributeError)) {
- PyObject getattr=self_type.lookup("__getattr__");
- if (getattr!=null)
- try {
- return getattr.__get__(this,self_type).__call__(py_name!=null?py_name:PyString.fromInterned(name));
- } catch (PyException e1) {
- if (!Py.matchException(e1,Py.AttributeError))
- throw e1;
- }
- return null;
+ if (!Py.matchException(e,Py.AttributeError)) {
+ throw e;
+ } else {
+ firstAttributeError=e; // saved to avoid swallowing custom AttributeErrors
+ // and pass through to __getattr__ invocation.
}
- throw e;
}
+ PyObject getattr=self_type.lookup("__getattr__");
+ if (getattr!=null) {
+ if (py_name==null) {
+ py_name=PyString.fromInterned(name);
+ }
+ return getattr.__get__(this,self_type).__call__(py_name);
+ }
+ if (firstAttributeError!=null) {
+ throw firstAttributeError;
+ }
+ return null;
}
public void __setattr__(String name,PyObject value) {
Modified: branches/asm/src/org/python/core/PyObject.java
===================================================================
--- branches/asm/src/org/python/core/PyObject.java 2008-08-11 22:24:20 UTC (rev 5154)
+++ branches/asm/src/org/python/core/PyObject.java 2008-08-11 23:27:27 UTC (rev 5155)
@@ -734,12 +734,8 @@
* <code>__findattr__(name.internedString)</code> with the appropriate
* args.
*
- * Classes that wish to implement __getattr__ should override this method
- * instead (with the appropriate semantics.
+ * @param name the name to lookup in this namespace
*
- * @param name
- * the name to lookup in this namespace
- *
* @return the value corresponding to name or null if name is not found
*/
public final PyObject __findattr__(PyString name) {
@@ -758,36 +754,58 @@
* @param name the name to lookup in this namespace
* <b> must be an interned string </b>.
* @return the value corresponding to name or null if name is not found
- *
- * @see #__findattr__(PyString)
**/
- public PyObject __findattr__(String name) {
+ public final PyObject __findattr__(String name) {
+ try {
+ return __findattr_ex__(name);
+ } catch (PyException exc) {
+ if (Py.matchException(exc, Py.AttributeError)) {
+ return null;
+ }
+ throw exc;
+ }
+ }
+
+ /**
+ * Attribute lookup hook. If the attribute is not found, null may be
+ * returned or a Py.AttributeError can be thrown, whatever is more
+ * correct, efficient and/or convenient for the implementing cl...
[truncated message content] |
|
From: <fwi...@us...> - 2008-08-12 17:17:15
|
Revision: 5156
http://jython.svn.sourceforge.net/jython/?rev=5156&view=rev
Author: fwierzbicki
Date: 2008-08-12 17:17:12 +0000 (Tue, 12 Aug 2008)
Log Message:
-----------
Implement BOM handling as much as CPython 2.5 does. Altered
bad_coding2.py because Java, unlike CPython accepts "utf8" as
a synonymn for "utf-8"
Modified Paths:
--------------
branches/asm/src/org/python/core/ParserFacade.java
Added Paths:
-----------
branches/asm/Lib/test/bad_coding2.py
Added: branches/asm/Lib/test/bad_coding2.py
===================================================================
--- branches/asm/Lib/test/bad_coding2.py (rev 0)
+++ branches/asm/Lib/test/bad_coding2.py 2008-08-12 17:17:12 UTC (rev 5156)
@@ -0,0 +1,5 @@
+#coding: uft8
+print '我'
+
+#Changed for Jython because the original "coding: utf8" is supposed to be a
+#misspelling, but Java accepts this spelling for an encoding.
Modified: branches/asm/src/org/python/core/ParserFacade.java
===================================================================
--- branches/asm/src/org/python/core/ParserFacade.java 2008-08-11 23:27:27 UTC (rev 5155)
+++ branches/asm/src/org/python/core/ParserFacade.java 2008-08-12 17:17:12 UTC (rev 5156)
@@ -39,6 +39,8 @@
public class ParserFacade {
+ private static int MARK_LIMIT = 100000;
+
private ParserFacade() {}
static String getLine(BufferedReader reader, int line) {
@@ -192,12 +194,18 @@
private static BufferedReader prepBufreader(InputStream istream,
CompilerFlags cflags,
String filename) throws IOException {
+ boolean bom = false;
+ String encoding = null;
InputStream bstream = new BufferedInputStream(istream);
- String encoding = readEncoding(bstream);
- if(encoding == null && cflags != null && cflags.encoding != null) {
- encoding = cflags.encoding;
+ bom = adjustForBOM(bstream);
+ encoding = readEncoding(bstream);
+ if(encoding == null) {
+ if (bom) {
+ encoding = "UTF-8";
+ } else if (cflags != null && cflags.encoding != null) {
+ encoding = cflags.encoding;
+ }
}
-
// Enable universal newlines mode on the input
StreamIO rawIO = new StreamIO(bstream, true);
org.python.core.io.BufferedReader bufferedIO =
@@ -224,13 +232,40 @@
BufferedReader bufreader = new BufferedReader(reader);
- bufreader.mark(100000);
+ bufreader.mark(MARK_LIMIT);
return bufreader;
}
+ /**
+ * Check for a BOM mark at the begginning of stream. If there is a BOM
+ * mark, advance the stream passed it. If not, reset() to start at the
+ * beginning of the stream again.
+ *
+ * Only checks for EF BB BF right now, since that is all that CPython 2.5
+ * Checks.
+ *
+ * @return true if a BOM was found and skipped.
+ * @throws ParseException if only part of a BOM is matched.
+ *
+ */
+ private static boolean adjustForBOM(InputStream stream) throws IOException {
+ stream.mark(3);
+ int ch = stream.read();
+ if (ch == 0xEF) {
+ if (stream.read() != 0xBB) {
+ throw new ParseException("Incomplete BOM at beginning of file");
+ }
+ if (stream.read() != 0xBF) {
+ throw new ParseException("Incomplete BOM at beginning of file");
+ }
+ return true;
+ }
+ stream.reset();
+ return false;
+ }
private static String readEncoding(InputStream stream) throws IOException {
- stream.mark(100000);
+ stream.mark(MARK_LIMIT);
String encoding = null;
BufferedReader br = new BufferedReader(new InputStreamReader(stream), 512);
for (int i = 0; i < 2; i++) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fwi...@us...> - 2008-08-12 19:47:26
|
Revision: 5162
http://jython.svn.sourceforge.net/jython/?rev=5162&view=rev
Author: fwierzbicki
Date: 2008-08-12 19:47:24 +0000 (Tue, 12 Aug 2008)
Log Message:
-----------
fixes, workarounds, and a couple of punts for test_compile.py.
Modified Paths:
--------------
branches/asm/Lib/test/test_compile.py
branches/asm/src/org/python/antlr/GrammarActions.java
Modified: branches/asm/Lib/test/test_compile.py
===================================================================
--- branches/asm/Lib/test/test_compile.py 2008-08-12 18:57:22 UTC (rev 5161)
+++ branches/asm/Lib/test/test_compile.py 2008-08-12 19:47:24 UTC (rev 5162)
@@ -80,6 +80,9 @@
exec 'z = b' in m
except TypeError:
pass
+ #XXX: Jython calls this a NameError
+ except NameError:
+ pass
else:
self.fail('Did not validate globals as a real dict')
@@ -91,6 +94,9 @@
exec 'z = a' in g, m
except TypeError:
pass
+ #XXX: Jython calls this an AttributeError
+ except AttributeError:
+ pass
else:
self.fail('Did not validate locals as a mapping')
@@ -261,7 +267,9 @@
stmts = [
'None = 0',
'None += 0',
- '__builtins__.None = 0',
+ #XXX: None is specifically allowed as a dotted name for Java
+ # integration purposes in Jython.
+ #'__builtins__.None = 0',
'def None(): pass',
'class None: pass',
'(a, None) = 0, 0',
Modified: branches/asm/src/org/python/antlr/GrammarActions.java
===================================================================
--- branches/asm/src/org/python/antlr/GrammarActions.java 2008-08-12 18:57:22 UTC (rev 5161)
+++ branches/asm/src/org/python/antlr/GrammarActions.java 2008-08-12 19:47:24 UTC (rev 5162)
@@ -138,6 +138,7 @@
if (nameToken == null) {
return errorHandler.errorStmt(t);
}
+ cantBeNone(nameToken);
argumentsType a;
if (args != null) {
a = args;
@@ -319,6 +320,7 @@
if (nameToken == null) {
return errorHandler.errorStmt(t);
}
+ cantBeNone(nameToken);
exprType[] b = (exprType[])bases.toArray(new exprType[bases.size()]);
stmtType[] s = (stmtType[])body.toArray(new stmtType[body.size()]);
return new ClassDef(t, nameToken.getText(), b, s);
@@ -407,6 +409,7 @@
if (target == null || iter == null) {
return errorHandler.errorStmt(t);
}
+ cantBeNone(target);
stmtType[] o;
if (orelse != null) {
o = (stmtType[])orelse.toArray(new stmtType[orelse.size()]);
@@ -453,6 +456,12 @@
return new UnaryOp(t, unaryopType.USub, o);
}
+ void cantBeNone(PythonTree e) {
+ if (e.getText().equals("None")) {
+ throw new ParseException("can't be None", e);
+ }
+ }
+
void checkAssign(exprType e) {
if (e instanceof Name && ((Name)e).id.equals("None")) {
throw new ParseException("assignment to None", e);
@@ -460,6 +469,12 @@
throw new ParseException("can't assign to generator expression", e);
} else if (e instanceof Num) {
throw new ParseException("can't assign to number", e);
+ } else if (e instanceof Tuple) {
+ //XXX: performance problem? Any way to do this better?
+ exprType[] elts = ((Tuple)e).elts;
+ for (int i=0;i<elts.length;i++) {
+ checkAssign(elts[i]);
+ }
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fwi...@us...> - 2008-08-13 19:48:16
|
Revision: 5171
http://jython.svn.sourceforge.net/jython/?rev=5171&view=rev
Author: fwierzbicki
Date: 2008-08-13 19:48:08 +0000 (Wed, 13 Aug 2008)
Log Message:
-----------
Make errtext optional in test_syntax and fixed illegal delete of function call.
Modified Paths:
--------------
branches/asm/Lib/test/test_syntax.py
branches/asm/grammar/PythonWalker.g
branches/asm/src/org/python/antlr/GrammarActions.java
Modified: branches/asm/Lib/test/test_syntax.py
===================================================================
--- branches/asm/Lib/test/test_syntax.py 2008-08-13 19:25:13 UTC (rev 5170)
+++ branches/asm/Lib/test/test_syntax.py 2008-08-13 19:48:08 UTC (rev 5171)
@@ -424,27 +424,34 @@
class SyntaxTestCase(unittest.TestCase):
- def _check_error(self, code, errtext,
+ def _check_error(self, code, errtext=None,
filename="<testcase>", mode="exec", subclass=None):
"""Check that compiling code raises SyntaxError with errtext.
errtest is a regular expression that must be present in the
test of the exception raised. If subclass is specified it
is the expected subclass of SyntaxError (e.g. IndentationError).
+
+ XXX: Made errtext optional, since the exact wording of exceptions
+ is implementation dependant.
"""
try:
compile(code, filename, mode)
except SyntaxError, err:
if subclass and not isinstance(err, subclass):
self.fail("SyntaxError is not a %s" % subclass.__name__)
- mo = re.search(errtext, str(err))
- if mo is None:
- self.fail("SyntaxError did not contain '%r'" % (errtext,))
+ if errtext is not None:
+ mo = re.search(errtext, str(err))
+ if mo is None:
+ self.fail("SyntaxError did not contain '%r'" % (errtext,))
else:
self.fail("compile() did not raise SyntaxError")
def test_assign_call(self):
- self._check_error("f() = 1", "assign")
+ if test_support.is_jython:
+ self._check_error("f() = 1")
+ else:
+ self._check_error("f() = 1", "assign")
def test_assign_del(self):
self._check_error("del f()", "delete")
@@ -489,7 +496,10 @@
subclass=IndentationError)
def test_kwargs_last(self):
- self._check_error("int(base=10, '2')", "non-keyword arg")
+ if test_support.is_jython:
+ self._check_error("int(base=10, '2')")
+ else:
+ self._check_error("int(base=10, '2')", "non-keyword arg")
def test_main():
test_support.run_unittest(SyntaxTestCase)
Modified: branches/asm/grammar/PythonWalker.g
===================================================================
--- branches/asm/grammar/PythonWalker.g 2008-08-13 19:25:13 UTC (rev 5170)
+++ branches/asm/grammar/PythonWalker.g 2008-08-13 19:48:08 UTC (rev 5171)
@@ -439,6 +439,7 @@
del_stmt
: ^(DELETE elts[expr_contextType.Del]) {
exprType[] t = (exprType[])$elts.etypes.toArray(new exprType[$elts.etypes.size()]);
+ actions.checkDelete(t);
$stmts::statements.add(new Delete($DELETE, t));
}
;
Modified: branches/asm/src/org/python/antlr/GrammarActions.java
===================================================================
--- branches/asm/src/org/python/antlr/GrammarActions.java 2008-08-13 19:25:13 UTC (rev 5170)
+++ branches/asm/src/org/python/antlr/GrammarActions.java 2008-08-13 19:48:08 UTC (rev 5171)
@@ -499,4 +499,13 @@
}
}
}
+
+ void checkDelete(exprType[] exprs) {
+ for(int i=0;i<exprs.length;i++) {
+ if (exprs[i] instanceof Call) {
+ errorHandler.error("can't delete function call", exprs[i]);
+ }
+ }
+ }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fwi...@us...> - 2008-08-14 00:35:04
|
Revision: 5174
http://jython.svn.sourceforge.net/jython/?rev=5174&view=rev
Author: fwierzbicki
Date: 2008-08-14 00:35:01 +0000 (Thu, 14 Aug 2008)
Log Message:
-----------
antlr 3.1 final.
Modified Paths:
--------------
branches/asm/build.xml
Added Paths:
-----------
branches/asm/extlibs/antlr-3.1.jar
branches/asm/extlibs/antlr-runtime-3.1.jar
Removed Paths:
-------------
branches/asm/extlibs/antlr-3.1b2.jar
branches/asm/extlibs/antlr-runtime-3.1b2.jar
Modified: branches/asm/build.xml
===================================================================
--- branches/asm/build.xml 2008-08-14 00:07:31 UTC (rev 5173)
+++ branches/asm/build.xml 2008-08-14 00:35:01 UTC (rev 5174)
@@ -156,7 +156,7 @@
<pathelement path="${extlibs.dir}/mysql-connector-java-5.1.6.jar" />
<pathelement path="${extlibs.dir}/postgresql-8.3-603.jdbc4.jar" />
<pathelement path="${extlibs.dir}/antlr-2.7.7.jar" />
- <pathelement path="${extlibs.dir}/antlr-3.1b2.jar" />
+ <pathelement path="${extlibs.dir}/antlr-3.1.jar" />
<pathelement path="${extlibs.dir}/stringtemplate-3.2.jar" />
</path>
@@ -516,7 +516,7 @@
<target name="jarjar" depends="init,needed-check">
<taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="extlibs/jarjar-0.7.jar"/>
<jarjar destfile="${output.dir}/jarjar.jar">
- <zipfileset src="extlibs/antlr-runtime-3.1b2.jar"/>
+ <zipfileset src="extlibs/antlr-runtime-3.1.jar"/>
<zipfileset src="extlibs/asm-3.1.jar"/>
<zipfileset src="extlibs/asm-commons-3.1.jar"/>
<zipfileset src="extlibs/asm-util-3.1.jar"/>
Property changes on: branches/asm/extlibs/antlr-3.1.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: branches/asm/extlibs/antlr-runtime-3.1.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X