diff options
| -rw-r--r-- | ChangeLog | 24 | ||||
| -rw-r--r-- | generic/tclCompCmds.c | 4 | ||||
| -rw-r--r-- | generic/tclMain.c | 2 | ||||
| -rw-r--r-- | generic/tclTomMath.decls | 2 | ||||
| -rw-r--r-- | generic/tclUtil.c | 2 | ||||
| -rw-r--r-- | generic/tclZlib.c | 2 | ||||
| -rw-r--r-- | tests/append.test | 4 | ||||
| -rw-r--r-- | tests/appendComp.test | 4 | ||||
| -rw-r--r-- | tests/compile.test | 4 | ||||
| -rw-r--r-- | tests/execute.test | 2 | ||||
| -rw-r--r-- | tests/fCmd.test | 4 | ||||
| -rw-r--r-- | tests/interp.test | 2 | ||||
| -rw-r--r-- | tests/ioTrans.test | 6 | ||||
| -rw-r--r-- | tests/iogt.test | 4 | ||||
| -rw-r--r-- | tests/uplevel.test | 4 | ||||
| -rw-r--r-- | tests/util.test | 2 | ||||
| -rw-r--r-- | tests/winPipe.test | 4 | ||||
| -rw-r--r-- | unix/tclUnixSock.c | 6 | ||||
| -rw-r--r-- | win/tclWinFile.c | 6 |
19 files changed, 50 insertions, 38 deletions
@@ -1,12 +1,24 @@ +2011-03-05 Kevin B. Kenny <kennykb@acm.org> + + * generic/tclAssembly.c (new file): + * generic/tclBasic.c (Tcl_CreateInterp): + * generic/tclInt.h: + * tests/assemble.test (new file): + * unix/Makefile.in: + * win/Makefile.in: + * win/makefile.vc: Merged dogeen-assembler-branch into HEAD. + Since all functional changes are in the tcl::unsupported namespace, + there's no reason to sequester this code on a separate branch. + 2011-03-05 Miguel Sofer <msofer@users.sf.net> * generic/tclExecute.c: cleaner mem management for TEBCdata * generic/tclExecute.c: * tests/nre.test: Renamed BottomData to TEBCdata, so that the name - refers to what it is rather than to its storage location. - - * generic/tclBasic.c: Renamed struct TEOV_callback to + refers to what it is rather than to its storage location. + + * generic/tclBasic.c: Renamed struct TEOV_callback to * generic/tclCompExpr.c: the more descriptive NRE_callback. * generic/tclCompile.c: * generic/tclExecute.c: @@ -37,9 +49,9 @@ 2011-03-01 Miguel Sofer <msofer@users.sf.net> - * generic/tclCompCmdsSZ.c (TclCompileThrowCmd, TclCompileUnsetCmd): + * generic/tclCompCmdsSZ.c (TclCompileThrowCmd, TclCompileUnsetCmd): fix leaks - + * generic/tclBasic.c: This is [Patch 3168398], * generic/tclCompCmdsSZ.c: Joe Mistachkin's optimisation * generic/tclExecute.c: of Tip #285 @@ -55,7 +67,7 @@ * generic/tclExecute.c (TEBCresume): store local var array and constants in automatic vars to reduce indirection, slight perf - increase + increase * generic/tclOOCall.c (TclOODeleteContext): added missing '*' so that trunk compiles. diff --git a/generic/tclCompCmds.c b/generic/tclCompCmds.c index 8ce8baa..c4d88a0 100644 --- a/generic/tclCompCmds.c +++ b/generic/tclCompCmds.c @@ -391,7 +391,7 @@ TclCompileCatchCmd( TclEmitForwardJump(envPtr, TCL_UNCONDITIONAL_JUMP, &jumpFixup); /* Stack at this point: ?script? <mark> result TCL_OK */ - /* + /* * Emit the "error case" epilogue. Push the interpreter result * and the return code. */ @@ -477,7 +477,7 @@ TclCompileCatchCmd( TclEmitOpcode(INST_POP, envPtr); } - /* + /* * Result of all this, on either branch, should have been to leave * one operand -- the return code -- on the stack. */ diff --git a/generic/tclMain.c b/generic/tclMain.c index ea9a5c4..7caadd1 100644 --- a/generic/tclMain.c +++ b/generic/tclMain.c @@ -650,7 +650,7 @@ Tcl_MainEx( Tcl_Release(interp); Tcl_Exit(exitCode); } - + #ifndef UNICODE void Tcl_Main( diff --git a/generic/tclTomMath.decls b/generic/tclTomMath.decls index e7e0076..5bf338e 100644 --- a/generic/tclTomMath.decls +++ b/generic/tclTomMath.decls @@ -217,4 +217,4 @@ declare 61 { } declare 62 { int TclBN_mp_set_int(mp_int* a, unsigned long i) -}
\ No newline at end of file +} diff --git a/generic/tclUtil.c b/generic/tclUtil.c index fa0ad4b..535634f 100644 --- a/generic/tclUtil.c +++ b/generic/tclUtil.c @@ -2266,7 +2266,7 @@ Tcl_PrintDouble( /* * Ordinary (normal and denormal) values. */ - + if (*precisionPtr == 0) { digits = TclDoubleDigits(value, -1, TCL_DD_SHORTEST, &exponent, &signum, &end); diff --git a/generic/tclZlib.c b/generic/tclZlib.c index e75e1da..7f17bc7 100644 --- a/generic/tclZlib.c +++ b/generic/tclZlib.c @@ -1227,7 +1227,7 @@ Tcl_ZlibDeflate( if (!interp) { return TCL_ERROR; } - + /* * Compressed format is specified by the wbits parameter. See zlib.h for * details. diff --git a/tests/append.test b/tests/append.test index e35b5b1..69c6381 100644 --- a/tests/append.test +++ b/tests/append.test @@ -16,7 +16,7 @@ if {[lsearch [namespace children] ::tcltest] == -1} { namespace import -force ::tcltest::* } unset -nocomplain x - + test append-1.1 {append command} { unset -nocomplain x list [append x 1 2 abc "long string"] $x @@ -292,7 +292,7 @@ test append-9.3 {bug 3057639, append direct eval, read trace on non-existing env } -cleanup { unset -nocomplain ::env(__DUMMY__) } -result {0 {new value}} - + unset -nocomplain i x result y catch {rename foo ""} diff --git a/tests/appendComp.test b/tests/appendComp.test index 4ce7574..f85c3ba 100644 --- a/tests/appendComp.test +++ b/tests/appendComp.test @@ -16,7 +16,7 @@ if {[lsearch [namespace children] ::tcltest] == -1} { namespace import -force ::tcltest::* } catch {unset x} - + test appendComp-1.1 {append command} -setup { unset -nocomplain x } -body { @@ -438,7 +438,7 @@ test appendComp-9.3 {bug 3057639, append direct eval, read trace on non-existing } -cleanup { unset -nocomplain ::env(__DUMMY__) } -result {0 {new value}} - + catch {unset i x result y} catch {rename foo ""} catch {rename bar ""} diff --git a/tests/compile.test b/tests/compile.test index d3915a6..d6048be 100644 --- a/tests/compile.test +++ b/tests/compile.test @@ -26,7 +26,7 @@ catch {namespace delete test_ns_compile} catch {unset x} catch {unset y} catch {unset a} - + test compile-1.1 {TclCompileString: look up cmds in proc ns, not current ns} -setup { catch {namespace delete test_ns_compile} catch {unset x} @@ -705,7 +705,7 @@ test compile-18.19 {disassembler - basics} -setup { foo destroy } -match glob -result * # TODO sometime - check that bytecode from tbcload is *not* disassembled. - + # cleanup catch {rename p ""} catch {namespace delete test_ns_compile} diff --git a/tests/execute.test b/tests/execute.test index 18cf848..012b3a7 100644 --- a/tests/execute.test +++ b/tests/execute.test @@ -33,7 +33,7 @@ testConstraint testobj [expr { testConstraint longIs32bit [expr {int(0x80000000) < 0}] testConstraint testexprlongobj [llength [info commands testexprlongobj]] - + # Tests for the omnibus TclExecuteByteCode function: # INST_DONE not tested diff --git a/tests/fCmd.test b/tests/fCmd.test index 0627729..410e610 100644 --- a/tests/fCmd.test +++ b/tests/fCmd.test @@ -169,7 +169,7 @@ append long $long append long $long append long $long append long $long - + test fCmd-1.1 {TclFileRenameCmd} -constraints {notRoot} -setup { cleanup } -body { @@ -2580,7 +2580,7 @@ test fCmd-30.3 {file readable on 'pagefile.sys'} -constraints {win} -body { } return $r } -result {exists 1 readable 0 stat 0 {}} - + # cleanup cleanup ::tcltest::cleanupTests diff --git a/tests/interp.test b/tests/interp.test index 1944b3a..fd6090e 100644 --- a/tests/interp.test +++ b/tests/interp.test @@ -3567,7 +3567,7 @@ test interp-37.1 {safe interps and min() and max(): Bug 2895741} -setup { unset -nocomplain result interp delete a } -result {26 26} - + test interp-38.1 {interp debug one-way switch} -setup { catch {interp delete a} interp create a diff --git a/tests/ioTrans.test b/tests/ioTrans.test index f994091..8dbad78 100644 --- a/tests/ioTrans.test +++ b/tests/ioTrans.test @@ -100,7 +100,7 @@ set helperscript { eval $helperscript #puts <<[file channels]>> - + # ### ### ### ######### ######### ######### test iortrans-1.0 {chan, wrong#args} -returnCodes error -body { @@ -1034,7 +1034,7 @@ test iortrans-11.2 {delete interp of reflected transform} -setup { } interp delete slave } -result {} - + # ### ### ### ######### ######### ######### ## Same tests as above, but exercising the code forwarding and receiving ## driver operations to the originator thread. @@ -1860,7 +1860,7 @@ test iortrans.tf-11.1 {origin thread of moved transform destroyed during access} tcltest::threadReap tempdone } -result {Owner lost} - + # ### ### ### ######### ######### ######### cleanupTests diff --git a/tests/iogt.test b/tests/iogt.test index 9804fcf..60d7ab8 100644 --- a/tests/iogt.test +++ b/tests/iogt.test @@ -352,7 +352,7 @@ proc asort {alist} { array set a $alist array_sget a } - + ######################################################################## test iogt-1.1 {stack/unstack} testchannel { @@ -791,7 +791,7 @@ test iogt-6.1 {Push back and up} -constraints {testchannel knownBug} -body { } -cleanup { close $f } -result {xxxghi} - + # cleanup foreach file [list dummy dummyout __echo_srv__.tcl] { removeFile $file diff --git a/tests/uplevel.test b/tests/uplevel.test index 5224faa..0410469 100644 --- a/tests/uplevel.test +++ b/tests/uplevel.test @@ -24,7 +24,7 @@ proc newset {name value} { uplevel set $name $value uplevel 1 {uplevel 1 {set xyz 22}} } - + test uplevel-1.1 {simple operation} { set xyz 0 a 22 33 @@ -195,7 +195,7 @@ test uplevel-7.3 {var access, LVT in upper level} -setup { rename foo {} rename moo {} } -result {3 3 3} - + # cleanup ::tcltest::cleanupTests return diff --git a/tests/util.test b/tests/util.test index b1b5056..1f214b5 100644 --- a/tests/util.test +++ b/tests/util.test @@ -3866,4 +3866,4 @@ return # Local Variables: # mode: tcl -# End:
\ No newline at end of file +# End: diff --git a/tests/winPipe.test b/tests/winPipe.test index ea2919f..62d7d0d 100644 --- a/tests/winPipe.test +++ b/tests/winPipe.test @@ -57,7 +57,7 @@ set path(more) [makeFile { set path(stdout) [makeFile {} stdout] set path(stderr) [makeFile {} stderr] - + test winpipe-1.1 {32 bit comprehensive tests: from little file} {win exec cat32} { exec $cat32 < $path(little) > $path(stdout) 2> $path(stderr) list [contents $path(stdout)] [contents $path(stderr)] @@ -424,7 +424,7 @@ test winpipe-8.18 {BuildCommandLine/parse_cmdline pass-thru: special chars #2} { test winpipe-8.19 {ensure parse_cmdline isn't doing wildcard replacement} {win exec} { exec [interpreter] $path(echoArgs.tcl) foo * makefile.?c bar } [list $path(echoArgs.tcl) [list foo * makefile.?c bar]] - + # restore old values for env(TMP) and env(TEMP) if {[catch {set env(TMP) $env_tmp}]} { diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c index c26b955..b55d1cb 100644 --- a/unix/tclUnixSock.c +++ b/unix/tclUnixSock.c @@ -521,7 +521,7 @@ TcpCloseProc( * handlers are already deleted in the generic IO channel closing code * that called this function, so we do not have to delete them here. */ - + for (fds = statePtr->fds; fds != NULL; fds = statePtr->fds) { statePtr->fds = fds->next; Tcl_DeleteFileHandler(fds->fd); @@ -658,7 +658,7 @@ TcpGetOptionProc( Tcl_DStringAppendElement(dsPtr, "-peername"); Tcl_DStringStartSublist(dsPtr); } - + getnameinfo(&peername.sa, size, host, sizeof(host), NULL, 0, NI_NUMERICHOST); Tcl_DStringAppendElement(dsPtr, host); @@ -1317,7 +1317,7 @@ TcpAccept( socklen_t len; /* For accept interface */ char channelName[16 + TCL_INTEGER_SPACE]; char host[NI_MAXHOST], port[NI_MAXSERV]; - + fds = (TcpFdList *) data; len = sizeof(addr); diff --git a/win/tclWinFile.c b/win/tclWinFile.c index dcefb3f..34be41f 100644 --- a/win/tclWinFile.c +++ b/win/tclWinFile.c @@ -828,7 +828,7 @@ tclWinDebugPanic( MB_ICONSTOP | MB_OK | MB_TASKMODAL | MB_SETFOREGROUND); } } - + /* *--------------------------------------------------------------------------- * @@ -983,7 +983,7 @@ TclpMatchInDirectory( } attr = GetFileAttributes(native); - if ((attr == INVALID_FILE_ATTRIBUTES) + if ((attr == INVALID_FILE_ATTRIBUTES) || ((attr & FILE_ATTRIBUTE_DIRECTORY) == 0)) { return TCL_OK; } @@ -2052,7 +2052,7 @@ NativeStat( /* * We might have just been denied access */ - + WIN32_FIND_DATA ffd; HANDLE hFind; hFind = FindFirstFile(nativePath, &ffd); |