summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2012-11-15 05:12:38 (GMT)
committerdgp <dgp@users.sourceforge.net>2012-11-15 05:12:38 (GMT)
commit05b1764f74b5b1eb40ac16bdb0349de9f47587a5 (patch)
tree97c0791362b57f112ffa470f4333c5a9d920631e
parentbff7817ec08bd66d55833181a0ed4850561e3d94 (diff)
downloadtcl-05b1764f74b5b1eb40ac16bdb0349de9f47587a5.zip
tcl-05b1764f74b5b1eb40ac16bdb0349de9f47587a5.tar.gz
tcl-05b1764f74b5b1eb40ac16bdb0349de9f47587a5.tar.bz2
Octal death documentation impacts.
-rw-r--r--doc/GetInt.312
-rw-r--r--doc/expr.n5
-rw-r--r--doc/scan.n6
3 files changed, 11 insertions, 12 deletions
diff --git a/doc/GetInt.3 b/doc/GetInt.3
index f77d337..795a5b1 100644
--- a/doc/GetInt.3
+++ b/doc/GetInt.3
@@ -55,11 +55,15 @@ of integer digits, optionally signed and optionally preceded by
white space. If the first two characters of \fIsrc\fR
after the optional white space and sign are
.QW 0x
-then \fIsrc\fR is expected to be in hexadecimal form; otherwise,
-if the first such character is
-.QW 0
+then \fIsrc\fR is expected to be in hexadecimal form.
+If the first two such characters are
+.QW 0o
then \fIsrc\fR
-is expected to be in octal form; otherwise, \fIsrc\fR is
+is expected to be in octal form.
+If the first two such characters are
+.QW 0b
+then \fIsrc\fR
+is expected to be in binary form; otherwise, \fIsrc\fR is
expected to be in decimal form.
.PP
\fBTcl_GetDouble\fR expects \fIsrc\fR to consist of a floating-point
diff --git a/doc/expr.n b/doc/expr.n
index 6d965fb..6b6e944 100644
--- a/doc/expr.n
+++ b/doc/expr.n
@@ -46,10 +46,7 @@ Where possible, operands are interpreted as integer values.
Integer values may be specified in decimal (the normal case), 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
-compatibility with older Tcl releases, an octal integer value is also
-indicated simply when the first character of the operand is \fB0\fR,
-whether or not the second character is also \fBo\fR.
+(if the first two characters of the operand are \fB0x\fR).
If an operand does not have one of the integer formats given
above, then it is treated as a floating-point number if that is
possible. Floating-point numbers may be specified in any of several
diff --git a/doc/scan.n b/doc/scan.n
index cc5ed79..3cb0320 100644
--- a/doc/scan.n
+++ b/doc/scan.n
@@ -226,12 +226,10 @@ set string "#08D03F"
\fBscan\fR $string "#%2x%2x%2x" r g b
.CE
.PP
-Parse a \fIHH:MM\fR time string, noting that this avoids problems with
-octal numbers by forcing interpretation as decimals (if we did not
-care, we would use the \fB%i\fR conversion instead):
+Parse a \fIHH:MM\fR time string:
.PP
.CS
-set string "08:08" ;# *Not* octal!
+set string "08:08"
if {[\fBscan\fR $string "%d:%d" hours minutes] != 2} {
error "not a valid time string"
}