summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/expr.n10
-rw-r--r--generic/tclStringObj.c4
-rw-r--r--tests/main.test2
3 files changed, 8 insertions, 8 deletions
diff --git a/doc/expr.n b/doc/expr.n
index 661add0..ec799f3 100644
--- a/doc/expr.n
+++ b/doc/expr.n
@@ -133,7 +133,7 @@ absolute value of the divisor, has the same sign as the divisor.
.RS
.PP
When applied to integers, division and remainder can be
-considered to partition the number line into a sequence of
+considered to partition the number line into a sequence of
adjacent non-overlapping pieces, where each piece is the size of the divisor;
the quotient identifies which piece the dividend lies within, and the
remainder identifies where within that piece the dividend lies. A
@@ -197,10 +197,10 @@ Logical OR. If both operands are false, the result is 0, or 1 otherwise.
If-then-else, as in C. If \fIx\fR is false , the result is the value of
\fIy\fR. Otherwise the result is the value of \fIz\fR.
.PP
-The exponentiation operator promotes types in the same way that the multiply
-and divide operators do, and the result is is the same as the result of
+The exponentiation operator promotes types in the same way that the multiply
+and divide operators do, and the result is is the same as the result of
\fBpow\fR.
-Exponentiation groups right-to-left within a precedence level. Other binary
+Exponentiation groups right-to-left within a precedence level. Other binary
operators group left-to-right. For example, the value of
.PP
.CS
@@ -215,7 +215,7 @@ is 0, while the value of
.PP
is 512.
.PP
-As in C, \fB&&\fR, \fB||\fR, and \fB?:\fR feature
+As in C, \fB&&\fR, \fB||\fR, and \fB?:\fR feature
.QW "lazy evaluation" ,
which means that operands are not evaluated if they are
not needed to determine the outcome. For example, in
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index f5eb32d..1bca7fa 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -2657,7 +2657,7 @@ TclStringCatObjv(
/* Value has a string rep. */
if (objPtr->length) {
/*
- * Non-empty string rep. Not a pure bytearray, so we
+ * Non-empty string rep. Not a pure bytearray, so we
* won't create a pure bytearray
*/
binary = 0;
@@ -2754,7 +2754,7 @@ TclStringCatObjv(
if (inPlace && !Tcl_IsShared(*objv)) {
int start;
-
+
objResultPtr = *objv++; objc--;
Tcl_GetByteArrayFromObj(objResultPtr, &start);
dst = Tcl_SetByteArrayLength(objResultPtr, length) + start;
diff --git a/tests/main.test b/tests/main.test
index 80d7022..ab66b38 100644
--- a/tests/main.test
+++ b/tests/main.test
@@ -16,7 +16,7 @@ namespace eval ::tcl::test::main {
# - tests use testing commands introduced in Tcltest 8.4
testConstraint Tcltest [expr {
[llength [package provide Tcltest]]
- && [package vsatisfies [package provide Tcltest] 8.4-]}]
+ && [package vsatisfies [package provide Tcltest] 8.5-]}]
# Procedure to simulate interactive typing of commands, line by line
proc type {chan script} {