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 /time.c | |
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 'time.c')
-rw-r--r-- | time.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -564,10 +564,10 @@ time_localtime(time) time_t t; GetTimeval(time, tobj); - if (tobj->tm_got && !tobj->gmt) { - return time; + if (tobj->tm_got) { + if (!tobj->gmt) return time; + time_modify(time); } - time_modify(time); t = tobj->tv.tv_sec; tm_tmp = localtime(&t); tobj->tm = *tm_tmp; @@ -585,10 +585,10 @@ time_gmtime(time) time_t t; GetTimeval(time, tobj); - if (tobj->tm_got && tobj->gmt) { - return time; + if (tobj->tm_got) { + if (tobj->gmt) return time; + time_modify(time); } - time_modify(time); t = tobj->tv.tv_sec; tm_tmp = gmtime(&t); tobj->tm = *tm_tmp; |