Hi,
I've noticed that IronPython doesn't yet support the Python2.4 "tuple"
syntax when using "from X import (...)", I'm sure this is probably
somewhere on the list of "Python2.4 compatability stuff to do".
I've attached a patch adding support for this.
--
Jonathan
diff -ru IronPython-0.7.6-orig\IronPython\AST\Parser.cs
IronPython-0.7.6\IronPython\AST\Parser.cs
--- IronPython-0.7.6-orig\IronPython\AST\Parser.cs Fri Jun 10 19:13:36 2005
+++ IronPython-0.7.6\IronPython\AST\Parser.cs Wed Jul 13 18:44:51 2005
@@ -362,7 +362,8 @@
Name[] names;
Name[] asNames;
- if (maybeEat(TokenKind.MUL)) {
+ bool bracketList = maybeEat(TokenKind.L_PAREN);
+ if (!bracketList && maybeEat(TokenKind.MUL)) {
names = FromImportStmt.STAR;
asNames = null;
} else {
@@ -371,6 +372,7 @@
l.Add(readName());
las.Add(maybeParseAsName());
while (maybeEat(TokenKind.COMMA)) {
+ if (bracketList && peekToken().kind == TokenKind.R_PAREN)
break;
l.Add(readName());
las.Add(maybeParseAsName());
}
@@ -379,6 +381,8 @@
asNames = new Name[las.Count];
las.CopyTo(asNames);
}
+ if (bracketList)
+ eat(TokenKind.R_PAREN);
FromImportStmt ret = new FromImportStmt(dname, names, asNames);
ret.setLoc(start, getEnd());
return ret;
_______________________________________________
users-ironpython.com mailing list
users-ironpython.com@lists.ironpython.com
http://lists.ironpython.com/listinfo.cgi/users-ironpython.com
