summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2016-11-04 11:38:09 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2016-11-04 11:38:09 (GMT)
commit179ed8faa4d8ab47fdb8ae6701308b73f8ce440b (patch)
tree722adc5a7c81396cdd5aaff3f6aa12d2086cac74
parent2ed49a3c8102564e96352e3b8cc77f234adcae6e (diff)
parent0f21498784cb704ce6098fcc71b786e422fb2b8d (diff)
downloadtcl-179ed8faa4d8ab47fdb8ae6701308b73f8ce440b.zip
tcl-179ed8faa4d8ab47fdb8ae6701308b73f8ce440b.tar.gz
tcl-179ed8faa4d8ab47fdb8ae6701308b73f8ce440b.tar.bz2
Make packages msgcat and tcltest work unmodified in "novem". Make more test-cases work unmodified in "novem".
-rw-r--r--doc/expr.n10
-rw-r--r--generic/tclStringObj.c4
-rw-r--r--library/msgcat/msgcat.tcl2
-rw-r--r--library/tcltest/tcltest.tcl2
-rw-r--r--tests/all.tcl2
-rw-r--r--tests/main.test2
-rw-r--r--tests/msgcat.test2
-rw-r--r--tests/safe.test2
-rw-r--r--tests/tm.test2
9 files changed, 14 insertions, 14 deletions
diff --git a/doc/expr.n b/doc/expr.n
index 89c982c..cbb2395 100644
--- a/doc/expr.n
+++ b/doc/expr.n
@@ -135,7 +135,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
@@ -199,10 +199,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
@@ -217,7 +217,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 7fd7cc1..b486106 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -2656,7 +2656,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;
@@ -2753,7 +2753,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/library/msgcat/msgcat.tcl b/library/msgcat/msgcat.tcl
index a43f13e..928474d 100644
--- a/library/msgcat/msgcat.tcl
+++ b/library/msgcat/msgcat.tcl
@@ -11,7 +11,7 @@
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-package require Tcl 8.5
+package require Tcl 8.5-
# When the version number changes, be sure to update the pkgIndex.tcl file,
# and the installation directory in the Makefiles.
package provide msgcat 1.6.0
diff --git a/library/tcltest/tcltest.tcl b/library/tcltest/tcltest.tcl
index cde2660..75975d2 100644
--- a/library/tcltest/tcltest.tcl
+++ b/library/tcltest/tcltest.tcl
@@ -16,7 +16,7 @@
# Contributions from Don Porter, NIST, 2002. (not subject to US copyright)
# All rights reserved.
-package require Tcl 8.5 ;# -verbose line uses [info frame]
+package require Tcl 8.5- ;# -verbose line uses [info frame]
namespace eval tcltest {
# When the version number changes, be sure to update the pkgIndex.tcl file,
diff --git a/tests/all.tcl b/tests/all.tcl
index 0a6f57f..69a16ba 100644
--- a/tests/all.tcl
+++ b/tests/all.tcl
@@ -11,7 +11,7 @@
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
package prefer latest
-package require Tcl 8.5
+package require Tcl 8.5-
package require tcltest 2.2
namespace import tcltest::*
configure {*}$argv -testdir [file dir [info script]]
diff --git a/tests/main.test b/tests/main.test
index 96af066..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} {
diff --git a/tests/msgcat.test b/tests/msgcat.test
index e69220e..1c3ce58 100644
--- a/tests/msgcat.test
+++ b/tests/msgcat.test
@@ -12,7 +12,7 @@
# Note that after running these tests, entries will be left behind in the
# message catalogs for locales foo, foo_BAR, and foo_BAR_baz.
-package require Tcl 8.5
+package require Tcl 8.5-
if {[catch {package require tcltest 2}]} {
puts stderr "Skipping tests in [info script]. tcltest 2 required."
return
diff --git a/tests/safe.test b/tests/safe.test
index 6c9c6c9..e43ce12 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -10,7 +10,7 @@
# See the file "license.terms" for information on usage and redistribution of
# this file, and for a DISCLAIMER OF ALL WARRANTIES.
-package require Tcl 8.5
+package require Tcl 8.5-
if {[lsearch [namespace children] ::tcltest] == -1} {
package require tcltest 2
diff --git a/tests/tm.test b/tests/tm.test
index a4dafe0..567d351 100644
--- a/tests/tm.test
+++ b/tests/tm.test
@@ -6,7 +6,7 @@
# Copyright (c) 2004 by Donal K. Fellows.
# All rights reserved.
-package require Tcl 8.5
+package require Tcl 8.5-
if {"::tcltest" ni [namespace children]} {
package require tcltest 2
namespace import -force ::tcltest::*