summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2017-06-14 07:54:51 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2017-06-14 07:54:51 (GMT)
commitb7a1ba3ba40ba71b65cefedc057bbccf0323f4a5 (patch)
treefd3f725641f7ff06608e6e77394d4bcefb5ef3ec /doc
parentf019737860823b97cfde68d64a5175fa21c3a967 (diff)
parent78e17f7f0cce0233cc1009b3f7c3aa2ea32763d7 (diff)
downloadtcl-b7a1ba3ba40ba71b65cefedc057bbccf0323f4a5.zip
tcl-b7a1ba3ba40ba71b65cefedc057bbccf0323f4a5.tar.gz
tcl-b7a1ba3ba40ba71b65cefedc057bbccf0323f4a5.tar.bz2
Rebase to core-8-6-branch (who told that fossil doesn't know how to rebase ....)
Diffstat (limited to 'doc')
-rw-r--r--doc/GetInt.39
-rw-r--r--doc/expr.n3
-rw-r--r--doc/format.n2
3 files changed, 10 insertions, 4 deletions
diff --git a/doc/GetInt.3 b/doc/GetInt.3
index 3e7204c..eba549d 100644
--- a/doc/GetInt.3
+++ b/doc/GetInt.3
@@ -4,7 +4,7 @@
'\"
'\" See the file "license.terms" for information on usage and redistribution
'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
+'\"
.TH Tcl_GetInt 3 "" Tcl "Tcl Library Procedures"
.so man.macros
.BS
@@ -57,6 +57,9 @@ after the optional white space and sign are
.QW \fB0x\fR
then \fIsrc\fR is expected to be in hexadecimal form; otherwise,
if the first such characters are
+.QW \fB0d\fR
+then \fIsrc\fR is expected to be in decimal form; otherwise,
+if the first such characters are
.QW \fB0o\fR
then \fIsrc\fR is expected to be in octal form; otherwise,
if the first such characters are
@@ -65,8 +68,8 @@ then \fIsrc\fR is expected to be in binary form; otherwise,
if the first such character is
.QW \fB0\fR
then \fIsrc\fR
-is expected to be in octal form; otherwise, \fIsrc\fR is
-expected to be in decimal form.
+is expected to be in octal form; otherwise, \fIsrc\fR
+is expected to be in decimal form.
.PP
\fBTcl_GetDouble\fR expects \fIsrc\fR to consist of a floating-point
number, which is: white space; a sign; a sequence of digits; a
diff --git a/doc/expr.n b/doc/expr.n
index b76b6a2..b2723c7 100644
--- a/doc/expr.n
+++ b/doc/expr.n
@@ -43,7 +43,8 @@ parentheses and commas.
White space may be used between the operands and operators and
parentheses (or commas); it is ignored by the expression's instructions.
Where possible, operands are interpreted as integer values.
-Integer values may be specified in decimal (the normal case), in binary
+Integer values may be specified in decimal (the normal case, the optional
+first two characters are \fB0d\fR), in binary
(if the first two characters of the operand are \fB0b\fR), in octal
(if the first two characters of the operand are \fB0o\fR), or in hexadecimal
(if the first two characters of the operand are \fB0x\fR). For
diff --git a/doc/format.n b/doc/format.n
index ba044f2..4eb566d 100644
--- a/doc/format.n
+++ b/doc/format.n
@@ -89,6 +89,8 @@ For \fBx\fR or \fBX\fR conversions, \fB0x\fR or \fB0X\fR (respectively)
will be added to the beginning of the result unless it is zero.
For \fBb\fR conversions, \fB0b\fR
will be added to the beginning of the result unless it is zero.
+For \fBd\fR conversions, \fB0d\fR will be added to the beginning
+of the result unless it is zero.
For all floating-point conversions (\fBe\fR, \fBE\fR, \fBf\fR,
\fBg\fR, and \fBG\fR) it guarantees that the result always
has a decimal point.