languages/cpython
languages/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2024-09-05 16:38:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset 521232b05b97

Browse source
This commit is contained in:
Benjamin Peterson 2013-03-20 00:39:41 -05:00
parent c6dc12484b
commit 605a774a98
3 changed files with 243 additions and 267 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Grammar/Grammar
View file

@ -24,8 +24,7 @@ decorators: decorator+
decorated: decorators (classdef | funcdef)
funcdef: 'def' NAME parameters ['->' test] ':' suite
parameters: '(' [typedargslist] ')'
typedargslist: (tfpdef ['=' test] (',' tfpdef ['=' test])*
[',' '/' (',' tfpdef ['=' test])*] [','
typedargslist: (tfpdef ['=' test] (',' tfpdef ['=' test])* [','
['*' [tfpdef] (',' tfpdef ['=' test])* [',' '**' tfpdef] | '**' tfpdef]]
| '*' [tfpdef] (',' tfpdef ['=' test])* [',' '**' tfpdef] | '**' tfpdef)
tfpdef: NAME [':' test]

505
Python/graminit.c
View file

File diff suppressed because it is too large Load diff

2
Python/marshal.c
View file

@ -803,7 +803,7 @@ r_object(RFILE *p)
/* NULL is a valid return value, it does not necessarily means that
an exception is set. */
PyObject *v, *v2;
Py_ssize_t idx = 0;
Py_ssize_t idx;
long i, n;
int type = r_byte(p);
int flag;