From c1b028ab94a290687230d8dc89bbd166193574e1 Mon Sep 17 00:00:00 2001 From: dkf Date: Sat, 14 Feb 2026 15:23:10 +0000 Subject: [PATCH] Shorten sequences of multiple blank lines --- generic/tclCmdIL.c | 1 - generic/tclCompCmds.c | 1 - generic/tclEncoding.c | 11 ++---- generic/tclInt.h | 1 - generic/tclIntDecls.h | 1 - generic/tclInterp.c | 1 - generic/tclOODecls.h | 1 - generic/tclOODefineCmds.c | 1 - generic/tclProc.c | 1 - generic/tclStrToD.c | 1 - generic/tclTest.c | 2 -- generic/tclTestABSList.c | 2 -- generic/tclZipfs.c | 1 - library/auto.tcl | 1 - library/http/http.tcl | 24 -------------- library/init.tcl | 1 - library/install.tcl | 1 - library/opt/optparse.tcl | 9 ----- library/platform/platform.tcl | 1 - library/safe.tcl | 2 -- tests-perf/chan.perf.tcl | 2 -- tests-perf/file.perf.tcl | 2 -- tests-perf/list.perf.tcl | 2 -- tests-perf/listPerf.tcl | 2 -- tests-perf/timer-event.perf.tcl | 2 -- tests/encodingVectors.tcl | 1 - tests/httpTest.tcl | 1 - tests/httpTestScript.tcl | 3 -- tests/icuUcmTests.tcl | 1 - tests/tcltests.tcl | 4 --- tests/ucdUtils.tcl | 59 ++++++++++++++++----------------- tools/checkLibraryDoc.tcl | 1 - tools/findBadExternals.tcl | 2 -- tools/index.tcl | 5 --- tools/loadICU.tcl | 2 -- tools/mkdepend.tcl | 2 -- tools/tcltk-man2html.tcl | 1 - unix/tclUnixThrd.c | 1 - win/tclWinInt.h | 2 -- win/tclWinSerial.c | 1 - 40 files changed, 31 insertions(+), 129 deletions(-) diff --git a/generic/tclCmdIL.c b/generic/tclCmdIL.c index 2e05721ba6..a5544da3f2 100644 --- a/generic/tclCmdIL.c +++ b/generic/tclCmdIL.c @@ -4206,7 +4206,6 @@ Tcl_LseqObjCmd( } } - /* * Success! Now lets create the series object. */ diff --git a/generic/tclCompCmds.c b/generic/tclCompCmds.c index 8c35c8420e..2ae234338f 100644 --- a/generic/tclCompCmds.c +++ b/generic/tclCompCmds.c @@ -1564,7 +1564,6 @@ TclCompileDictMergeCmd( } OP( END_CATCH); - /* * Clean up any state left over. */ diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c index f3a64e82d3..ec5ad6c208 100644 --- a/generic/tclEncoding.c +++ b/generic/tclEncoding.c @@ -986,7 +986,6 @@ Tcl_SetSystemEncoding( { Tcl_Encoding encoding = NULL; - if (name && *name) { encoding = Tcl_GetEncoding(interp, name); /* this increases refCount */ if (encoding == NULL) { @@ -999,11 +998,7 @@ Tcl_SetSystemEncoding( if ((encoding ? encoding : defaultEncoding) == systemEncoding) { if (encoding) { Tcl_FreeEncoding(encoding); /* paired to Tcl_GetEncoding */ - - } - - return TCL_OK; } @@ -1385,7 +1380,6 @@ Tcl_ExternalToUtf( result = TCL_ERROR; } - if (srcReadPtr) { *srcReadPtr = (int)srcRead; } @@ -1545,9 +1539,8 @@ Tcl_ExternalToUtfEx( } result = encodingPtr->toUtfProc(encodingPtr->clientData, src, - chunkSrcLen, chunkFlags, statePtr, dst, chunkDstLen, &chunkSrcRead, - &chunkDstWritten, &chunkDstChars); - + chunkSrcLen, chunkFlags, statePtr, dst, chunkDstLen, + &chunkSrcRead, &chunkDstWritten, &chunkDstChars); assert(chunkSrcRead <= srcBytesLeft); srcBytesLeft -= chunkSrcRead; diff --git a/generic/tclInt.h b/generic/tclInt.h index 6e749c05d5..ce2d525999 100644 --- a/generic/tclInt.h +++ b/generic/tclInt.h @@ -2048,7 +2048,6 @@ typedef struct Interp { Namespace *lookupNsPtr; /* Namespace to use ONLY on the next * TCL_EVAL_INVOKE call to Tcl_EvalObjv. */ - /* * Information about packages. Used only in tclPkg.c. */ diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h index d147ca26c2..0fbee17203 100644 --- a/generic/tclIntDecls.h +++ b/generic/tclIntDecls.h @@ -15,7 +15,6 @@ #ifndef _TCLINTDECLS #define _TCLINTDECLS - #undef TCL_STORAGE_CLASS #ifdef BUILD_tcl # define TCL_STORAGE_CLASS DLLEXPORT diff --git a/generic/tclInterp.c b/generic/tclInterp.c index 46f68a5308..b4f8a71a38 100644 --- a/generic/tclInterp.c +++ b/generic/tclInterp.c @@ -4378,7 +4378,6 @@ Tcl_LimitSetTime( Interp *iPtr = (Interp *) interp; long long nextMoment; - iPtr->limit.time = *timeLimitPtr; if (iPtr->limit.timeEvent != NULL) { Tcl_DeleteTimerHandler(iPtr->limit.timeEvent); diff --git a/generic/tclOODecls.h b/generic/tclOODecls.h index cba1315300..c9d9c1718c 100644 --- a/generic/tclOODecls.h +++ b/generic/tclOODecls.h @@ -281,7 +281,6 @@ extern const TclOOStubs *tclOOStubsPtr; # undef Tcl_NewMethod #endif - #if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) #ifndef TclOOGeneric /* Select method based on type of argument. */ diff --git a/generic/tclOODefineCmds.c b/generic/tclOODefineCmds.c index b5b0decefc..6832db2895 100644 --- a/generic/tclOODefineCmds.c +++ b/generic/tclOODefineCmds.c @@ -2018,7 +2018,6 @@ TclOODefineDestructorObjCmd( return TCL_ERROR; } - (void) TclGetStringFromObj(objv[1], &bodyLength); if (bodyLength > 0) { /* diff --git a/generic/tclProc.c b/generic/tclProc.c index 19db684821..bc08e0df17 100644 --- a/generic/tclProc.c +++ b/generic/tclProc.c @@ -1687,7 +1687,6 @@ TclObjInterpProc( } #endif /* TCL_NO_DEPRECATED */ - /* *---------------------------------------------------------------------- * diff --git a/generic/tclStrToD.c b/generic/tclStrToD.c index 0cd9acd497..9609d24394 100644 --- a/generic/tclStrToD.c +++ b/generic/tclStrToD.c @@ -1876,7 +1876,6 @@ MakeHighPrecisionDouble( * Very high numbers are returned, if this is not handled */ - if (exponent < -511) { if (mp_init_copy(&bntmp, significand) != MP_OKAY) { Tcl_Panic("initialization failure in MakeHighPrecisionDouble"); diff --git a/generic/tclTest.c b/generic/tclTest.c index 6e4d6e7285..05594830a3 100644 --- a/generic/tclTest.c +++ b/generic/tclTest.c @@ -8330,7 +8330,6 @@ TestNREUnwind( return TCL_OK; } - static int TestNRELevels( TCL_UNUSED(void *), @@ -9708,7 +9707,6 @@ TestAppVerifierPresentCmd( return TCL_OK; } - #endif /* _WIN32 */ /* diff --git a/generic/tclTestABSList.c b/generic/tclTestABSList.c index b355eb313b..3d5be067a3 100644 --- a/generic/tclTestABSList.c +++ b/generic/tclTestABSList.c @@ -617,7 +617,6 @@ my_LStringReplace( // Terminate new string. newStr[newLen] = 0; - if (oldStr != newStr) { Tcl_Free(oldStr); } @@ -836,7 +835,6 @@ UpdateStringOfLString( Tcl_Size bytesNeeded = 0; Tcl_Size llen, i; - /* * Handle empty list case first, so rest of the routine is simpler. */ diff --git a/generic/tclZipfs.c b/generic/tclZipfs.c index 0cc803c012..dba5cd3224 100644 --- a/generic/tclZipfs.c +++ b/generic/tclZipfs.c @@ -4424,7 +4424,6 @@ TclZipfsMountShlib(void) #endif } - /* *------------------------------------------------------------------------- * diff --git a/library/auto.tcl b/library/auto.tcl index cc779cf664..bcf69b33a5 100644 --- a/library/auto.tcl +++ b/library/auto.tcl @@ -217,7 +217,6 @@ proc tcl_findLibrary {basename version patch initScript enVarName varName} { error $msg } - # ---------------------------------------------------------------------- # auto_mkindex # ---------------------------------------------------------------------- diff --git a/library/http/http.tcl b/library/http/http.tcl index afefb9f3a5..09fd33cb2a 100644 --- a/library/http/http.tcl +++ b/library/http/http.tcl @@ -1518,7 +1518,6 @@ proc http::CreateToken {url args} { return $token } - # ------------------------------------------------------------------------------ # Proc ::http::SockIsPlaceHolder # ------------------------------------------------------------------------------ @@ -1536,7 +1535,6 @@ proc http::SockIsPlaceHolder {sock} { expr {[string range $sock 0 16] eq {HTTP_PLACEHOLDER_}} } - # ------------------------------------------------------------------------------ # state(reusing) # ------------------------------------------------------------------------------ @@ -1556,7 +1554,6 @@ proc http::SockIsPlaceHolder {sock} { # write. # ------------------------------------------------------------------------------ - # ------------------------------------------------------------------------------ # Proc http::AsyncTransaction # ------------------------------------------------------------------------------ @@ -1632,7 +1629,6 @@ proc http::AsyncTransaction {token} { return } - # ------------------------------------------------------------------------------ # Proc http::PreparePersistentConnection # ------------------------------------------------------------------------------ @@ -1827,7 +1823,6 @@ proc http::OpenSocket {token DoLater} { return } - # ------------------------------------------------------------------------------ # Proc ::http::ConfigureNewSocket # ------------------------------------------------------------------------------ @@ -1943,7 +1938,6 @@ proc http::ConfigureNewSocket {token sockOld DoLater} { return } - # ------------------------------------------------------------------------------ # The values of array variables socketMapping etc. # ------------------------------------------------------------------------------ @@ -1975,7 +1969,6 @@ proc http::ConfigureNewSocket {token sockOld DoLater} { # is to set the value of state() for caller information. # ------------------------------------------------------------------------------ - # ------------------------------------------------------------------------------ # Using socketWrState(*), socketWrQueue(*), socketRdState(*), socketRdQueue(*) # ------------------------------------------------------------------------------ @@ -1999,7 +1992,6 @@ proc http::ConfigureNewSocket {token sockOld DoLater} { # the event loop unless the socket is idle. # ------------------------------------------------------------------------------ - # ------------------------------------------------------------------------------ # Proc http::ScheduleRequest # ------------------------------------------------------------------------------ @@ -2123,7 +2115,6 @@ proc http::ScheduleRequest {token} { return } - # ------------------------------------------------------------------------------ # Proc http::SendHeader # ------------------------------------------------------------------------------ @@ -2605,7 +2596,6 @@ proc http::ReceiveResponse {token} { return } - # http::EventGateway # # Bug [c2dc1da315]. @@ -2641,7 +2631,6 @@ proc http::EventGateway {sock token} { return -options $opts $res } - # http::NextPipelinedWrite # # - Connecting a socket to a token for writing is done by this command and by @@ -2936,7 +2925,6 @@ proc http::ReplayIfDead {token doing} { lappend newQueue {*}$InFlightW lappend newQueue {*}$socketWrQueue($state(socketinfo)) - # 2. Tidy up token. This is a cut-down form of Finish/CloseSocket. # Do not change state(status). # No need to after cancel state(after) - either this is done in @@ -3257,7 +3245,6 @@ proc http::Meta {token who args} { } } - # ------------------------------------------------------------------------------ # Proc http::responseInfo # ------------------------------------------------------------------------------ @@ -4572,7 +4559,6 @@ proc http::Eot {token {reason {}}} { return } - # ------------------------------------------------------------------------------ # Proc http::GuessType # ------------------------------------------------------------------------------ @@ -4653,7 +4639,6 @@ proc http::GuessType {token} { return 1 } - # http::wait -- # # See documentation for details. @@ -4806,7 +4791,6 @@ proc http::CharsetToEncoding {charset} { } } - # ------------------------------------------------------------------------------ # Proc http::ContentEncoding # ------------------------------------------------------------------------------ @@ -4901,7 +4885,6 @@ proc http::SplitCommaSeparatedFieldValue {fieldValue} { return $r } - # http::GetFieldValue -- # Return the value of a header field. # @@ -4944,7 +4927,6 @@ interp alias {} http::meta {} http::responseHeaders interp alias {} http::metaValue {} http::responseHeaderValue interp alias {} http::ncode {} http::responseCode - # ------------------------------------------------------------------------------ # Proc http::socketAsCallback # ------------------------------------------------------------------------------ @@ -4999,7 +4981,6 @@ proc http::socketAsCallback {args} { return $sock } - # ------------------------------------------------------------------------------ # Proc http::SecureProxyConnect # ------------------------------------------------------------------------------ @@ -5190,7 +5171,6 @@ proc http::AllDone {varName args} { return } - # ------------------------------------------------------------------------------ # Proc http::AltSocket # ------------------------------------------------------------------------------ @@ -5332,7 +5312,6 @@ proc http::LoadThreadIfNeeded {} { return } - # ------------------------------------------------------------------------------ # Proc http::SockInThread # ------------------------------------------------------------------------------ @@ -5358,7 +5337,6 @@ proc http::SockInThread {caller defcmd sockargs} { return [list $catchCode $errdict $sock] } - # ------------------------------------------------------------------------------ # Proc http::cwaiter::cwait # ------------------------------------------------------------------------------ @@ -5414,7 +5392,6 @@ proc http::cwaiter::cwait { return } - # ------------------------------------------------------------------------------ # Proc http::cwaiter::CwaitHelper # ------------------------------------------------------------------------------ @@ -5437,7 +5414,6 @@ proc http::cwaiter::CwaitHelper {varName coroName toe args} { return } - # ------------------------------------------------------------------------------ # Proc http::cwaiter::LogInit # ------------------------------------------------------------------------------ diff --git a/library/init.tcl b/library/init.tcl index c5adcdfdda..fb6200d37c 100644 --- a/library/init.tcl +++ b/library/init.tcl @@ -43,7 +43,6 @@ tcl::InitAutoPath namespace eval tcl::Pkg {} - # Setup the unknown package handler if {[interp issafe]} { package unknown {::tcl::tm::UnknownHandler ::tclPkgUnknown} diff --git a/library/install.tcl b/library/install.tcl index a0d3ba2277..8ec0235ee2 100644 --- a/library/install.tcl +++ b/library/install.tcl @@ -143,7 +143,6 @@ proc ::practcl::_pkgindex_directory {path} { return $buffer } - proc ::practcl::_pkgindex_path_subdir {path} { set result {} foreach subpath [glob -nocomplain [file join $path *]] { diff --git a/library/opt/optparse.tcl b/library/opt/optparse.tcl index ff8f9dac52..3b3339a686 100644 --- a/library/opt/optparse.tcl +++ b/library/opt/optparse.tcl @@ -22,7 +22,6 @@ namespace eval ::tcl { Lassign Lvarpop Lvarpop1 Lvarset Lvarincr \ SetMax SetMin - ################# Example of use / 'user documentation' ################### proc OptCreateTestProc {} { @@ -362,10 +361,6 @@ proc ::tcl::OptProcArgGiven {argname} { } ####### - - - - # Loop over all descriptions, calling OptDoOne which will # eventually eat all the arguments. proc OptDoAll {descriptionsName argumentsName} { @@ -565,7 +560,6 @@ proc ::tcl::OptKeyParse {descKey arglist} { return $vnamesLst } - # Check the type of a value # and emit an error if arg is not of the correct type # otherwise returns the canonical value of that arg (ie 0/1 for booleans) @@ -721,7 +715,6 @@ proc ::tcl::OptCheckType {arg type {typeArgs ""}} { ?helpstring?}" } - # Generate a canonical form single instruction proc OptNewInst {state varname type typeArgs help} { list $state $varname [list 0 {}] $type $typeArgs $help @@ -920,7 +913,6 @@ proc ::tcl::OptError {prefix desc {header 0}} { return "$prefix[OptTree $desc $nl $tl $dl]" } - ################ General Utility functions ####################### # @@ -1061,7 +1053,6 @@ proc ::tcl::SetMin {varname value} { } } - # everything loaded fine, lets create the test proc: # OptCreateTestProc # Don't need the create temp proc anymore: diff --git a/library/platform/platform.tcl b/library/platform/platform.tcl index ecc8506ce9..8749074b15 100644 --- a/library/platform/platform.tcl +++ b/library/platform/platform.tcl @@ -420,7 +420,6 @@ proc ::platform::patterns {id} { return $res } - # ### ### ### ######### ######### ######### ## Ready diff --git a/library/safe.tcl b/library/safe.tcl index 797b5c2059..c62aecda46 100644 --- a/library/safe.tcl +++ b/library/safe.tcl @@ -480,7 +480,6 @@ proc ::safe::InterpSetConfig {child access_path staticsok nestedok deletehook au return } - # # DetokPath: # Convert tokens to directories where possible. @@ -513,7 +512,6 @@ proc ::safe::interpFindInAccessPath {child path} { return [dict get $state(access_path,remap) $path] } - # # addToAccessPath: # add (if needed) a real directory to access path and return its diff --git a/tests-perf/chan.perf.tcl b/tests-perf/chan.perf.tcl index bf0de09fda..eebbf6f94e 100644 --- a/tests-perf/chan.perf.tcl +++ b/tests-perf/chan.perf.tcl @@ -15,12 +15,10 @@ # of this file. # - if {![namespace exists ::tclTestPerf]} { source [file join [file dirname [info script]] test-performance.tcl] } - namespace eval ::tclTestPerf-Chan { namespace path {::tclTestPerf} diff --git a/tests-perf/file.perf.tcl b/tests-perf/file.perf.tcl index 53dd4cc456..fa54a4686c 100644 --- a/tests-perf/file.perf.tcl +++ b/tests-perf/file.perf.tcl @@ -15,12 +15,10 @@ # of this file. # - if {![namespace exists ::tclTestPerf]} { source -encoding utf-8 [file join [file dirname [info script]] test-performance.tcl] } - namespace eval ::tclTestPerf-File { namespace path {::tclTestPerf} diff --git a/tests-perf/list.perf.tcl b/tests-perf/list.perf.tcl index 929e42e1ef..1718c2591b 100644 --- a/tests-perf/list.perf.tcl +++ b/tests-perf/list.perf.tcl @@ -15,12 +15,10 @@ # of this file. # - if {![namespace exists ::tclTestPerf]} { source [file join [file dirname [info script]] test-performance.tcl] } - namespace eval ::tclTestPerf-List { namespace path {::tclTestPerf} diff --git a/tests-perf/listPerf.tcl b/tests-perf/listPerf.tcl index 011f4d77e5..dcba6182af 100644 --- a/tests-perf/listPerf.tcl +++ b/tests-perf/listPerf.tcl @@ -256,7 +256,6 @@ namespace eval perf::list { # Note: Const indices take different path through bytecode than variable # indices hence separate cases below - # Var case foreach share_mode {shared unshared} { set idx 0 @@ -1289,7 +1288,6 @@ namespace eval perf::list { } } - if {[info exists ::argv0] && [file tail $::argv0] eq [file tail [info script]]} { ::perf::list::test } diff --git a/tests-perf/timer-event.perf.tcl b/tests-perf/timer-event.perf.tcl index 5d1d3c6d56..bff1548532 100644 --- a/tests-perf/timer-event.perf.tcl +++ b/tests-perf/timer-event.perf.tcl @@ -15,12 +15,10 @@ # of this file. # - if {![namespace exists ::tclTestPerf]} { source [file join [file dirname [info script]] test-performance.tcl] } - namespace eval ::tclTestPerf-Timer-Event { namespace path {::tclTestPerf} diff --git a/tests/encodingVectors.tcl b/tests/encodingVectors.tcl index c73b7f7471..3e083fb947 100644 --- a/tests/encodingVectors.tcl +++ b/tests/encodingVectors.tcl @@ -649,7 +649,6 @@ lappend encUnencodableStrings {*}{ utf-8 \uDC00 replace efbfbd -1 {} High-surrogate } - # The icuUcmTests.tcl is generated by the tools/ucm2tests.tcl script # and generates test vectors for the above tables for various encodings # based on ICU UCM files. diff --git a/tests/httpTest.tcl b/tests/httpTest.tcl index 72985642f5..e85e7ccc64 100644 --- a/tests/httpTest.tcl +++ b/tests/httpTest.tcl @@ -98,7 +98,6 @@ proc httpTest::LogRecord {txt} { return } - # ------------------------------------------------------------------------------ # Commands for analysing the logs recorded when calling http::geturl. # ------------------------------------------------------------------------------ diff --git a/tests/httpTestScript.tcl b/tests/httpTestScript.tcl index 469028d309..a314abd8cb 100644 --- a/tests/httpTestScript.tcl +++ b/tests/httpTestScript.tcl @@ -337,7 +337,6 @@ proc httpTestScript::POST {uriCode args} { return } - proc httpTestScript::RequestAfter {uriCode validate query args} { variable CountRequestedSoFar variable Delay @@ -475,7 +474,6 @@ URL $state(url) return } - proc httpTestScript::runHttpTestScript {scr} { variable TimeOutDone variable RequestsWhenStopped @@ -492,7 +490,6 @@ proc httpTestScript::runHttpTestScript {scr} { return $RequestsWhenStopped } - proc httpTestScript::cleanupHttpTestScript {} { variable TimeOutDone variable RequestsWhenStopped diff --git a/tests/icuUcmTests.tcl b/tests/icuUcmTests.tcl index 4571187ddc..58e7aee977 100644 --- a/tests/icuUcmTests.tcl +++ b/tests/icuUcmTests.tcl @@ -46,7 +46,6 @@ if {[info commands printable] eq ""} { } } - # # cp1250 (generated from glibc-CP1250-2.1.2) diff --git a/tests/tcltests.tcl b/tests/tcltests.tcl index 5897022e7b..f02532332b 100644 --- a/tests/tcltests.tcl +++ b/tests/tcltests.tcl @@ -25,9 +25,7 @@ testConstraint fileevent [llength [info commands fileevent]] testConstraint thread [expr {![catch {package require Thread 2.7-}]}] testConstraint notValgrind [expr {![testConstraint valgrind]}] - namespace eval ::tcltests { - variable TCL_SIZE_MAX [expr {(2**(8*$::tcl_platform(pointerSize)-1))-1}] proc init {} { @@ -39,7 +37,6 @@ namespace eval ::tcltests { } } - # Stolen from dict.test proc scriptmemcheck script { set end [lindex [split [memory info] \n] 3 3] @@ -51,7 +48,6 @@ namespace eval ::tcltests { expr {$end - $tmp} } - proc tempdir_alternate {} { close [file tempfile tempfile] set tmpdir [file dirname $tempfile] diff --git a/tests/ucdUtils.tcl b/tests/ucdUtils.tcl index f608586a14..cfb6458dbe 100644 --- a/tests/ucdUtils.tcl +++ b/tests/ucdUtils.tcl @@ -5,7 +5,7 @@ if {[namespace exists tcltest::ucd]} { } namespace eval tcltests::ucd { - # UCD file paths + # UCD file paths variable normalizationDataFile \ [file join [file dirname [info script]] unicodeTestVectors NormalizationTest.txt] variable caseFoldDataFile \ @@ -13,8 +13,8 @@ namespace eval tcltests::ucd { variable derivedCorePropertiesFile \ [file join [file dirname [info script]] unicodeTestVectors DerivedCoreProperties.txt] - # Highest assigned Unicode code point - variable maxCodepoint 0x10ffff + # Highest assigned Unicode code point + variable maxCodepoint 0x10ffff tcltest::testConstraint ucdnormalization [file exists $normalizationDataFile] tcltest::testConstraint ucdproperties [file exists $derivedCorePropertiesFile] @@ -77,16 +77,16 @@ namespace eval tcltests::ucd { } proc getNormalizationData {} { - variable normalizationData - readNormalizationData - return $normalizationData - } + variable normalizationData + readNormalizationData + return $normalizationData + } proc getSingleFormChars {} { - variable singleFormChars - readNormalizationData - return $singleFormChars - } + variable singleFormChars + readNormalizationData + return $singleFormChars + } proc readCaseFoldData {} { variable caseFoldData {} @@ -156,21 +156,20 @@ namespace eval tcltests::ucd { } proc getCaseFoldData {} { - variable caseFoldData - readCaseFoldData - return $caseFoldData - } + variable caseFoldData + readCaseFoldData + return $caseFoldData + } proc getCaseFoldIdentities {} { - variable caseFoldIdentities - readCaseFoldData - return $caseFoldIdentities - } - + variable caseFoldIdentities + readCaseFoldData + return $caseFoldIdentities + } proc readDerivedCoreProperties {} { variable derivedCorePropertiesFile - variable derivedCoreProperties; # Dict indexed by property name + variable derivedCoreProperties; # Dict indexed by property name set fd [open $derivedCorePropertiesFile] fconfigure $fd -encoding utf-8 @@ -192,7 +191,7 @@ namespace eval tcltests::ucd { set rangeOfChars [regexp -inline -all {[[:xdigit:]]+} $rangeOfChars]; # xxxx..yyyy foreach codePoint [lseq 0x[lindex $rangeOfChars 0] .. 0x[lindex $rangeOfChars end]] { set char [format %c $codePoint] - dict set derivedCoreProperties $propertyName $char {} + dict set derivedCoreProperties $propertyName $char {} } } @@ -200,14 +199,14 @@ namespace eval tcltests::ucd { } proc getLowercaseChars {} { - variable derivedCoreProperties - readDerivedCoreProperties - return [dict get $derivedCoreProperties Lowercase] - } + variable derivedCoreProperties + readDerivedCoreProperties + return [dict get $derivedCoreProperties Lowercase] + } proc getUppercaseChars {} { - variable derivedCoreProperties - readDerivedCoreProperties - return [dict get $derivedCoreProperties Uppercase] - } + variable derivedCoreProperties + readDerivedCoreProperties + return [dict get $derivedCoreProperties Uppercase] + } } diff --git a/tools/checkLibraryDoc.tcl b/tools/checkLibraryDoc.tcl index 0ed322c496..592e49c450 100755 --- a/tools/checkLibraryDoc.tcl +++ b/tools/checkLibraryDoc.tcl @@ -19,7 +19,6 @@ # Copyright © 1998-1999 Scriptics Corporation. # All rights reserved. - lappend auto_path "c:/program\ files/tclpro1.2/win32-ix86/bin" #lappend auto_path "/home/surles/cvs/tclx8.0/tcl/unix" if {[catch {package require Tclx}]} { diff --git a/tools/findBadExternals.tcl b/tools/findBadExternals.tcl index 2351cd290c..5cd5673850 100755 --- a/tools/findBadExternals.tcl +++ b/tools/findBadExternals.tcl @@ -17,13 +17,11 @@ #---------------------------------------------------------------------- proc main {argc argv} { - if {$argc != 1} { puts stderr "syntax is: [info script] libtcl" return 1 } - switch -exact -- $::tcl_platform(platform) { unix - macosx { diff --git a/tools/index.tcl b/tools/index.tcl index 5426ee6459..7ea90217b4 100644 --- a/tools/index.tcl +++ b/tools/index.tcl @@ -87,7 +87,6 @@ proc getTopics {pkg sect} { # Arguments: # string - Text to index. - proc text string { global state curID curPkg curSect topics keywords @@ -118,7 +117,6 @@ proc text string { } } - # macro -- # # This procedure is invoked to process macro invocations that start @@ -165,7 +163,6 @@ proc macro {name args} { } } - # dash -- # # This procedure is invoked to handle dash characters ("\-" in @@ -181,8 +178,6 @@ proc dash {} { } } - - # initGlobals, tab, font, char, macro2 -- # # These procedures do nothing during the first pass. diff --git a/tools/loadICU.tcl b/tools/loadICU.tcl index bbe5e4a927..9236b79027 100755 --- a/tools/loadICU.tcl +++ b/tools/loadICU.tcl @@ -328,8 +328,6 @@ proc handleLocaleFile { localeName fileName msgFileName } { } } data { - - # Inside a data block, collect the strings, doing backslash # expansion to pick up the Unicodes diff --git a/tools/mkdepend.tcl b/tools/mkdepend.tcl index 930004ac1d..c4e23aa99f 100644 --- a/tools/mkdepend.tcl +++ b/tools/mkdepend.tcl @@ -40,7 +40,6 @@ if [info exists env(INCLUDE)] { } } - # openOutput -- # # Opens the output file. @@ -265,7 +264,6 @@ proc addSearchPath {newPathInfo} { lappend srcPathReplaceList [lindex $infoList 1] } - # displayUsage -- # # Displays usage to stderr diff --git a/tools/tcltk-man2html.tcl b/tools/tcltk-man2html.tcl index 27a09b3813..98aa296da9 100755 --- a/tools/tcltk-man2html.tcl +++ b/tools/tcltk-man2html.tcl @@ -185,7 +185,6 @@ proc parse_command_line {} { puts "using Tcl source directory [file join $tcltkdir $tcldir]" } - if {$build_tk} { # Find Tk (firstly using glob pattern / backwards compatible way) set tkdir [lindex [lsort [glob -nocomplain -tails -type d \ diff --git a/unix/tclUnixThrd.c b/unix/tclUnixThrd.c index 292135d471..5aa67f758f 100644 --- a/unix/tclUnixThrd.c +++ b/unix/tclUnixThrd.c @@ -122,7 +122,6 @@ PMutexUnlock( } } - static void PCondWait( pthread_cond_t *pcondPtr, diff --git a/win/tclWinInt.h b/win/tclWinInt.h index a00782ddc8..368fe80aff 100644 --- a/win/tclWinInt.h +++ b/win/tclWinInt.h @@ -73,8 +73,6 @@ TclpLongPathSupported(void) return winInfoPtr->longPathsSupported; } - - /* * Declarations of functions that are not accessible by way of the * stubs table. diff --git a/win/tclWinSerial.c b/win/tclWinSerial.c index 3aa26dfc2b..d2b2be9e72 100644 --- a/win/tclWinSerial.c +++ b/win/tclWinSerial.c @@ -17,7 +17,6 @@ #pragma clang diagnostic ignored "-Wc++-keyword" #endif - /* * The following variable is used to tell whether this module has been * initialized.