diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-10-29 05:04:45 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-10-29 05:04:45 +0000 |
| commit | 35b21a12c03765244d32b6400a100124f35df091 (patch) | |
| tree | 7cc9ed3bebd8006d18cdac6f833cfd611f705ff1 /ext | |
| parent | b07291635892b07bb4afbb62d4fe08aa8dfeb68b (diff) | |
* parse.y (str_extend): shuould allow interpolation of $-x.
* bignum.c (rb_big_eq): convert Bignum to Float, instead of
reverse.
* time.c (time_localtime): getting tm should not be prohibited for
frozen time objects.
* time.c (time_gmtime): ditto.
* version.c (Init_version): freeze RUBY_VERSION,
RUBY_RELEASE_DATE, and RUBY_PLATFORM.
* file.c (Init_File): freeze File::SEPARATOR, ALT_SEPARATOR and
PATH_SEPARATOR.
* file.c (rb_stat_cmp): should check operand type before calling
get_stat().
* eval.c (rb_eval_cmd): should not invoke "call" with a block on
any occasion.
* numeric.c (fix_aref): idx may be a Bignum.
* numeric.c (num_remainder): a bug in Numeric#remainder.
* eval.c (rb_exec_end_proc): END might be called within END
block.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@1799 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/socket/socket.c | 2 | ||||
| -rw-r--r-- | ext/tk/lib/tk.rb | 16 |
2 files changed, 17 insertions, 1 deletions
diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 1a78e6a816..af541348bb 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -845,9 +845,11 @@ open_inet(class, h, serv, type) continue; } if (type == INET_SERVER) { +#ifndef NT status = 1; setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char*)&status, sizeof(status)); +#endif status = bind(fd, res->ai_addr, res->ai_addrlen); syscall = "bind(2)"; } diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb index 99f41420cc..fb19252685 100644 --- a/ext/tk/lib/tk.rb +++ b/ext/tk/lib/tk.rb @@ -77,6 +77,9 @@ module TkComm def tk_split_list(str) return [] if str == "" idx = str.index('{') + while idx and idx > 0 and str[idx-1] == ?\\ + idx = str.index('{', idx+1) + end return tk_tcl2ruby(str) unless idx list = tk_tcl2ruby(str[0,idx]) @@ -102,6 +105,9 @@ module TkComm def tk_split_simplelist(str) return [] if str == "" idx = str.index('{') + while idx and idx > 0 and str[idx-1] == ?\\ + idx = str.index('{', idx+1) + end return str.split unless idx list = str[0,idx].split @@ -467,7 +473,15 @@ module TkCore INTERP = TclTkIp.new - INTERP._invoke("proc", "rb_out", "args", "if {[set st [catch {ruby [format \"TkCore.callback %%Q!%s!\" $args]} ret]] != 0} {if {[regsub -all {!} $args {\\!} newargs] == 0} {return -code $st $ret} {if {[set st [catch {ruby [format \"TkCore.callback %%Q!%s!\" $newargs]} ret]] != 0} {return -code $st $ret} {return $ret}}} {return $ret}") + INTERP._invoke("proc", "rb_out", "args", <<-'EOL') + regsub -all {!} $args {\\!} args + regsub -all "{" $args "\\{" args + if {[set st [catch {ruby [format "TkCore.callback %%Q!%s!" $args]} ret]] != 0} { + return -code $st $ret + } { + return $ret + } + EOL def callback_break fail TkCallbackBreak, "Tk callback returns 'break' status" |