[Python-checkins] python/dist/src/Doc/ref ref5.tex,1.62,1.63

fdrake@users.sourceforge.net fdrake@users.sourceforge.net
Thu, 20 Jun 2002 07:23:18 -0700


Update of /cvsroot/python/python/dist/src/Doc/ref
In directory usw-pr-cvs1:/tmp/cvs-serv24043

Modified Files:
	ref5.tex 
Log Message:
Simplify the production for argument list, making sure that it
actually allows all the legal syntax, and nothing else.  Previously,
it did not allow a call like func(arg, **dictionary).
This closes (again!) SF bug #493243.


Index: ref5.tex
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/ref/ref5.tex,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** ref5.tex	18 Jun 2002 18:42:01 -0000	1.62
--- ref5.tex	20 Jun 2002 14:23:15 -0000	1.63
***************
*** 423,430 ****
               {\token{primary} "(" [\token{argument_list} [","]] ")"}
    \production{argument_list}
!              {\token{positional_arguments} ["," \token{keyword_arguments}
!               ["," "*" \token{expression} ["," "**" \token{expression}]]]}
!   \productioncont{| \token{keyword_arguments} ["," "*" \token{expression}
!                                                ["," "**" \token{expression}]]}
    \productioncont{| "*" \token{expression} ["," "**" \token{expression}]}
    \productioncont{| "**" \token{expression}}
--- 423,430 ----
               {\token{primary} "(" [\token{argument_list} [","]] ")"}
    \production{argument_list}
!              {\token{positional_arguments} ["," \token{keyword_arguments}]
!               ["," "*" \token{expression}] ["," "**" \token{expression}]}
!   \productioncont{| \token{keyword_arguments} ["," "*" \token{expression}]
!                                                ["," "**" \token{expression}]}
    \productioncont{| "*" \token{expression} ["," "**" \token{expression}]}
    \productioncont{| "**" \token{expression}}