Author: martin.v.loewis Date: Thu Dec 30 09:37:58 2010 New Revision: 87576 Log: Merged revisions 87575 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r87575 | martin.v.loewis | 2010-12-30 09:36:37 +0100 (Do, 30 Dez 2010) | 2 lines Issue #10542: Document that identifiers use XID_Start XID_Continue*. ........ Modified: python/branches/release31-maint/ (props changed) python/branches/release31-maint/Doc/reference/lexical_analysis.rst Modified: python/branches/release31-maint/Doc/reference/lexical_analysis.rst ============================================================================== --- python/branches/release31-maint/Doc/reference/lexical_analysis.rst (original) +++ python/branches/release31-maint/Doc/reference/lexical_analysis.rst Thu Dec 30 09:37:58 2010 @@ -292,9 +292,11 @@ Identifiers are unlimited in length. Case is significant. .. productionlist:: - identifier: `id_start` `id_continue`* + identifier: `xid_start` `xid_continue`* id_start: <all characters in general categories Lu, Ll, Lt, Lm, Lo, Nl, the underscore, and characters with the Other_ID_Start property> id_continue: <all characters in `id_start`, plus characters in the categories Mn, Mc, Nd, Pc and others with the Other_ID_Continue property> + xid_start: <all characters in `id_start` whose NFKC normalization is in "id_start xid_continue*"> + xid_continue: <all characters in `id_continue` whose NFKC normalization is in "id_continue*"> The Unicode category codes mentioned above stand for: @@ -308,6 +310,8 @@ * *Mc* - spacing combining marks * *Nd* - decimal numbers * *Pc* - connector punctuations +* *Other_ID_Start* - explicit list of characters in `PropList.txt <http://unicode.org/Public/UNIDATA/PropList.txt>`_ to support backwards compatibility +* *Other_ID_Continue* - likewise All identifiers are converted into the normal form NFKC while parsing; comparison of identifiers is based on NFKC.