diff options
| author | Benjamin Peterson <benjamin@python.org> | 2008-10-30 22:44:18 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2008-10-30 22:44:18 (GMT) |
| commit | d79af0fc52ef13c531ca4dfb6bf96359626765a3 (patch) | |
| tree | 61fd926bcbdcf3f389932c1b4ac94c57bd0388e1 | |
| parent | b5f8208b49bbe399efaf7b246b47acf6e5dc8487 (diff) | |
| download | cpython-d79af0fc52ef13c531ca4dfb6bf96359626765a3.zip cpython-d79af0fc52ef13c531ca4dfb6bf96359626765a3.tar.gz cpython-d79af0fc52ef13c531ca4dfb6bf96359626765a3.tar.bz2 | |
finish backporting binary literals and new octal literals docs
| -rw-r--r-- | Doc/library/stdtypes.rst | 17 | ||||
| -rw-r--r-- | Doc/reference/lexical_analysis.rst | 4 |
2 files changed, 12 insertions, 9 deletions
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst index 737ea97..f5a4e6c 100644 --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -246,14 +246,15 @@ Complex numbers have a real and imaginary part, which are each implemented using pair: octal; literals Numbers are created by numeric literals or as the result of built-in functions -and operators. Unadorned integer literals (including hex and octal numbers) -yield plain integers unless the value they denote is too large to be represented -as a plain integer, in which case they yield a long integer. Integer literals -with an ``'L'`` or ``'l'`` suffix yield long integers (``'L'`` is preferred -because ``1l`` looks too much like eleven!). Numeric literals containing a -decimal point or an exponent sign yield floating point numbers. Appending -``'j'`` or ``'J'`` to a numeric literal yields a complex number with a zero real -part. A complex numeric literal is the sum of a real and an imaginary part. +and operators. Unadorned integer literals (including binary, hex, and octal +numbers) yield plain integers unless the value they denote is too large to be +represented as a plain integer, in which case they yield a long integer. +Integer literals with an ``'L'`` or ``'l'`` suffix yield long integers (``'L'`` +is preferred because ``1l`` looks too much like eleven!). Numeric literals +containing a decimal point or an exponent sign yield floating point numbers. +Appending ``'j'`` or ``'J'`` to a numeric literal yields a complex number with a +zero real part. A complex numeric literal is the sum of a real and an imaginary +part. .. index:: single: arithmetic diff --git a/Doc/reference/lexical_analysis.rst b/Doc/reference/lexical_analysis.rst index 03e4c05..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 @@ -631,11 +632,12 @@ definitions: longinteger: `integer` ("l" | "L") 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 |