mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 11:44:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Jiwon Seo's PEP 3102 implementation.

Browse source 
See SF#1549670.
The compiler package has not yet been updated.
This commit is contained in:
Guido van Rossum 2006-10-27 23:31:49 +00:00
parent fc2a0a8e3c
commit 4f72a78684
31 changed files with 739 additions and 227 deletions
Download patch file Download diff file Expand all files Collapse all files

42
Modules/parsermodule.c
View file

@ -1105,13 +1105,13 @@ validate_testlist_safe(node *tree)
}
/* '*' NAME [',' '**' NAME] | '**' NAME
/* '*' [NAME] (',' NAME ['=' test])* [',' '**' NAME] | '**' NAME
*/
static int
validate_varargslist_trailer(node *tree, int start)
{
int nch = NCH(tree);
int res = 0;
int res = 0, i;
int sym;
if (nch <= start) {
@ -1121,15 +1121,40 @@ validate_varargslist_trailer(node *tree, int start)
sym = TYPE(CHILD(tree, start));
if (sym == STAR) {
/*
* ('*' NAME [',' '**' NAME]
* '*' [NAME] (',' NAME ['=' test])* [',' '**' NAME] | '**' NAME
*/
if (nch-start == 2)
res = validate_name(CHILD(tree, start+1), NULL);
else if (nch-start == 5)
else if (nch-start == 5 && TYPE(CHILD(tree, start+2)) == COMMA)
res = (validate_name(CHILD(tree, start+1), NULL)
&& validate_comma(CHILD(tree, start+2))
&& validate_doublestar(CHILD(tree, start+3))
&& validate_name(CHILD(tree, start+4), NULL));
else {
/* skip over [NAME] (',' NAME ['=' test])* */
i = start + 1;
if (TYPE(CHILD(tree, i)) == NAME) { /* skip over [NAME] */
i += 1;
}
while (res && i+1 < nch) { /* validate (',' NAME ['=' test])* */
res = validate_comma(CHILD(tree, i));
if (TYPE(CHILD(tree, i+1)) == DOUBLESTAR)
break;
res = res && validate_name(CHILD(tree, i+1), NULL);
if (res && i+2 < nch && TYPE(CHILD(tree, i+2)) == EQUAL) {
res = res && (i+3 < nch)
&& validate_test(CHILD(tree, i+3));
i += 4;
}
else {
i += 2;
}
}
/* [',' '**' NAME] */
if (res && i+1 < nch && TYPE(CHILD(tree, i+1)) == DOUBLESTAR) {
res = validate_name(CHILD(tree, i+2), NULL);
}
}
}
else if (sym == DOUBLESTAR) {
/*
@ -1148,9 +1173,8 @@ validate_varargslist_trailer(node *tree, int start)
*
* varargslist:
* (fpdef ['=' test] ',')*
* ('*' NAME [',' '**' NAME]
* | '**' NAME)
* | fpdef ['=' test] (',' fpdef ['=' test])* [',']
* ('*' [NAME] (',' NAME ['=' test])* [',' '**' NAME] | '**' NAME)
* | fpdef ['=' test] (',' fpdef ['=' test])* [',']
*
*/
static int
@ -1169,7 +1193,7 @@ validate_varargslist(node *tree)
sym = TYPE(CHILD(tree, 0));
if (sym == STAR || sym == DOUBLESTAR)
/* whole thing matches:
* '*' NAME [',' '**' NAME] | '**' NAME
* '*' [NAME] (',' NAME ['=' test])* [',' '**' NAME] | '**' NAME
*/
res = validate_varargslist_trailer(tree, 0);
else if (sym == fpdef) {
@ -1201,7 +1225,7 @@ validate_varargslist(node *tree)
break;
}
}
/* ... '*' NAME [',' '**' NAME] | '**' NAME
/* .. ('*' [NAME] (',' NAME ['=' test])* [',' '**' NAME] | '**' NAME)
* i --^^^
*/
if (res)