Mercurial > cpython-lru_cache-weakref
diff Python/compile.c @ 33166:2e8d2bdd33de legacy-trunk
This is Mark Russell's patch:
[ 1009560 ] Fix @decorator evaluation order
From the description:
Changes in this patch:
- Change Grammar/Grammar to require
newlines between adjacent decorators.
- Fix order of evaluation of decorators
in the C (compile.c) and python
(Lib/compiler/pycodegen.py) compilers
- Add better order of evaluation check
to test_decorators.py (test_eval_order)
- Update the decorator documentation in
the reference manual (improve description
of evaluation order and update syntax
description)
and the comment:
Used Brett's evaluation order (see
http://mail.python.org/pipermail/python-dev/2004-August/047835.html)
(I'm checking this in for Anthony who was having problems getting SF to
talk to him)
| author | Michael W. Hudson <mwh@python.net> |
|---|---|
| date | Tue, 17 Aug 2004 17:29:16 +0000 |
| parents | 3db9a932775e |
| children | 5778f6331334 |
line wrap: on
line diff
--- a/Python/compile.c Tue Aug 17 16:37:12 2004 +0000 +++ b/Python/compile.c Tue Aug 17 17:29:16 2004 +0000 @@ -4107,16 +4107,17 @@ static void com_decorator(struct compiling *c, node *n) { - /* decorator: '@' dotted_name [ '(' [arglist] ')' ] */ + /* decorator: '@' dotted_name [ '(' [arglist] ')' ] NEWLINE */ int nch = NCH(n); - assert(nch >= 2); + assert(nch >= 3); REQ(CHILD(n, 0), AT); + REQ(RCHILD(n, -1), NEWLINE); com_decorator_name(c, CHILD(n, 1)); - if (nch > 2) { - assert(nch == 4 || nch == 5); + if (nch > 3) { + assert(nch == 5 || nch == 6); REQ(CHILD(n, 2), LPAR); - REQ(CHILD(n, nch - 1), RPAR); + REQ(RCHILD(n, -2), RPAR); com_call_function(c, CHILD(n, 3)); } } @@ -4124,26 +4125,20 @@ static int com_decorators(struct compiling *c, node *n) { - int i, nch, ndecorators; + int i, nch; - /* decorator ([NEWLINE] decorator)* NEWLINE */ + /* decorator+ */ nch = NCH(n); - assert(nch >= 2); - REQ(CHILD(n, nch - 1), NEWLINE); - - ndecorators = 0; - /* the application order for decorators is the reverse of how they are - listed; bottom-up */ - nch -= 1; - for (i = 0; i < nch; i+=1) { + assert(nch >= 1); + + for (i = 0; i < nch; ++i) { node *ch = CHILD(n, i); - if (TYPE(ch) != NEWLINE) { - com_decorator(c, ch); - ++ndecorators; - } - } - - return ndecorators; + REQ(ch, decorator); + + com_decorator(c, ch); + } + + return nch; } static void @@ -4151,6 +4146,7 @@ { PyObject *co; int ndefs, ndecorators; + REQ(n, funcdef); /* -6 -5 -4 -3 -2 -1 funcdef: [decorators] 'def' NAME parameters ':' suite */ @@ -4159,7 +4155,7 @@ ndecorators = com_decorators(c, CHILD(n, 0)); else ndecorators = 0; - + ndefs = com_argdefs(c, n); if (ndefs < 0) return; @@ -4179,11 +4175,13 @@ else com_addoparg(c, MAKE_FUNCTION, ndefs); com_pop(c, ndefs); + while (ndecorators > 0) { com_addoparg(c, CALL_FUNCTION, 1); com_pop(c, 1); - ndecorators--; + --ndecorators; } + com_addop_varname(c, VAR_STORE, STR(RCHILD(n, -4))); com_pop(c, 1); Py_DECREF(co);