mirror of
https://github.com/python/cpython.git
synced 2024-11-24 17:47:13 +01:00
992d4a3e6e
svn+ssh://pythondev@svn.python.org/python/branches/p3yk ................ r56155 | neal.norwitz | 2007-07-03 08:59:08 +0300 (Tue, 03 Jul 2007) | 1 line Get this test working after converting map to return an iterator ................ r56202 | neal.norwitz | 2007-07-09 04:30:09 +0300 (Mon, 09 Jul 2007) | 37 lines Merged revisions 56124-56201 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r56129 | georg.brandl | 2007-06-30 04:01:01 -0700 (Sat, 30 Jun 2007) | 2 lines Document smtp.SMTPAuthenticationError. ........ r56137 | georg.brandl | 2007-07-01 01:11:35 -0700 (Sun, 01 Jul 2007) | 2 lines Fix a few webbrowser.py problems. ........ r56143 | georg.brandl | 2007-07-02 04:54:28 -0700 (Mon, 02 Jul 2007) | 2 lines Remove duplicate sentence from alarm() doc. ........ r56170 | mark.hammond | 2007-07-03 19:03:10 -0700 (Tue, 03 Jul 2007) | 3 lines copy built files to the PCBuild directory, where tools like distutils or external build processes can find them. ........ r56176 | kurt.kaiser | 2007-07-05 15:03:39 -0700 (Thu, 05 Jul 2007) | 10 lines Many calls to tk.call involve an arglist containing a single tuple. Calls using METH_OLDARGS unpack this tuple; calls using METH_VARARG don't. Tcl's concatenation of args was affected; IDLE doesn't start. Modify Tkapp_Call() to unpack single tuple arglists. Bug 1733943 Ref http://mail.python.org/pipermail/python-checkins/2007-May/060454.html ........ r56177 | neal.norwitz | 2007-07-05 21:13:39 -0700 (Thu, 05 Jul 2007) | 1 line Fix typo in comment ........ ................ r56251 | neal.norwitz | 2007-07-11 10:01:01 +0300 (Wed, 11 Jul 2007) | 1 line Get working with map returning an iterator (had to fix whitespace too) ................ r56255 | thomas.wouters | 2007-07-11 13:41:37 +0300 (Wed, 11 Jul 2007) | 6 lines Clean up merge glitch or copy-paste error (the entire module was duplicated, except the first half even had some more copy-paste errors, referring to listcomps and genexps instead of setcomps) ................ r56256 | thomas.wouters | 2007-07-11 15:16:01 +0300 (Wed, 11 Jul 2007) | 14 lines Dict comprehensions. Still needs doc changes (like many python-3000 features ;-). It generates bytecode similar to: x = {} for k, v in (generator here): x[k] = v except there is no tuple-packing and -unpacking involved. Trivial measurement suggests it's significantly faster than dict(generator here) (in the order of 2 to 3 times as fast) but I have not done extensive measurements. ................ r56263 | guido.van.rossum | 2007-07-11 15:36:26 +0300 (Wed, 11 Jul 2007) | 3 lines Patch 1724999 by Ali Gholami Rudi -- avoid complaints about dict size change during iter in destroy call. ................
124 lines
4.4 KiB
Plaintext
124 lines
4.4 KiB
Plaintext
-- ASDL's five builtin types are identifier, int, string, object
|
|
|
|
module Python version "$Revision$"
|
|
{
|
|
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,
|
|
stmt* body, expr* decorator_list, expr? returns)
|
|
| ClassDef(identifier name,
|
|
expr* bases,
|
|
keyword* keywords,
|
|
expr? starargs,
|
|
expr? kwargs,
|
|
stmt* body,
|
|
expr *decorator_list)
|
|
| 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)
|
|
| With(expr context_expr, expr? optional_vars, stmt* body)
|
|
|
|
-- '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)
|
|
| ImportFrom(identifier module, alias* names, int? level)
|
|
|
|
| Global(identifier* names)
|
|
| Nonlocal(identifier* names)
|
|
| Expr(expr value)
|
|
| Pass | Break | Continue
|
|
|
|
-- XXX Jython will be different
|
|
-- col_offset is the byte offset in the utf8 string the parser uses
|
|
attributes (int lineno, int col_offset)
|
|
|
|
-- 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)
|
|
| IfExp(expr test, expr body, expr orelse)
|
|
| Dict(expr* keys, expr* values)
|
|
| Set(expr* elts)
|
|
| ListComp(expr elt, comprehension* generators)
|
|
| SetComp(expr elt, comprehension* generators)
|
|
| DictComp(expr key, expr value, comprehension* generators)
|
|
| GeneratorExp(expr elt, comprehension* generators)
|
|
-- the grammar constrains where yield expressions can occur
|
|
| 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?
|
|
| Bytes(string s)
|
|
| Ellipsis
|
|
-- 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)
|
|
| Starred(expr value, expr_context ctx)
|
|
| Name(identifier id, expr_context ctx)
|
|
| List(expr* elts, expr_context ctx)
|
|
| Tuple(expr* elts, expr_context ctx)
|
|
|
|
-- col_offset is the byte offset in the utf8 string the parser uses
|
|
attributes (int lineno, int col_offset)
|
|
|
|
expr_context = Load | Store | Del | AugLoad | AugStore | Param
|
|
|
|
slice = Slice(expr? lower, expr? upper, expr? step)
|
|
| 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
|
|
-- TODO(jhylton): Figure out if there is a better way to handle
|
|
-- lineno and col_offset fields, particularly when
|
|
-- ast is exposed to Python.
|
|
excepthandler = (expr? type, identifier? name, stmt* body, int lineno,
|
|
int col_offset)
|
|
|
|
arguments = (arg* args, identifier? vararg, expr? varargannotation,
|
|
arg* kwonlyargs, identifier? kwarg,
|
|
expr? kwargannotation, expr* defaults,
|
|
expr* kw_defaults)
|
|
arg = (identifier arg, expr? annotation)
|
|
|
|
-- keyword arguments supplied to call
|
|
keyword = (identifier arg, expr value)
|
|
|
|
-- import name with optional 'as' alias.
|
|
alias = (identifier name, identifier? asname)
|
|
}
|
|
|