diff options
| -rw-r--r-- | ChangeLog.2000 | 2 | ||||
| -rw-r--r-- | generic/tclCmdIL.c | 4 | ||||
| -rw-r--r-- | generic/tclFileName.c | 2 | ||||
| -rw-r--r-- | generic/tclUtf.c | 6 | ||||
| -rw-r--r-- | tests/lsearch.test | 4 | ||||
| -rw-r--r-- | tests/utf.test | 2 | ||||
| -rw-r--r-- | tools/mkdepend.tcl | 2 |
7 files changed, 11 insertions, 11 deletions
diff --git a/ChangeLog.2000 b/ChangeLog.2000 index 5b62351..7e78c19 100644 --- a/ChangeLog.2000 +++ b/ChangeLog.2000 @@ -1779,7 +1779,7 @@ * generic/tclCmdMZ.c: Fixed infinite loop bug with [regexp -all] [Bug: 4981]. - * tests/*.test: Changed all occurances of "namespace import + * tests/*.test: Changed all occurrences of "namespace import ::tcltest" to "namespace import -force ::tcltest" [Bug: 3948]. 2000-04-09 Brent Welch <welch@scriptics.com> diff --git a/generic/tclCmdIL.c b/generic/tclCmdIL.c index 7938088..60331f5 100644 --- a/generic/tclCmdIL.c +++ b/generic/tclCmdIL.c @@ -3640,11 +3640,11 @@ Tcl_LsearchObjCmd( /* * Normally, binary search is written to stop when it finds a * match. If there are duplicates of an element in the list, - * our first match might not be the first occurance. + * our first match might not be the first occurrence. * Consider: 0 0 0 1 1 1 2 2 2 * * To maintain consistancy with standard lsearch semantics, we - * must find the leftmost occurance of the pattern in the + * must find the leftmost occurrence of the pattern in the * list. Thus we don't just stop searching here. This * variation means that a search always makes log n * comparisons (normal binary search might "get lucky" with an diff --git a/generic/tclFileName.c b/generic/tclFileName.c index 32b217f..5705a11 100644 --- a/generic/tclFileName.c +++ b/generic/tclFileName.c @@ -2055,7 +2055,7 @@ TclGlob( * SkipToChar -- * * This function traverses a glob pattern looking for the next unquoted - * occurance of the specified character at the same braces nesting level. + * occurrence of the specified character at the same braces nesting level. * * Results: * Updates stringPtr to point to the matching character, or to the end of diff --git a/generic/tclUtf.c b/generic/tclUtf.c index 5951f68..eb10878 100644 --- a/generic/tclUtf.c +++ b/generic/tclUtf.c @@ -847,7 +847,7 @@ Tcl_NumUtfChars( src += TclUtfToUniChar(src, &ch); } else { /* - * src points to incomplete UTF-8 sequence + * src points to incomplete UTF-8 sequence * Treat first byte as character and count it */ src++; @@ -863,7 +863,7 @@ Tcl_NumUtfChars( * * Tcl_UtfFindFirst -- * - * Returns a pointer to the first occurance of the given Unicode character + * Returns a pointer to the first occurrence of the given Unicode character * in the NULL-terminated UTF-8 string. The NULL terminator is considered * part of the UTF-8 string. Equivalent to Plan 9 utfrune(). * @@ -900,7 +900,7 @@ Tcl_UtfFindFirst( * * Tcl_UtfFindLast -- * - * Returns a pointer to the last occurance of the given Unicode character + * Returns a pointer to the last occurrence of the given Unicode character * in the NULL-terminated UTF-8 string. The NULL terminator is considered * part of the UTF-8 string. Equivalent to Plan 9 utfrrune(). * diff --git a/tests/lsearch.test b/tests/lsearch.test index b188924..2086615 100644 --- a/tests/lsearch.test +++ b/tests/lsearch.test @@ -149,14 +149,14 @@ test lsearch-5.2 {binary search} { } set res } $decreasingIntegers -test lsearch-5.3 {binary search finds leftmost occurances} { +test lsearch-5.3 {binary search finds leftmost occurrences} { set res {} for {set i 0} {$i < 10} {incr i} { lappend res [lsearch -integer -sorted $repeatingIncreasingIntegers $i] } set res } [list 0 5 10 15 20 25 30 35 40 45] -test lsearch-5.4 {binary search -decreasing finds leftmost occurances} { +test lsearch-5.4 {binary search -decreasing finds leftmost occurrences} { set res {} for {set i 9} {$i >= 0} {incr i -1} { lappend res [lsearch -sorted -integer -decreasing \ diff --git a/tests/utf.test b/tests/utf.test index 47e0628..0c1cc0c 100644 --- a/tests/utf.test +++ b/tests/utf.test @@ -173,7 +173,7 @@ test utf-4.12.0 {Tcl_NumUtfChars: #4-byte UTF-8 character} {testnumutfchars test test utf-4.12.1 {Tcl_NumUtfChars: #4-byte UTF-8 character} {testnumutfchars testbytestring ucs4} { testnumutfchars [testbytestring \xF0\x9F\x92\xA9] end } 1 -test utf-4.13 {Tcl_NumUtfChars: end of string} {testnumutfchars testbytestring} { +test utf-4.13 {Tcl_NumUtfChars: end of string} {testnumutfchars testbytestring} { testnumutfchars foobar[testbytestring \xF2\xC2\xA0] end } 8 diff --git a/tools/mkdepend.tcl b/tools/mkdepend.tcl index ecb2206..3d96a5e 100644 --- a/tools/mkdepend.tcl +++ b/tools/mkdepend.tcl @@ -98,7 +98,7 @@ proc readDepends {chan} { } else { # don't include ourselves as a dependency of ourself. if {![string compare $fname $target]} {continue} - # store in an array so multiple occurances are not counted. + # store in an array so multiple occurrences are not counted. set depends($target|$fname) "" } } |