diff options
| author | Benjamin Peterson <benjamin@python.org> | 2008-10-30 23:00:52 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2008-10-30 23:00:52 (GMT) |
| commit | f4d016f38a48e15823021b969aa66cabd0f679a8 (patch) | |
| tree | b547fe15f78300b11a0944e89a0dd36f0c9eeaaf /Doc/reference | |
| parent | 8efccfdfd17ce2aaf176f7462cf8086e1282b985 (diff) | |
| download | cpython-f4d016f38a48e15823021b969aa66cabd0f679a8.zip cpython-f4d016f38a48e15823021b969aa66cabd0f679a8.tar.gz cpython-f4d016f38a48e15823021b969aa66cabd0f679a8.tar.bz2 | |
Merged revisions 67060-67061 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67060 | benjamin.peterson | 2008-10-30 17:39:25 -0500 (Thu, 30 Oct 2008) | 1 line
backport bin() documentation
........
r67061 | benjamin.peterson | 2008-10-30 17:44:18 -0500 (Thu, 30 Oct 2008) | 1 line
finish backporting binary literals and new octal literals docs
........
Diffstat (limited to 'Doc/reference')
| -rw-r--r-- | Doc/reference/lexical_analysis.rst | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Doc/reference/lexical_analysis.rst b/Doc/reference/lexical_analysis.rst index b548722..f05b91b 100644 --- a/Doc/reference/lexical_analysis.rst +++ b/Doc/reference/lexical_analysis.rst @@ -605,6 +605,7 @@ Numeric literals single: long integer literal single: floating point literal single: hexadecimal literal + single: binary literal single: octal literal single: decimal literal single: imaginary literal @@ -629,12 +630,14 @@ definitions: .. productionlist:: longinteger: `integer` ("l" | "L") - integer: `decimalinteger` | `octinteger` | `hexinteger` + integer: `decimalinteger` | `octinteger` | `hexinteger` | `bininteger` decimalinteger: `nonzerodigit` `digit`* | "0" - octinteger: "0" `octdigit`+ + octinteger: "0" ("o" | "O") `octdigit`+ | "0" `octdigit`+ hexinteger: "0" ("x" | "X") `hexdigit`+ + bininteger: "0" ("b" | "B") `bindigit`+ nonzerodigit: "1"..."9" octdigit: "0"..."7" + bindigit: "0" | "1" hexdigit: `digit` | "a"..."f" | "A"..."F" Although both lower case ``'l'`` and upper case ``'L'`` are allowed as suffix |