2007-02-26 19:04:49 +00:00
|
|
|
-- ASDL's five builtin types are identifier, int, string, object
|
2005-10-20 19:59:25 +00:00
|
|
|
|
2006-02-28 00:12:47 +00:00
|
|
|
module Python version "$Revision$"
|
2005-10-20 19:59:25 +00:00
|
|
|
{
|
|
|
|
mod = Module(stmt* body)
|
|
|
|
| Interactive(stmt* body)
|
|
|
|
| Expression(expr body)
|
|
|
|
|
|
|
|
-- not really an actual node but useful in Jython's typesystem.
|
|
|
|
| Suite(stmt* body)
|
|
|
|
|
|
|
|
stmt = FunctionDef(identifier name, arguments args,
|
2006-12-28 06:47:50 +00:00
|
|
|
stmt* body, expr* decorators, expr? returns)
|
2005-10-20 19:59:25 +00:00
|
|
|
| ClassDef(identifier name, expr* bases, stmt* body)
|
|
|
|
| Return(expr? value)
|
|
|
|
|
|
|
|
| Delete(expr* targets)
|
|
|
|
| Assign(expr* targets, expr value)
|
|
|
|
| AugAssign(expr target, operator op, expr value)
|
|
|
|
|
|
|
|
-- use 'orelse' because else is a keyword in target languages
|
|
|
|
| For(expr target, expr iter, stmt* body, stmt* orelse)
|
|
|
|
| While(expr test, stmt* body, stmt* orelse)
|
|
|
|
| If(expr test, stmt* body, stmt* orelse)
|
2006-02-27 22:32:47 +00:00
|
|
|
| With(expr context_expr, expr? optional_vars, stmt* body)
|
2005-10-20 19:59:25 +00:00
|
|
|
|
|
|
|
-- 'type' is a bad name
|
|
|
|
| Raise(expr? type, expr? inst, expr? tback)
|
|
|
|
| TryExcept(stmt* body, excepthandler* handlers, stmt* orelse)
|
|
|
|
| TryFinally(stmt* body, stmt* finalbody)
|
|
|
|
| Assert(expr test, expr? msg)
|
|
|
|
|
|
|
|
| Import(alias* names)
|
2006-02-28 16:09:29 +00:00
|
|
|
| ImportFrom(identifier module, alias* names, int? level)
|
2005-10-20 19:59:25 +00:00
|
|
|
|
|
|
|
| Global(identifier* names)
|
2007-02-27 06:50:52 +00:00
|
|
|
| Nonlocal(identifier* names)
|
2005-10-20 19:59:25 +00:00
|
|
|
| Expr(expr value)
|
|
|
|
| Pass | Break | Continue
|
|
|
|
|
|
|
|
-- XXX Jython will be different
|
2006-03-01 22:49:05 +00:00
|
|
|
-- col_offset is the byte offset in the utf8 string the parser uses
|
|
|
|
attributes (int lineno, int col_offset)
|
2005-10-20 19:59:25 +00:00
|
|
|
|
|
|
|
-- BoolOp() can use left & right?
|
|
|
|
expr = BoolOp(boolop op, expr* values)
|
|
|
|
| BinOp(expr left, operator op, expr right)
|
|
|
|
| UnaryOp(unaryop op, expr operand)
|
|
|
|
| Lambda(arguments args, expr body)
|
2006-02-27 00:24:13 +00:00
|
|
|
| IfExp(expr test, expr body, expr orelse)
|
2005-10-20 19:59:25 +00:00
|
|
|
| Dict(expr* keys, expr* values)
|
2006-08-28 15:27:34 +00:00
|
|
|
| Set(expr* elts)
|
2005-10-20 19:59:25 +00:00
|
|
|
| ListComp(expr elt, comprehension* generators)
|
|
|
|
| GeneratorExp(expr elt, comprehension* generators)
|
2006-01-27 15:18:39 +00:00
|
|
|
-- the grammar constrains where yield expressions can occur
|
2005-10-20 19:59:25 +00:00
|
|
|
| Yield(expr? value)
|
|
|
|
-- need sequences for compare to distinguish between
|
|
|
|
-- x < 4 < 3 and (x < 4) < 3
|
|
|
|
| Compare(expr left, cmpop* ops, expr* comparators)
|
|
|
|
| Call(expr func, expr* args, keyword* keywords,
|
|
|
|
expr? starargs, expr? kwargs)
|
|
|
|
| Num(object n) -- a number as a PyObject.
|
|
|
|
| Str(string s) -- need to specify raw, unicode, etc?
|
2007-02-23 19:56:57 +00:00
|
|
|
| Bytes(string s)
|
2006-09-06 07:06:08 +00:00
|
|
|
| Ellipsis
|
2005-10-20 19:59:25 +00:00
|
|
|
-- other literals? bools?
|
|
|
|
|
|
|
|
-- the following expression can appear in assignment context
|
|
|
|
| Attribute(expr value, identifier attr, expr_context ctx)
|
|
|
|
| Subscript(expr value, slice slice, expr_context ctx)
|
|
|
|
| Name(identifier id, expr_context ctx)
|
|
|
|
| List(expr* elts, expr_context ctx)
|
Merged revisions 53623-53858 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r53624 | peter.astrand | 2007-02-02 20:06:36 +0100 (Fri, 02 Feb 2007) | 1 line
We had several if statements checking the value of a fd. This is unsafe, since valid fds might be zero. We should check for not None instead.
........
r53635 | kurt.kaiser | 2007-02-05 07:03:18 +0100 (Mon, 05 Feb 2007) | 2 lines
Add 'raw' support to configHandler. Patch 1650174 Tal Einat.
........
r53641 | kurt.kaiser | 2007-02-06 00:02:16 +0100 (Tue, 06 Feb 2007) | 5 lines
1. Calltips now 'handle' tuples in the argument list (display '<tuple>' :)
Suggested solution by Christos Georgiou, Bug 791968.
2. Clean up tests, were not failing when they should have been.
4. Remove some camelcase and an unneeded try/except block.
........
r53644 | kurt.kaiser | 2007-02-06 04:21:40 +0100 (Tue, 06 Feb 2007) | 2 lines
Clean up ModifiedInterpreter.runcode() structure
........
r53646 | peter.astrand | 2007-02-06 16:37:50 +0100 (Tue, 06 Feb 2007) | 1 line
Applied patch 1124861.3.patch to solve bug #1124861: Automatically create pipes on Windows, if GetStdHandle fails. Will backport.
........
r53648 | lars.gustaebel | 2007-02-06 19:38:13 +0100 (Tue, 06 Feb 2007) | 4 lines
Patch #1652681: create nonexistent files in append mode and
allow appending to empty files.
........
r53649 | kurt.kaiser | 2007-02-06 20:09:43 +0100 (Tue, 06 Feb 2007) | 4 lines
Updated patch (CodeContext.061217.patch) to
[ 1362975 ] CodeContext - Improved text indentation
Tal Einat 16Dec06
........
r53650 | kurt.kaiser | 2007-02-06 20:21:19 +0100 (Tue, 06 Feb 2007) | 2 lines
narrow exception per [ 1540849 ] except too broad
........
r53653 | kurt.kaiser | 2007-02-07 04:39:41 +0100 (Wed, 07 Feb 2007) | 4 lines
[ 1621265 ] Auto-completion list placement
Move AC window below input line unless not enough space, then put it above.
Patch: Tal Einat
........
r53654 | kurt.kaiser | 2007-02-07 09:07:13 +0100 (Wed, 07 Feb 2007) | 2 lines
Handle AttributeError during calltip lookup
........
r53656 | raymond.hettinger | 2007-02-07 21:08:22 +0100 (Wed, 07 Feb 2007) | 3 lines
SF #1615701: make d.update(m) honor __getitem__() and keys() in dict subclasses
........
r53658 | raymond.hettinger | 2007-02-07 22:04:20 +0100 (Wed, 07 Feb 2007) | 1 line
SF: 1397711 Set docs conflated immutable and hashable
........
r53660 | raymond.hettinger | 2007-02-07 22:42:17 +0100 (Wed, 07 Feb 2007) | 1 line
Check for a common user error with defaultdict().
........
r53662 | raymond.hettinger | 2007-02-07 23:24:07 +0100 (Wed, 07 Feb 2007) | 1 line
Bug #1575169: operator.isSequenceType() now returns False for subclasses of dict.
........
r53664 | raymond.hettinger | 2007-02-08 00:49:03 +0100 (Thu, 08 Feb 2007) | 1 line
Silence compiler warning
........
r53666 | raymond.hettinger | 2007-02-08 01:07:32 +0100 (Thu, 08 Feb 2007) | 1 line
Do not let overflows in enumerate() and count() pass silently.
........
r53668 | raymond.hettinger | 2007-02-08 01:50:39 +0100 (Thu, 08 Feb 2007) | 1 line
Bypass set specific optimizations for set and frozenset subclasses.
........
r53670 | raymond.hettinger | 2007-02-08 02:42:35 +0100 (Thu, 08 Feb 2007) | 1 line
Fix docstring bug
........
r53671 | martin.v.loewis | 2007-02-08 10:13:36 +0100 (Thu, 08 Feb 2007) | 3 lines
Bug #1653736: Complain about keyword arguments to time.isoformat.
Will backport to 2.5.
........
r53679 | kurt.kaiser | 2007-02-08 23:58:18 +0100 (Thu, 08 Feb 2007) | 6 lines
Corrected some bugs in AutoComplete. Also, Page Up/Down in ACW implemented;
mouse and cursor selection in ACWindow implemented; double Tab inserts current
selection and closes ACW (similar to double-click and Return); scroll wheel now
works in ACW. Added AutoComplete instructions to IDLE Help.
........
r53689 | martin.v.loewis | 2007-02-09 13:19:32 +0100 (Fri, 09 Feb 2007) | 3 lines
Bug #1653736: Properly discard third argument to slot_nb_inplace_power.
Will backport.
........
r53691 | martin.v.loewis | 2007-02-09 13:36:48 +0100 (Fri, 09 Feb 2007) | 4 lines
Bug #1600860: Search for shared python library in LIBDIR, not
lib/python/config, on "linux" and "gnu" systems.
Will backport.
........
r53693 | martin.v.loewis | 2007-02-09 13:58:49 +0100 (Fri, 09 Feb 2007) | 2 lines
Update broken link. Will backport to 2.5.
........
r53697 | georg.brandl | 2007-02-09 19:48:41 +0100 (Fri, 09 Feb 2007) | 2 lines
Bug #1656078: typo in in profile docs.
........
r53731 | brett.cannon | 2007-02-11 06:36:00 +0100 (Sun, 11 Feb 2007) | 3 lines
Change a very minor inconsistency (that is purely cosmetic) in the AST
definition.
........
r53735 | skip.montanaro | 2007-02-11 19:24:37 +0100 (Sun, 11 Feb 2007) | 1 line
fix trace.py --ignore-dir
........
r53741 | brett.cannon | 2007-02-11 20:44:41 +0100 (Sun, 11 Feb 2007) | 3 lines
Check in changed Python-ast.c from a cosmetic change to Python.asdl (in
r53731).
........
r53751 | brett.cannon | 2007-02-12 04:51:02 +0100 (Mon, 12 Feb 2007) | 5 lines
Modify Parser/asdl_c.py so that the __version__ number for Python/Python-ast.c
is specified at the top of the file. Also add a note that Python/Python-ast.c
needs to be committed separately after a change to the AST grammar to capture
the revision number of the change (which is what __version__ is set to).
........
r53752 | lars.gustaebel | 2007-02-12 10:25:53 +0100 (Mon, 12 Feb 2007) | 3 lines
Bug #1656581: Point out that external file objects are supposed to be
at position 0.
........
r53754 | martin.v.loewis | 2007-02-12 13:21:10 +0100 (Mon, 12 Feb 2007) | 3 lines
Patch 1463026: Support default namespace in XMLGenerator.
Fixes #847665. Will backport.
........
r53757 | armin.rigo | 2007-02-12 17:23:24 +0100 (Mon, 12 Feb 2007) | 4 lines
Fix the line to what is my guess at the original author's meaning.
(The line has no effect anyway, but is present because it's
customary call the base class __init__).
........
r53763 | martin.v.loewis | 2007-02-13 09:34:45 +0100 (Tue, 13 Feb 2007) | 3 lines
Patch #685268: Consider a package's __path__ in imputil.
Will backport.
........
r53765 | martin.v.loewis | 2007-02-13 10:49:38 +0100 (Tue, 13 Feb 2007) | 2 lines
Patch #698833: Support file decryption in zipfile.
........
r53766 | martin.v.loewis | 2007-02-13 11:10:39 +0100 (Tue, 13 Feb 2007) | 3 lines
Patch #1517891: Make 'a' create the file if it doesn't exist.
Fixes #1514451.
........
r53767 | martin.v.loewis | 2007-02-13 13:08:24 +0100 (Tue, 13 Feb 2007) | 3 lines
Bug #1658794: Remove extraneous 'this'.
Will backport to 2.5.
........
r53769 | martin.v.loewis | 2007-02-13 13:14:19 +0100 (Tue, 13 Feb 2007) | 3 lines
Patch #1657276: Make NETLINK_DNRTMSG conditional.
Will backport.
........
r53771 | lars.gustaebel | 2007-02-13 17:09:24 +0100 (Tue, 13 Feb 2007) | 4 lines
Patch #1647484: Renamed GzipFile's filename attribute to name. The
filename attribute is still accessible as a property that emits a
DeprecationWarning.
........
r53772 | lars.gustaebel | 2007-02-13 17:24:00 +0100 (Tue, 13 Feb 2007) | 3 lines
Strip the '.gz' extension from the filename that is written to the
gzip header.
........
r53774 | martin.v.loewis | 2007-02-14 11:07:37 +0100 (Wed, 14 Feb 2007) | 2 lines
Patch #1432399: Add HCI sockets.
........
r53775 | martin.v.loewis | 2007-02-14 12:30:07 +0100 (Wed, 14 Feb 2007) | 2 lines
Update 1432399 to removal of _BT_SOCKADDR_MEMB.
........
r53776 | martin.v.loewis | 2007-02-14 12:30:56 +0100 (Wed, 14 Feb 2007) | 3 lines
Ignore directory time stamps when considering
whether to rerun libffi configure.
........
r53778 | lars.gustaebel | 2007-02-14 15:45:12 +0100 (Wed, 14 Feb 2007) | 4 lines
A missing binary mode in AppendTest caused failures in Windows
Buildbot.
........
r53782 | martin.v.loewis | 2007-02-15 10:51:35 +0100 (Thu, 15 Feb 2007) | 2 lines
Patch #1397848: add the reasoning behind no-resize-on-shrinkage.
........
r53783 | georg.brandl | 2007-02-15 11:37:59 +0100 (Thu, 15 Feb 2007) | 2 lines
Make functools.wraps() docs a bit clearer.
........
r53785 | georg.brandl | 2007-02-15 12:29:04 +0100 (Thu, 15 Feb 2007) | 2 lines
Patch #1494140: Add documentation for the new struct.Struct object.
........
r53787 | georg.brandl | 2007-02-15 12:29:55 +0100 (Thu, 15 Feb 2007) | 2 lines
Add missing \versionadded.
........
r53800 | brett.cannon | 2007-02-15 23:54:39 +0100 (Thu, 15 Feb 2007) | 11 lines
Update the encoding package's search function to use absolute imports when
calling __import__. This helps make the expected search locations for encoding
modules be more explicit.
One could use an explicit value for __path__ when making the call to __import__
to force the exact location searched for encodings. This would give the most
strict search path possible if one is worried about malicious code being
imported. The unfortunate side-effect of that is that if __path__ was modified
on 'encodings' on purpose in a safe way it would not be picked up in future
__import__ calls.
........
r53801 | brett.cannon | 2007-02-16 20:33:01 +0100 (Fri, 16 Feb 2007) | 2 lines
Make the __import__ call in encodings.__init__ absolute with a level 0 call.
........
r53809 | vinay.sajip | 2007-02-16 23:36:24 +0100 (Fri, 16 Feb 2007) | 1 line
Minor fix for currentframe (SF #1652788).
........
r53818 | raymond.hettinger | 2007-02-19 03:03:19 +0100 (Mon, 19 Feb 2007) | 3 lines
Extend work on revision 52962: Eliminate redundant calls to PyObject_Hash().
........
r53820 | raymond.hettinger | 2007-02-19 05:08:43 +0100 (Mon, 19 Feb 2007) | 1 line
Add merge() function to heapq.
........
r53821 | raymond.hettinger | 2007-02-19 06:28:28 +0100 (Mon, 19 Feb 2007) | 1 line
Add tie-breaker count to preserve sort stability.
........
r53822 | raymond.hettinger | 2007-02-19 07:59:32 +0100 (Mon, 19 Feb 2007) | 1 line
Use C heapreplace() instead of slower _siftup() in pure python.
........
r53823 | raymond.hettinger | 2007-02-19 08:30:21 +0100 (Mon, 19 Feb 2007) | 1 line
Add test for merge stability
........
r53824 | raymond.hettinger | 2007-02-19 10:14:10 +0100 (Mon, 19 Feb 2007) | 1 line
Provide an example of defaultdict with non-zero constant factory function.
........
r53825 | lars.gustaebel | 2007-02-19 10:54:47 +0100 (Mon, 19 Feb 2007) | 2 lines
Moved misplaced news item.
........
r53826 | martin.v.loewis | 2007-02-19 11:55:19 +0100 (Mon, 19 Feb 2007) | 3 lines
Patch #1490190: posixmodule now includes os.chflags() and os.lchflags()
functions on platforms where the underlying system calls are available.
........
r53827 | raymond.hettinger | 2007-02-19 19:15:04 +0100 (Mon, 19 Feb 2007) | 1 line
Fixup docstrings for merge().
........
r53829 | raymond.hettinger | 2007-02-19 21:44:04 +0100 (Mon, 19 Feb 2007) | 1 line
Fixup set/dict interoperability.
........
r53837 | raymond.hettinger | 2007-02-21 06:20:38 +0100 (Wed, 21 Feb 2007) | 1 line
Add itertools.izip_longest().
........
r53838 | raymond.hettinger | 2007-02-21 18:22:05 +0100 (Wed, 21 Feb 2007) | 1 line
Remove filler struct item and fix leak.
........
2007-02-23 15:07:44 +00:00
|
|
|
| Tuple(expr* elts, expr_context ctx)
|
2005-10-20 19:59:25 +00:00
|
|
|
|
2006-03-01 22:49:05 +00:00
|
|
|
-- col_offset is the byte offset in the utf8 string the parser uses
|
|
|
|
attributes (int lineno, int col_offset)
|
2005-10-20 19:59:25 +00:00
|
|
|
|
|
|
|
expr_context = Load | Store | Del | AugLoad | AugStore | Param
|
|
|
|
|
2006-09-06 07:06:08 +00:00
|
|
|
slice = Slice(expr? lower, expr? upper, expr? step)
|
2005-10-20 19:59:25 +00:00
|
|
|
| ExtSlice(slice* dims)
|
|
|
|
| Index(expr value)
|
|
|
|
|
|
|
|
boolop = And | Or
|
|
|
|
|
|
|
|
operator = Add | Sub | Mult | Div | Mod | Pow | LShift
|
|
|
|
| RShift | BitOr | BitXor | BitAnd | FloorDiv
|
|
|
|
|
|
|
|
unaryop = Invert | Not | UAdd | USub
|
|
|
|
|
|
|
|
cmpop = Eq | NotEq | Lt | LtE | Gt | GtE | Is | IsNot | In | NotIn
|
|
|
|
|
|
|
|
comprehension = (expr target, expr iter, expr* ifs)
|
|
|
|
|
|
|
|
-- not sure what to call the first argument for raise and except
|
2006-04-21 10:40:58 +00:00
|
|
|
-- TODO(jhylton): Figure out if there is a better way to handle
|
|
|
|
-- lineno and col_offset fields, particularly when
|
|
|
|
-- ast is exposed to Python.
|
2007-01-10 18:51:35 +00:00
|
|
|
excepthandler = (expr? type, identifier? name, stmt* body, int lineno,
|
2006-04-21 10:40:58 +00:00
|
|
|
int col_offset)
|
2005-10-20 19:59:25 +00:00
|
|
|
|
2006-12-28 06:47:50 +00:00
|
|
|
arguments = (arg* args, identifier? vararg, expr? varargannotation,
|
|
|
|
arg* kwonlyargs, identifier? kwarg,
|
|
|
|
expr? kwargannotation, expr* defaults,
|
|
|
|
expr* kw_defaults)
|
|
|
|
arg = SimpleArg(identifier arg, expr? annotation)
|
|
|
|
| NestedArgs(arg* args)
|
2005-10-20 19:59:25 +00:00
|
|
|
|
|
|
|
-- keyword arguments supplied to call
|
|
|
|
keyword = (identifier arg, expr value)
|
|
|
|
|
|
|
|
-- import name with optional 'as' alias.
|
|
|
|
alias = (identifier name, identifier? asname)
|
|
|
|
}
|
2007-02-23 20:00:10 +00:00
|
|
|
|