2000-05-01 05:42:38 -04:00
|
|
|
/**********************************************************************
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
time.c -
|
|
|
|
|
|
|
|
$Author$
|
|
|
|
$Date$
|
|
|
|
created at: Tue Dec 28 14:31:59 JST 1993
|
|
|
|
|
2003-01-16 02:34:03 -05:00
|
|
|
Copyright (C) 1993-2003 Yukihiro Matsumoto
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2000-05-01 05:42:38 -04:00
|
|
|
**********************************************************************/
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
#include "ruby.h"
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <time.h>
|
|
|
|
|
1999-08-13 01:45:20 -04:00
|
|
|
#ifdef HAVE_UNISTD_H
|
|
|
|
#include <unistd.h>
|
|
|
|
#endif
|
2002-09-17 09:52:45 -04:00
|
|
|
|
2001-12-21 04:23:28 -05:00
|
|
|
#include <math.h>
|
1998-01-16 07:13:05 -05:00
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
VALUE rb_cTime;
|
2006-07-27 05:14:38 -04:00
|
|
|
static VALUE time_utc_offset _((VALUE));
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
struct time_object {
|
|
|
|
struct timeval tv;
|
|
|
|
struct tm tm;
|
|
|
|
int gmt;
|
|
|
|
int tm_got;
|
|
|
|
};
|
|
|
|
|
2002-04-18 04:46:18 -04:00
|
|
|
#define GetTimeval(obj, tobj) \
|
|
|
|
Data_Get_Struct(obj, struct time_object, tobj)
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2002-08-27 04:31:08 -04:00
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_free(void *tobj)
|
2002-08-27 04:31:08 -04:00
|
|
|
{
|
|
|
|
if (tobj) free(tobj);
|
|
|
|
}
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_s_alloc(VALUE klass)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
VALUE obj;
|
|
|
|
struct time_object *tobj;
|
|
|
|
|
2002-08-27 04:31:08 -04:00
|
|
|
obj = Data_Make_Struct(klass, struct time_object, 0, time_free, tobj);
|
1998-01-16 07:13:05 -05:00
|
|
|
tobj->tm_got=0;
|
2003-10-02 04:25:00 -04:00
|
|
|
tobj->tv.tv_sec = 0;
|
|
|
|
tobj->tv.tv_usec = 0;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
return obj;
|
|
|
|
}
|
|
|
|
|
2003-10-02 04:25:00 -04:00
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_modify(VALUE time)
|
2002-03-08 02:03:09 -05:00
|
|
|
{
|
2003-10-02 04:25:00 -04:00
|
|
|
rb_check_frozen(time);
|
|
|
|
if (!OBJ_TAINTED(time) && rb_safe_level() >= 4)
|
|
|
|
rb_raise(rb_eSecurityError, "Insecure: can't modify Time");
|
2002-03-08 02:03:09 -05:00
|
|
|
}
|
|
|
|
|
2003-12-30 11:38:32 -05:00
|
|
|
/*
|
|
|
|
* Document-method: now
|
|
|
|
*
|
|
|
|
* Synonym for <code>Time.new</code>. Returns a +Time+ object
|
|
|
|
* initialized tot he current system time.
|
|
|
|
*/
|
|
|
|
|
2003-12-27 01:33:45 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* Time.new -> time
|
|
|
|
*
|
|
|
|
* Returns a <code>Time</code> object initialized to the current system
|
|
|
|
* time. <b>Note:</b> The object created will be created using the
|
|
|
|
* resolution available on your system clock, and so may include
|
|
|
|
* fractional seconds.
|
|
|
|
*
|
|
|
|
* a = Time.new #=> Wed Apr 09 08:56:03 CDT 2003
|
|
|
|
* b = Time.new #=> Wed Apr 09 08:56:03 CDT 2003
|
|
|
|
* a == b #=> false
|
|
|
|
* "%.6f" % a.to_f #=> "1049896563.230740"
|
|
|
|
* "%.6f" % b.to_f #=> "1049896563.231466"
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2003-10-02 04:25:00 -04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_init(VALUE time)
|
2003-10-02 04:25:00 -04:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
|
|
|
|
|
|
|
time_modify(time);
|
|
|
|
GetTimeval(time, tobj);
|
|
|
|
tobj->tm_got=0;
|
|
|
|
tobj->tv.tv_sec = 0;
|
|
|
|
tobj->tv.tv_usec = 0;
|
|
|
|
if (gettimeofday(&tobj->tv, 0) < 0) {
|
|
|
|
rb_sys_fail("gettimeofday");
|
|
|
|
}
|
|
|
|
|
|
|
|
return time;
|
|
|
|
}
|
2002-03-08 02:03:09 -05:00
|
|
|
|
2001-12-13 03:19:09 -05:00
|
|
|
#define NDIV(x,y) (-(-((x)+1)/(y))-1)
|
|
|
|
#define NMOD(x,y) ((y)-(-((x)+1)%(y))-1)
|
|
|
|
|
2005-10-18 13:35:18 -04:00
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_overflow_p(time_t *secp, time_t *usecp)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2004-01-18 02:46:51 -05:00
|
|
|
time_t tmp, sec = *secp, usec = *usecp;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2001-12-13 03:19:09 -05:00
|
|
|
if (usec >= 1000000) { /* usec positive overflow */
|
2001-12-21 04:23:28 -05:00
|
|
|
tmp = sec + usec / 1000000;
|
2001-12-03 05:07:48 -05:00
|
|
|
usec %= 1000000;
|
2001-12-21 04:23:28 -05:00
|
|
|
if (sec > 0 && tmp < 0) {
|
|
|
|
rb_raise(rb_eRangeError, "out of Time range");
|
|
|
|
}
|
|
|
|
sec = tmp;
|
2001-12-03 05:07:48 -05:00
|
|
|
}
|
2001-12-13 03:19:09 -05:00
|
|
|
if (usec < 0) { /* usec negative overflow */
|
2001-12-21 04:23:28 -05:00
|
|
|
tmp = sec + NDIV(usec,1000000); /* negative div */
|
|
|
|
usec = NMOD(usec,1000000); /* negative mod */
|
|
|
|
if (sec < 0 && tmp > 0) {
|
|
|
|
rb_raise(rb_eRangeError, "out of Time range");
|
|
|
|
}
|
|
|
|
sec = tmp;
|
2001-12-03 05:07:48 -05:00
|
|
|
}
|
2001-02-20 02:42:03 -05:00
|
|
|
#ifndef NEGATIVE_TIME_T
|
1999-01-19 23:59:39 -05:00
|
|
|
if (sec < 0 || (sec == 0 && usec < 0))
|
|
|
|
rb_raise(rb_eArgError, "time must be positive");
|
2001-02-20 02:42:03 -05:00
|
|
|
#endif
|
2004-01-18 02:46:51 -05:00
|
|
|
*secp = sec;
|
|
|
|
*usecp = usec;
|
2003-10-02 04:25:00 -04:00
|
|
|
}
|
2000-03-07 03:37:59 -05:00
|
|
|
|
2003-10-02 04:25:00 -04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_new_internal(VALUE klass, time_t sec, time_t usec)
|
2003-10-02 04:25:00 -04:00
|
|
|
{
|
|
|
|
VALUE time = time_s_alloc(klass);
|
|
|
|
struct time_object *tobj;
|
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
2004-01-18 02:46:51 -05:00
|
|
|
time_overflow_p(&sec, &usec);
|
1998-01-16 07:13:05 -05:00
|
|
|
tobj->tv.tv_sec = sec;
|
|
|
|
tobj->tv.tv_usec = usec;
|
|
|
|
|
2003-10-02 04:25:00 -04:00
|
|
|
return time;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_time_new(time_t sec, time_t usec)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
1999-01-19 23:59:39 -05:00
|
|
|
return time_new_internal(rb_cTime, sec, usec);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2000-08-31 01:29:54 -04:00
|
|
|
static struct timeval
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_timeval(VALUE time, int interval)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
struct timeval t;
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-09 17:20:17 -04:00
|
|
|
const char *tstr = interval ? "time interval" : "time";
|
2001-02-27 02:52:11 -05:00
|
|
|
|
|
|
|
#ifndef NEGATIVE_TIME_T
|
|
|
|
interval = 1;
|
|
|
|
#endif
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
switch (TYPE(time)) {
|
|
|
|
case T_FIXNUM:
|
1999-08-13 01:45:20 -04:00
|
|
|
t.tv_sec = FIX2LONG(time);
|
2001-02-27 02:52:11 -05:00
|
|
|
if (interval && t.tv_sec < 0)
|
|
|
|
rb_raise(rb_eArgError, "%s must be positive", tstr);
|
1998-01-16 07:13:05 -05:00
|
|
|
t.tv_usec = 0;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case T_FLOAT:
|
2001-02-27 02:52:11 -05:00
|
|
|
if (interval && RFLOAT(time)->value < 0.0)
|
|
|
|
rb_raise(rb_eArgError, "%s must be positive", tstr);
|
2001-12-21 04:23:28 -05:00
|
|
|
else {
|
|
|
|
double f, d;
|
|
|
|
|
|
|
|
d = modf(RFLOAT(time)->value, &f);
|
|
|
|
t.tv_sec = (time_t)f;
|
|
|
|
if (f != t.tv_sec) {
|
|
|
|
rb_raise(rb_eRangeError, "%f out of Time range", RFLOAT(time)->value);
|
|
|
|
}
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-09 17:20:17 -04:00
|
|
|
t.tv_usec = (time_t)(d*1e6+0.5);
|
2001-12-21 04:23:28 -05:00
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
break;
|
|
|
|
|
|
|
|
case T_BIGNUM:
|
1999-08-13 01:45:20 -04:00
|
|
|
t.tv_sec = NUM2LONG(time);
|
2001-02-27 02:52:11 -05:00
|
|
|
if (interval && t.tv_sec < 0)
|
|
|
|
rb_raise(rb_eArgError, "%s must be positive", tstr);
|
1998-01-16 07:13:05 -05:00
|
|
|
t.tv_usec = 0;
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
2001-02-27 02:52:11 -05:00
|
|
|
rb_raise(rb_eTypeError, "can't convert %s into %s",
|
2003-01-30 23:00:17 -05:00
|
|
|
rb_obj_classname(time), tstr);
|
1998-01-16 07:13:05 -05:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
return t;
|
|
|
|
}
|
|
|
|
|
2000-08-31 01:29:54 -04:00
|
|
|
struct timeval
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_time_interval(VALUE time)
|
2000-08-31 01:29:54 -04:00
|
|
|
{
|
|
|
|
return time_timeval(time, Qtrue);
|
|
|
|
}
|
|
|
|
|
1999-08-13 01:45:20 -04:00
|
|
|
struct timeval
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_time_timeval(VALUE time)
|
1999-08-13 01:45:20 -04:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
|
|
|
struct timeval t;
|
|
|
|
|
2002-08-27 04:31:08 -04:00
|
|
|
if (TYPE(time) == T_DATA && RDATA(time)->dfree == time_free) {
|
1999-08-13 01:45:20 -04:00
|
|
|
GetTimeval(time, tobj);
|
|
|
|
t = tobj->tv;
|
|
|
|
return t;
|
|
|
|
}
|
2000-08-31 01:29:54 -04:00
|
|
|
return time_timeval(time, Qfalse);
|
1999-08-13 01:45:20 -04:00
|
|
|
}
|
|
|
|
|
2003-12-27 01:33:45 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* Time.at( aTime ) => time
|
|
|
|
* Time.at( seconds [, microseconds] ) => time
|
|
|
|
*
|
|
|
|
* Creates a new time object with the value given by <i>aTime</i>, or
|
|
|
|
* the given number of <i>seconds</i> (and optional
|
|
|
|
* <i>microseconds</i>) from epoch. A non-portable feature allows the
|
|
|
|
* offset to be negative on some systems.
|
|
|
|
*
|
|
|
|
* Time.at(0) #=> Wed Dec 31 18:00:00 CST 1969
|
|
|
|
* Time.at(946702800) #=> Fri Dec 31 23:00:00 CST 1999
|
|
|
|
* Time.at(-284061600) #=> Sat Dec 31 00:00:00 CST 1960
|
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_s_at(int argc, VALUE *argv, VALUE klass)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
struct timeval tv;
|
1999-10-29 05:25:48 -04:00
|
|
|
VALUE time, t;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
1999-10-29 05:25:48 -04:00
|
|
|
if (rb_scan_args(argc, argv, "11", &time, &t) == 2) {
|
2001-12-17 01:45:37 -05:00
|
|
|
tv.tv_sec = NUM2LONG(time);
|
2001-12-18 03:47:06 -05:00
|
|
|
tv.tv_usec = NUM2LONG(t);
|
1999-10-29 05:25:48 -04:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
tv = rb_time_timeval(time);
|
|
|
|
}
|
1999-08-13 01:45:20 -04:00
|
|
|
t = time_new_internal(klass, tv.tv_sec, tv.tv_usec);
|
2002-08-27 04:31:08 -04:00
|
|
|
if (TYPE(time) == T_DATA && RDATA(time)->dfree == time_free) {
|
1999-08-13 01:45:20 -04:00
|
|
|
struct time_object *tobj, *tobj2;
|
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
|
|
|
GetTimeval(t, tobj2);
|
|
|
|
tobj2->gmt = tobj->gmt;
|
|
|
|
}
|
|
|
|
return t;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2006-03-01 05:06:03 -05:00
|
|
|
static const char *months[] = {
|
1998-01-16 07:13:05 -05:00
|
|
|
"jan", "feb", "mar", "apr", "may", "jun",
|
|
|
|
"jul", "aug", "sep", "oct", "nov", "dec",
|
|
|
|
};
|
|
|
|
|
1999-08-13 01:45:20 -04:00
|
|
|
static long
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
obj2long(VALUE obj)
|
1999-01-19 23:59:39 -05:00
|
|
|
{
|
|
|
|
if (TYPE(obj) == T_STRING) {
|
2002-02-01 05:23:22 -05:00
|
|
|
obj = rb_str_to_inum(obj, 10, Qfalse);
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
|
|
|
|
1999-08-13 01:45:20 -04:00
|
|
|
return NUM2LONG(obj);
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_arg(int argc, VALUE *argv, struct tm *tm, time_t *usec)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2003-01-22 22:39:25 -05:00
|
|
|
VALUE v[8];
|
1998-01-16 07:13:05 -05:00
|
|
|
int i;
|
2001-12-17 01:45:37 -05:00
|
|
|
long year;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2000-06-12 03:48:31 -04:00
|
|
|
MEMZERO(tm, struct tm, 1);
|
2003-01-22 22:39:25 -05:00
|
|
|
*usec = 0;
|
1999-01-19 23:59:39 -05:00
|
|
|
if (argc == 10) {
|
|
|
|
v[0] = argv[5];
|
|
|
|
v[1] = argv[4];
|
|
|
|
v[2] = argv[3];
|
|
|
|
v[3] = argv[2];
|
|
|
|
v[4] = argv[1];
|
|
|
|
v[5] = argv[0];
|
2003-06-23 00:47:30 -04:00
|
|
|
v[6] = Qnil;
|
2001-12-17 01:45:37 -05:00
|
|
|
tm->tm_isdst = RTEST(argv[8]) ? 1 : 0;
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
|
|
|
else {
|
2003-01-22 22:39:25 -05:00
|
|
|
rb_scan_args(argc, argv, "17", &v[0],&v[1],&v[2],&v[3],&v[4],&v[5],&v[6],&v[7]);
|
|
|
|
/* v[6] may be usec or zone (parsedate) */
|
|
|
|
/* v[7] is wday (parsedate; ignored) */
|
|
|
|
tm->tm_wday = -1;
|
2001-12-17 01:45:37 -05:00
|
|
|
tm->tm_isdst = -1;
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2001-12-17 01:45:37 -05:00
|
|
|
year = obj2long(v[0]);
|
|
|
|
|
|
|
|
if (0 <= year && year < 39) {
|
2002-07-31 01:18:43 -04:00
|
|
|
year += 100;
|
2001-12-17 01:45:37 -05:00
|
|
|
rb_warning("2 digits year is used");
|
|
|
|
}
|
|
|
|
else if (69 <= year && year < 139) {
|
|
|
|
rb_warning("2 or 3 digits year is used");
|
|
|
|
}
|
2002-07-31 01:18:43 -04:00
|
|
|
else {
|
|
|
|
year -= 1900;
|
|
|
|
}
|
2001-12-17 01:45:37 -05:00
|
|
|
|
|
|
|
tm->tm_year = year;
|
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
if (NIL_P(v[1])) {
|
1999-08-13 01:45:20 -04:00
|
|
|
tm->tm_mon = 0;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2003-01-22 22:39:25 -05:00
|
|
|
else {
|
|
|
|
VALUE s = rb_check_string_type(v[1]);
|
|
|
|
if (!NIL_P(s)) {
|
|
|
|
tm->tm_mon = -1;
|
|
|
|
for (i=0; i<12; i++) {
|
2006-08-31 06:47:44 -04:00
|
|
|
if (RSTRING_LEN(s) == 3 &&
|
|
|
|
strcasecmp(months[i], RSTRING_PTR(v[1])) == 0) {
|
2003-01-22 22:39:25 -05:00
|
|
|
tm->tm_mon = i;
|
|
|
|
break;
|
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2003-01-22 22:39:25 -05:00
|
|
|
if (tm->tm_mon == -1) {
|
2006-08-31 06:47:44 -04:00
|
|
|
char c = RSTRING_PTR(s)[0];
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2003-01-22 22:39:25 -05:00
|
|
|
if ('0' <= c && c <= '9') {
|
|
|
|
tm->tm_mon = obj2long(s)-1;
|
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
}
|
2003-01-22 22:39:25 -05:00
|
|
|
else {
|
|
|
|
tm->tm_mon = obj2long(v[1])-1;
|
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
1999-01-19 23:59:39 -05:00
|
|
|
if (NIL_P(v[2])) {
|
1999-08-13 01:45:20 -04:00
|
|
|
tm->tm_mday = 1;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
else {
|
1999-08-13 01:45:20 -04:00
|
|
|
tm->tm_mday = obj2long(v[2]);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
1999-08-13 01:45:20 -04:00
|
|
|
tm->tm_hour = NIL_P(v[3])?0:obj2long(v[3]);
|
|
|
|
tm->tm_min = NIL_P(v[4])?0:obj2long(v[4]);
|
|
|
|
tm->tm_sec = NIL_P(v[5])?0:obj2long(v[5]);
|
2003-01-22 22:39:25 -05:00
|
|
|
if (!NIL_P(v[6])) {
|
2004-06-23 08:59:01 -04:00
|
|
|
/* when argc == 8, v[6] is timezone, but ignored */
|
|
|
|
if (argc == 7) {
|
2003-01-22 22:39:25 -05:00
|
|
|
*usec = obj2long(v[6]);
|
|
|
|
}
|
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
/* value validation */
|
2001-05-02 00:22:21 -04:00
|
|
|
if (
|
2004-06-23 08:59:01 -04:00
|
|
|
tm->tm_year != year ||
|
2001-05-02 00:22:21 -04:00
|
|
|
#ifndef NEGATIVE_TIME_T
|
2004-06-23 08:59:01 -04:00
|
|
|
tm->tm_year < 69 ||
|
2001-05-02 00:22:21 -04:00
|
|
|
#endif
|
|
|
|
tm->tm_mon < 0 || tm->tm_mon > 11
|
1999-08-13 01:45:20 -04:00
|
|
|
|| tm->tm_mday < 1 || tm->tm_mday > 31
|
2007-04-16 03:28:16 -04:00
|
|
|
|| tm->tm_hour < 0 || tm->tm_hour > 24
|
|
|
|
|| (tm->tm_hour == 24 && (tm->tm_min > 0 || tm->tm_sec > 0))
|
1999-08-13 01:45:20 -04:00
|
|
|
|| tm->tm_min < 0 || tm->tm_min > 59
|
|
|
|
|| tm->tm_sec < 0 || tm->tm_sec > 60)
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_raise(rb_eArgError, "argument out of range");
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
* bignum.c: changed `foo _((boo))' to `foo(boo)`. [ruby-dev:27056]
* defines.h, dir.c, dln.h, enumerator.c, env.h, error.c, eval.c, file.c,
gc.c, hash.c, inits.c, intern.h, io.c, lex.c, marshal.c, missing.h,
node.h, numeric.c, pack.c, process.c, re.h, ruby.c, ruby.h, rubyio.h,
rubysig.h, signal.c, sprintf.c, st.h, string.c, struct.c, time.c,
util.c, util.h, variable.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9155 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-14 02:32:32 -04:00
|
|
|
static VALUE time_gmtime(VALUE);
|
|
|
|
static VALUE time_localtime(VALUE);
|
|
|
|
static VALUE time_get_tm(VALUE, int);
|
1999-08-13 01:45:20 -04:00
|
|
|
|
2004-03-31 05:27:58 -05:00
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
leap_year_p(long y)
|
2004-03-31 05:27:58 -05:00
|
|
|
{
|
2004-06-23 08:59:01 -04:00
|
|
|
return ((y % 4 == 0) && (y % 100 != 0)) || (y % 400 == 0);
|
2004-03-31 05:27:58 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
#define DIV(n,d) ((n)<0 ? NDIV((n),(d)) : (n)/(d))
|
|
|
|
|
|
|
|
static time_t
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
timegm_noleapsecond(struct tm *tm)
|
2004-03-31 05:27:58 -05:00
|
|
|
{
|
|
|
|
static int common_year_yday_offset[] = {
|
2004-06-23 08:59:01 -04:00
|
|
|
-1,
|
|
|
|
-1 + 31,
|
|
|
|
-1 + 31 + 28,
|
|
|
|
-1 + 31 + 28 + 31,
|
|
|
|
-1 + 31 + 28 + 31 + 30,
|
|
|
|
-1 + 31 + 28 + 31 + 30 + 31,
|
|
|
|
-1 + 31 + 28 + 31 + 30 + 31 + 30,
|
|
|
|
-1 + 31 + 28 + 31 + 30 + 31 + 30 + 31,
|
|
|
|
-1 + 31 + 28 + 31 + 30 + 31 + 30 + 31 + 31,
|
|
|
|
-1 + 31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30,
|
|
|
|
-1 + 31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31,
|
|
|
|
-1 + 31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30
|
|
|
|
/* 1 2 3 4 5 6 7 8 9 10 11 */
|
2004-03-31 05:27:58 -05:00
|
|
|
};
|
|
|
|
static int leap_year_yday_offset[] = {
|
2004-06-23 08:59:01 -04:00
|
|
|
-1,
|
|
|
|
-1 + 31,
|
|
|
|
-1 + 31 + 29,
|
|
|
|
-1 + 31 + 29 + 31,
|
|
|
|
-1 + 31 + 29 + 31 + 30,
|
|
|
|
-1 + 31 + 29 + 31 + 30 + 31,
|
|
|
|
-1 + 31 + 29 + 31 + 30 + 31 + 30,
|
|
|
|
-1 + 31 + 29 + 31 + 30 + 31 + 30 + 31,
|
|
|
|
-1 + 31 + 29 + 31 + 30 + 31 + 30 + 31 + 31,
|
|
|
|
-1 + 31 + 29 + 31 + 30 + 31 + 30 + 31 + 31 + 30,
|
|
|
|
-1 + 31 + 29 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31,
|
|
|
|
-1 + 31 + 29 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30
|
|
|
|
/* 1 2 3 4 5 6 7 8 9 10 11 */
|
2004-03-31 05:27:58 -05:00
|
|
|
};
|
|
|
|
|
|
|
|
long tm_year = tm->tm_year;
|
|
|
|
int tm_yday = tm->tm_mday;
|
|
|
|
if (leap_year_p(tm_year + 1900))
|
2004-06-23 08:59:01 -04:00
|
|
|
tm_yday += leap_year_yday_offset[tm->tm_mon];
|
2004-03-31 05:27:58 -05:00
|
|
|
else
|
2004-06-23 08:59:01 -04:00
|
|
|
tm_yday += common_year_yday_offset[tm->tm_mon];
|
2004-03-31 05:27:58 -05:00
|
|
|
|
|
|
|
/*
|
|
|
|
* `Seconds Since the Epoch' in SUSv3:
|
|
|
|
* tm_sec + tm_min*60 + tm_hour*3600 + tm_yday*86400 +
|
|
|
|
* (tm_year-70)*31536000 + ((tm_year-69)/4)*86400 -
|
|
|
|
* ((tm_year-1)/100)*86400 + ((tm_year+299)/400)*86400
|
|
|
|
*/
|
|
|
|
return tm->tm_sec + tm->tm_min*60 + tm->tm_hour*3600 +
|
2004-06-23 08:59:01 -04:00
|
|
|
(time_t)(tm_yday +
|
|
|
|
(tm_year-70)*365 +
|
|
|
|
DIV(tm_year-69,4) -
|
|
|
|
DIV(tm_year-1,100) +
|
|
|
|
DIV(tm_year+299,400))*86400;
|
2004-03-31 05:27:58 -05:00
|
|
|
}
|
|
|
|
|
2001-05-24 02:10:36 -04:00
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
tmcmp(struct tm *a, struct tm *b)
|
2001-05-24 02:10:36 -04:00
|
|
|
{
|
|
|
|
if (a->tm_year != b->tm_year)
|
2004-06-23 08:59:01 -04:00
|
|
|
return a->tm_year < b->tm_year ? -1 : 1;
|
2001-05-24 02:10:36 -04:00
|
|
|
else if (a->tm_mon != b->tm_mon)
|
2004-06-23 08:59:01 -04:00
|
|
|
return a->tm_mon < b->tm_mon ? -1 : 1;
|
2001-05-24 02:10:36 -04:00
|
|
|
else if (a->tm_mday != b->tm_mday)
|
2004-06-23 08:59:01 -04:00
|
|
|
return a->tm_mday < b->tm_mday ? -1 : 1;
|
2001-05-24 02:10:36 -04:00
|
|
|
else if (a->tm_hour != b->tm_hour)
|
2004-06-23 08:59:01 -04:00
|
|
|
return a->tm_hour < b->tm_hour ? -1 : 1;
|
2001-05-24 02:10:36 -04:00
|
|
|
else if (a->tm_min != b->tm_min)
|
2004-06-23 08:59:01 -04:00
|
|
|
return a->tm_min < b->tm_min ? -1 : 1;
|
2001-05-24 02:10:36 -04:00
|
|
|
else if (a->tm_sec != b->tm_sec)
|
2004-06-23 08:59:01 -04:00
|
|
|
return a->tm_sec < b->tm_sec ? -1 : 1;
|
2001-05-24 02:10:36 -04:00
|
|
|
else
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-02-13 21:48:08 -05:00
|
|
|
#if SIZEOF_TIME_T == SIZEOF_LONG
|
|
|
|
typedef unsigned long unsigned_time_t;
|
|
|
|
#elif SIZEOF_TIME_T == SIZEOF_INT
|
|
|
|
typedef unsigned int unsigned_time_t;
|
|
|
|
#elif SIZEOF_TIME_T == SIZEOF_LONG_LONG
|
|
|
|
typedef unsigned LONG_LONG unsigned_time_t;
|
|
|
|
#else
|
|
|
|
# error cannot find integer type which size is same as time_t.
|
|
|
|
#endif
|
|
|
|
|
1999-08-13 01:45:20 -04:00
|
|
|
static time_t
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
search_time_t(struct tm *tptr, int utc_p)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2001-05-24 02:10:36 -04:00
|
|
|
time_t guess, guess_lo, guess_hi;
|
|
|
|
struct tm *tm, tm_lo, tm_hi;
|
2001-05-30 05:12:34 -04:00
|
|
|
int d, have_guess;
|
|
|
|
int find_dst;
|
|
|
|
|
2001-12-17 01:45:37 -05:00
|
|
|
find_dst = 0 < tptr->tm_isdst;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2001-05-24 02:10:36 -04:00
|
|
|
#ifdef NEGATIVE_TIME_T
|
2006-02-13 21:48:08 -05:00
|
|
|
guess_lo = (time_t)~((unsigned_time_t)~(time_t)0 >> 1);
|
2001-05-24 02:10:36 -04:00
|
|
|
#else
|
|
|
|
guess_lo = 0;
|
|
|
|
#endif
|
|
|
|
guess_hi = ((time_t)-1) < ((time_t)0) ?
|
2006-02-13 21:48:08 -05:00
|
|
|
(time_t)((unsigned_time_t)~(time_t)0 >> 1) :
|
2001-05-24 02:10:36 -04:00
|
|
|
~(time_t)0;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2004-03-31 05:27:58 -05:00
|
|
|
guess = timegm_noleapsecond(tptr);
|
|
|
|
tm = (utc_p ? gmtime : localtime)(&guess);
|
|
|
|
if (tm) {
|
2004-06-23 08:59:01 -04:00
|
|
|
d = tmcmp(tptr, tm);
|
|
|
|
if (d == 0) return guess;
|
|
|
|
if (d < 0) {
|
|
|
|
guess_hi = guess;
|
|
|
|
guess -= 24 * 60 * 60;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
guess_lo = guess;
|
|
|
|
guess += 24 * 60 * 60;
|
|
|
|
}
|
|
|
|
if (guess_lo < guess && guess < guess_hi &&
|
|
|
|
(tm = (utc_p ? gmtime : localtime)(&guess)) != NULL) {
|
|
|
|
d = tmcmp(tptr, tm);
|
|
|
|
if (d == 0) return guess;
|
|
|
|
if (d < 0)
|
|
|
|
guess_hi = guess;
|
|
|
|
else
|
|
|
|
guess_lo = guess;
|
|
|
|
}
|
2004-03-30 06:31:44 -05:00
|
|
|
}
|
|
|
|
|
2001-05-24 02:10:36 -04:00
|
|
|
tm = (utc_p ? gmtime : localtime)(&guess_lo);
|
1998-01-16 07:13:05 -05:00
|
|
|
if (!tm) goto error;
|
2001-05-24 02:10:36 -04:00
|
|
|
d = tmcmp(tptr, tm);
|
|
|
|
if (d < 0) goto out_of_range;
|
|
|
|
if (d == 0) return guess_lo;
|
|
|
|
tm_lo = *tm;
|
2001-05-02 00:22:21 -04:00
|
|
|
|
2001-05-24 02:10:36 -04:00
|
|
|
tm = (utc_p ? gmtime : localtime)(&guess_hi);
|
|
|
|
if (!tm) goto error;
|
|
|
|
d = tmcmp(tptr, tm);
|
|
|
|
if (d > 0) goto out_of_range;
|
|
|
|
if (d == 0) return guess_hi;
|
|
|
|
tm_hi = *tm;
|
|
|
|
|
2001-05-30 05:12:34 -04:00
|
|
|
have_guess = 0;
|
|
|
|
|
|
|
|
while (guess_lo + 1 < guess_hi) {
|
2004-06-23 08:59:01 -04:00
|
|
|
/* there is a gap between guess_lo and guess_hi. */
|
|
|
|
unsigned long range = 0;
|
|
|
|
if (!have_guess) {
|
|
|
|
int a, b;
|
|
|
|
/*
|
|
|
|
Try precious guess by a linear interpolation at first.
|
|
|
|
`a' and `b' is a coefficient of guess_lo and guess_hi as:
|
|
|
|
|
|
|
|
guess = (guess_lo * a + guess_hi * b) / (a + b)
|
|
|
|
|
|
|
|
However this causes overflow in most cases, following assignment
|
|
|
|
is used instead:
|
|
|
|
|
|
|
|
guess = guess_lo / d * a + (guess_lo % d) * a / d
|
|
|
|
+ guess_hi / d * b + (guess_hi % d) * b / d
|
|
|
|
where d = a + b
|
|
|
|
|
|
|
|
To avoid overflow in this assignment, `d' is restricted to less than
|
|
|
|
sqrt(2**31). By this restriction and other reasons, the guess is
|
|
|
|
not accurate and some error is expected. `range' approximates
|
|
|
|
the maximum error.
|
|
|
|
|
|
|
|
When these parameters are not suitable, i.e. guess is not within
|
|
|
|
guess_lo and guess_hi, simple guess by binary search is used.
|
|
|
|
*/
|
|
|
|
range = 366 * 24 * 60 * 60;
|
|
|
|
a = (tm_hi.tm_year - tptr->tm_year);
|
|
|
|
b = (tptr->tm_year - tm_lo.tm_year);
|
|
|
|
/* 46000 is selected as `some big number less than sqrt(2**31)'. */
|
|
|
|
if (a + b <= 46000 / 12) {
|
|
|
|
range = 31 * 24 * 60 * 60;
|
|
|
|
a *= 12;
|
|
|
|
b *= 12;
|
|
|
|
a += tm_hi.tm_mon - tptr->tm_mon;
|
|
|
|
b += tptr->tm_mon - tm_lo.tm_mon;
|
|
|
|
if (a + b <= 46000 / 31) {
|
|
|
|
range = 24 * 60 * 60;
|
|
|
|
a *= 31;
|
|
|
|
b *= 31;
|
|
|
|
a += tm_hi.tm_mday - tptr->tm_mday;
|
|
|
|
b += tptr->tm_mday - tm_lo.tm_mday;
|
|
|
|
if (a + b <= 46000 / 24) {
|
|
|
|
range = 60 * 60;
|
|
|
|
a *= 24;
|
|
|
|
b *= 24;
|
|
|
|
a += tm_hi.tm_hour - tptr->tm_hour;
|
|
|
|
b += tptr->tm_hour - tm_lo.tm_hour;
|
|
|
|
if (a + b <= 46000 / 60) {
|
|
|
|
range = 60;
|
|
|
|
a *= 60;
|
|
|
|
b *= 60;
|
|
|
|
a += tm_hi.tm_min - tptr->tm_min;
|
|
|
|
b += tptr->tm_min - tm_lo.tm_min;
|
|
|
|
if (a + b <= 46000 / 60) {
|
|
|
|
range = 1;
|
|
|
|
a *= 60;
|
|
|
|
b *= 60;
|
|
|
|
a += tm_hi.tm_sec - tptr->tm_sec;
|
|
|
|
b += tptr->tm_sec - tm_lo.tm_sec;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2001-05-30 05:12:34 -04:00
|
|
|
}
|
|
|
|
}
|
2004-06-23 08:59:01 -04:00
|
|
|
if (a <= 0) a = 1;
|
|
|
|
if (b <= 0) b = 1;
|
|
|
|
d = a + b;
|
|
|
|
/*
|
|
|
|
Although `/' and `%' may produce unexpected result with negative
|
|
|
|
argument, it doesn't cause serious problem because there is a
|
|
|
|
fail safe.
|
|
|
|
*/
|
|
|
|
guess = guess_lo / d * a + (guess_lo % d) * a / d
|
|
|
|
+ guess_hi / d * b + (guess_hi % d) * b / d;
|
2001-05-30 05:12:34 -04:00
|
|
|
have_guess = 1;
|
2000-06-12 03:48:31 -04:00
|
|
|
}
|
2004-06-23 08:59:01 -04:00
|
|
|
|
|
|
|
if (guess <= guess_lo || guess_hi <= guess) {
|
|
|
|
/* Precious guess is invalid. try binary search. */
|
|
|
|
guess = guess_lo / 2 + guess_hi / 2;
|
|
|
|
if (guess <= guess_lo)
|
|
|
|
guess = guess_lo + 1;
|
|
|
|
else if (guess >= guess_hi)
|
|
|
|
guess = guess_hi - 1;
|
|
|
|
range = 0;
|
2001-05-30 05:12:34 -04:00
|
|
|
}
|
2004-06-23 08:59:01 -04:00
|
|
|
|
|
|
|
tm = (utc_p ? gmtime : localtime)(&guess);
|
|
|
|
if (!tm) goto error;
|
|
|
|
have_guess = 0;
|
|
|
|
|
|
|
|
d = tmcmp(tptr, tm);
|
|
|
|
if (d < 0) {
|
|
|
|
guess_hi = guess;
|
|
|
|
tm_hi = *tm;
|
|
|
|
if (range) {
|
|
|
|
guess = guess - range;
|
|
|
|
range = 0;
|
|
|
|
if (guess_lo < guess && guess < guess_hi)
|
|
|
|
have_guess = 1;
|
2001-05-30 05:12:34 -04:00
|
|
|
}
|
2004-06-23 08:59:01 -04:00
|
|
|
}
|
|
|
|
else if (d > 0) {
|
|
|
|
guess_lo = guess;
|
|
|
|
tm_lo = *tm;
|
|
|
|
if (range) {
|
|
|
|
guess = guess + range;
|
|
|
|
range = 0;
|
|
|
|
if (guess_lo < guess && guess < guess_hi)
|
|
|
|
have_guess = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (!utc_p) {
|
|
|
|
/* If localtime is nonmonotonic, another result may exist. */
|
|
|
|
time_t guess2;
|
|
|
|
if (find_dst) {
|
|
|
|
guess2 = guess - 2 * 60 * 60;
|
|
|
|
tm = localtime(&guess2);
|
|
|
|
if (tm) {
|
|
|
|
if (tptr->tm_hour != (tm->tm_hour + 2) % 24 ||
|
|
|
|
tptr->tm_min != tm->tm_min ||
|
|
|
|
tptr->tm_sec != tm->tm_sec
|
|
|
|
) {
|
|
|
|
guess2 -= (tm->tm_hour - tptr->tm_hour) * 60 * 60 +
|
|
|
|
(tm->tm_min - tptr->tm_min) * 60 +
|
|
|
|
(tm->tm_sec - tptr->tm_sec);
|
|
|
|
if (tptr->tm_mday != tm->tm_mday)
|
|
|
|
guess2 += 24 * 60 * 60;
|
|
|
|
if (guess != guess2) {
|
|
|
|
tm = localtime(&guess2);
|
|
|
|
if (tmcmp(tptr, tm) == 0) {
|
|
|
|
if (guess < guess2)
|
|
|
|
return guess;
|
|
|
|
else
|
|
|
|
return guess2;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
guess2 = guess + 2 * 60 * 60;
|
|
|
|
tm = localtime(&guess2);
|
|
|
|
if (tm) {
|
|
|
|
if ((tptr->tm_hour + 2) % 24 != tm->tm_hour ||
|
|
|
|
tptr->tm_min != tm->tm_min ||
|
|
|
|
tptr->tm_sec != tm->tm_sec
|
|
|
|
) {
|
|
|
|
guess2 -= (tm->tm_hour - tptr->tm_hour) * 60 * 60 +
|
|
|
|
(tm->tm_min - tptr->tm_min) * 60 +
|
|
|
|
(tm->tm_sec - tptr->tm_sec);
|
|
|
|
if (tptr->tm_mday != tm->tm_mday)
|
|
|
|
guess2 -= 24 * 60 * 60;
|
|
|
|
if (guess != guess2) {
|
|
|
|
tm = localtime(&guess2);
|
|
|
|
if (tmcmp(tptr, tm) == 0) {
|
|
|
|
if (guess < guess2)
|
|
|
|
return guess2;
|
|
|
|
else
|
|
|
|
return guess;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2001-05-30 05:12:34 -04:00
|
|
|
}
|
|
|
|
}
|
2004-06-23 08:59:01 -04:00
|
|
|
return guess;
|
2001-05-16 05:05:54 -04:00
|
|
|
}
|
2001-05-24 02:10:36 -04:00
|
|
|
}
|
2001-05-30 05:12:34 -04:00
|
|
|
/* Given argument has no corresponding time_t. Let's outerpolation. */
|
|
|
|
if (tm_lo.tm_year == tptr->tm_year && tm_lo.tm_mon == tptr->tm_mon) {
|
2004-06-23 08:59:01 -04:00
|
|
|
return guess_lo +
|
|
|
|
(tptr->tm_mday - tm_lo.tm_mday) * 24 * 60 * 60 +
|
|
|
|
(tptr->tm_hour - tm_lo.tm_hour) * 60 * 60 +
|
|
|
|
(tptr->tm_min - tm_lo.tm_min) * 60 +
|
|
|
|
(tptr->tm_sec - tm_lo.tm_sec);
|
2001-05-24 02:10:36 -04:00
|
|
|
}
|
2001-05-30 05:12:34 -04:00
|
|
|
else if (tm_hi.tm_year == tptr->tm_year && tm_hi.tm_mon == tptr->tm_mon) {
|
2004-06-23 08:59:01 -04:00
|
|
|
return guess_hi +
|
|
|
|
(tptr->tm_mday - tm_hi.tm_mday) * 24 * 60 * 60 +
|
|
|
|
(tptr->tm_hour - tm_hi.tm_hour) * 60 * 60 +
|
|
|
|
(tptr->tm_min - tm_hi.tm_min) * 60 +
|
|
|
|
(tptr->tm_sec - tm_hi.tm_sec);
|
2000-06-12 03:48:31 -04:00
|
|
|
}
|
1999-08-13 01:45:20 -04:00
|
|
|
|
|
|
|
out_of_range:
|
|
|
|
rb_raise(rb_eArgError, "time out of range");
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
error:
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_raise(rb_eArgError, "gmtime/localtime error");
|
1999-09-16 05:40:33 -04:00
|
|
|
return 0; /* not reached */
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2001-12-17 01:45:37 -05:00
|
|
|
static time_t
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
make_time_t(struct tm *tptr, int utc_p)
|
2001-12-17 01:45:37 -05:00
|
|
|
{
|
|
|
|
time_t t;
|
|
|
|
struct tm *tmp, buf;
|
|
|
|
buf = *tptr;
|
|
|
|
if (utc_p) {
|
|
|
|
#if defined(HAVE_TIMEGM)
|
2003-03-22 01:54:29 -05:00
|
|
|
if ((t = timegm(&buf)) != -1)
|
2004-06-23 08:59:01 -04:00
|
|
|
return t;
|
2001-12-17 01:45:37 -05:00
|
|
|
#ifdef NEGATIVE_TIME_T
|
2004-06-23 08:59:01 -04:00
|
|
|
if ((tmp = gmtime(&t)) &&
|
|
|
|
tptr->tm_year == tmp->tm_year &&
|
|
|
|
tptr->tm_mon == tmp->tm_mon &&
|
|
|
|
tptr->tm_mday == tmp->tm_mday &&
|
|
|
|
tptr->tm_hour == tmp->tm_hour &&
|
|
|
|
tptr->tm_min == tmp->tm_min &&
|
|
|
|
tptr->tm_sec == tmp->tm_sec
|
|
|
|
)
|
|
|
|
return t;
|
2001-12-17 01:45:37 -05:00
|
|
|
#endif
|
|
|
|
#endif
|
2003-03-22 01:54:29 -05:00
|
|
|
return search_time_t(&buf, utc_p);
|
2001-12-17 01:45:37 -05:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
#if defined(HAVE_MKTIME)
|
2003-03-22 01:54:29 -05:00
|
|
|
if ((t = mktime(&buf)) != -1)
|
2004-06-23 08:59:01 -04:00
|
|
|
return t;
|
2001-12-17 01:45:37 -05:00
|
|
|
#ifdef NEGATIVE_TIME_T
|
2004-06-23 08:59:01 -04:00
|
|
|
if ((tmp = localtime(&t)) &&
|
|
|
|
tptr->tm_year == tmp->tm_year &&
|
|
|
|
tptr->tm_mon == tmp->tm_mon &&
|
|
|
|
tptr->tm_mday == tmp->tm_mday &&
|
|
|
|
tptr->tm_hour == tmp->tm_hour &&
|
|
|
|
tptr->tm_min == tmp->tm_min &&
|
|
|
|
tptr->tm_sec == tmp->tm_sec
|
|
|
|
)
|
2003-03-22 01:54:29 -05:00
|
|
|
return t;
|
2001-12-17 01:45:37 -05:00
|
|
|
#endif
|
|
|
|
#endif
|
2003-03-22 01:54:29 -05:00
|
|
|
return search_time_t(&buf, utc_p);
|
2001-12-17 01:45:37 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1999-08-13 01:45:20 -04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_utc_or_local(int argc, VALUE *argv, int utc_p, VALUE klass)
|
1999-08-13 01:45:20 -04:00
|
|
|
{
|
|
|
|
struct tm tm;
|
|
|
|
VALUE time;
|
2000-07-06 03:21:26 -04:00
|
|
|
time_t usec;
|
1999-08-13 01:45:20 -04:00
|
|
|
|
2000-07-06 03:21:26 -04:00
|
|
|
time_arg(argc, argv, &tm, &usec);
|
|
|
|
time = time_new_internal(klass, make_time_t(&tm, utc_p), usec);
|
|
|
|
if (utc_p) return time_gmtime(time);
|
1999-08-13 01:45:20 -04:00
|
|
|
return time_localtime(time);
|
|
|
|
}
|
|
|
|
|
2003-12-27 01:33:45 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* Time.utc( year [, month, day, hour, min, sec, usec] ) => time
|
|
|
|
* Time.utc( sec, min, hour, day, month, year, wday, yday, isdst, tz
|
|
|
|
* ) => time
|
|
|
|
* Time.gm( year [, month, day, hour, min, sec, usec] ) => time
|
|
|
|
* Time.gm( sec, min, hour, day, month, year, wday, yday, isdst, tz
|
|
|
|
* ) => time
|
|
|
|
*
|
|
|
|
* Creates a time based on given values, interpreted as UTC (GMT). The
|
|
|
|
* year must be specified. Other values default to the minimum value
|
|
|
|
* for that field (and may be <code>nil</code> or omitted). Months may
|
|
|
|
* be specified by numbers from 1 to 12, or by the three-letter English
|
|
|
|
* month names. Hours are specified on a 24-hour clock (0..23). Raises
|
|
|
|
* an <code>ArgumentError</code> if any values are out of range. Will
|
|
|
|
* also accept ten arguments in the order output by
|
|
|
|
* <code>Time#to_a</code>.
|
|
|
|
*
|
|
|
|
* Time.utc(2000,"jan",1,20,15,1) #=> Sat Jan 01 20:15:01 UTC 2000
|
|
|
|
* Time.gm(2000,"jan",1,20,15,1) #=> Sat Jan 01 20:15:01 UTC 2000
|
|
|
|
*/
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_s_mkutc(int argc, VALUE *argv, VALUE klass)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2000-06-12 03:48:31 -04:00
|
|
|
return time_utc_or_local(argc, argv, Qtrue, klass);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2003-12-27 01:33:45 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* Time.local( year [, month, day, hour, min, sec, usec] ) => time
|
|
|
|
* Time.local( sec, min, hour, day, month, year, wday, yday, isdst,
|
|
|
|
* tz ) => time
|
|
|
|
* Time.mktime( year, month, day, hour, min, sec, usec ) => time
|
|
|
|
*
|
|
|
|
* Same as <code>Time::gm</code>, but interprets the values in the
|
|
|
|
* local time zone.
|
|
|
|
*
|
|
|
|
* Time.local(2000,"jan",1,20,15,1) #=> Sat Jan 01 20:15:01 CST 2000
|
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_s_mktime(int argc, VALUE *argv, VALUE klass)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2000-06-12 03:48:31 -04:00
|
|
|
return time_utc_or_local(argc, argv, Qfalse, klass);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2003-12-27 01:33:45 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.to_i => int
|
|
|
|
* time.tv_sec => int
|
|
|
|
*
|
|
|
|
* Returns the value of <i>time</i> as an integer number of seconds
|
|
|
|
* since epoch.
|
|
|
|
*
|
|
|
|
* t = Time.now
|
|
|
|
* "%10.5f" % t.to_f #=> "1049896564.17839"
|
|
|
|
* t.to_i #=> 1049896564
|
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_to_i(VALUE time)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
2001-12-17 01:45:37 -05:00
|
|
|
return LONG2NUM(tobj->tv.tv_sec);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2003-12-27 01:33:45 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.to_f => float
|
|
|
|
*
|
|
|
|
* Returns the value of <i>time</i> as a floating point number of
|
|
|
|
* seconds since epoch.
|
|
|
|
*
|
|
|
|
* t = Time.now
|
|
|
|
* "%10.5f" % t.to_f #=> "1049896564.13654"
|
|
|
|
* t.to_i #=> 1049896564
|
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_to_f(VALUE time)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
2000-07-06 03:21:26 -04:00
|
|
|
return rb_float_new((double)tobj->tv.tv_sec+(double)tobj->tv.tv_usec/1e6);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2003-12-27 01:33:45 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.usec => int
|
|
|
|
* time.tv_usec => int
|
|
|
|
*
|
|
|
|
* Returns just the number of microseconds for <i>time</i>.
|
|
|
|
*
|
|
|
|
* t = Time.now #=> Wed Apr 09 08:56:04 CDT 2003
|
|
|
|
* "%10.6f" % t.to_f #=> "1049896564.259970"
|
|
|
|
* t.usec #=> 259970
|
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_usec(VALUE time)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
2002-08-21 11:47:54 -04:00
|
|
|
return LONG2NUM(tobj->tv.tv_usec);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2003-12-27 01:33:45 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time <=> other_time => -1, 0, +1
|
|
|
|
* time <=> numeric => -1, 0, +1
|
|
|
|
*
|
|
|
|
* Comparison---Compares <i>time</i> with <i>other_time</i> or with
|
|
|
|
* <i>numeric</i>, which is the number of seconds (possibly
|
|
|
|
* fractional) since epoch.
|
|
|
|
*
|
|
|
|
* t = Time.now #=> Wed Apr 09 08:56:03 CDT 2003
|
|
|
|
* t2 = t + 2592000 #=> Fri May 09 08:56:03 CDT 2003
|
|
|
|
* t <=> t2 #=> -1
|
|
|
|
* t2 <=> t #=> 1
|
|
|
|
* t <=> t #=> 0
|
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_cmp(VALUE time1, VALUE time2)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
struct time_object *tobj1, *tobj2;
|
|
|
|
|
|
|
|
GetTimeval(time1, tobj1);
|
2003-05-19 11:45:46 -04:00
|
|
|
if (TYPE(time2) == T_DATA && RDATA(time2)->dfree == time_free) {
|
|
|
|
GetTimeval(time2, tobj2);
|
|
|
|
if (tobj1->tv.tv_sec == tobj2->tv.tv_sec) {
|
|
|
|
if (tobj1->tv.tv_usec == tobj2->tv.tv_usec) return INT2FIX(0);
|
|
|
|
if (tobj1->tv.tv_usec > tobj2->tv.tv_usec) return INT2FIX(1);
|
2001-12-03 05:07:48 -05:00
|
|
|
return INT2FIX(-1);
|
|
|
|
}
|
2003-05-19 11:45:46 -04:00
|
|
|
if (tobj1->tv.tv_sec > tobj2->tv.tv_sec) return INT2FIX(1);
|
2000-02-17 02:11:22 -05:00
|
|
|
return INT2FIX(-1);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2003-05-16 01:13:17 -04:00
|
|
|
|
2002-11-22 04:14:24 -05:00
|
|
|
return Qnil;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2003-12-27 01:33:45 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.eql?(other_time)
|
|
|
|
*
|
|
|
|
* Return <code>true</code> if <i>time</i> and <i>other_time</i> are
|
|
|
|
* both <code>Time</code> objects with the same seconds and fractional
|
|
|
|
* seconds.
|
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_eql(VALUE time1, VALUE time2)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
struct time_object *tobj1, *tobj2;
|
|
|
|
|
|
|
|
GetTimeval(time1, tobj1);
|
2002-08-27 04:31:08 -04:00
|
|
|
if (TYPE(time2) == T_DATA && RDATA(time2)->dfree == time_free) {
|
1998-01-16 07:13:05 -05:00
|
|
|
GetTimeval(time2, tobj2);
|
|
|
|
if (tobj1->tv.tv_sec == tobj2->tv.tv_sec) {
|
1999-01-19 23:59:39 -05:00
|
|
|
if (tobj1->tv.tv_usec == tobj2->tv.tv_usec) return Qtrue;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
}
|
1999-01-19 23:59:39 -05:00
|
|
|
return Qfalse;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2003-12-27 01:33:45 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.utc? => true or false
|
|
|
|
* time.gmt? => true or false
|
|
|
|
*
|
|
|
|
* Returns <code>true</code> if <i>time</i> represents a time in UTC
|
|
|
|
* (GMT).
|
|
|
|
*
|
|
|
|
* t = Time.now #=> Wed Apr 09 08:56:04 CDT 2003
|
|
|
|
* t.utc? #=> false
|
|
|
|
* t = Time.gm(2000,"jan",1,20,15,1) #=> Sat Jan 01 20:15:01 UTC 2000
|
|
|
|
* t.utc? #=> true
|
|
|
|
*
|
|
|
|
* t = Time.now #=> Wed Apr 09 08:56:03 CDT 2003
|
|
|
|
* t.gmt? #=> false
|
|
|
|
* t = Time.gm(2000,1,1,20,15,1) #=> Sat Jan 01 20:15:01 UTC 2000
|
|
|
|
* t.gmt? #=> true
|
|
|
|
*/
|
|
|
|
|
1999-08-13 01:45:20 -04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_utc_p(VALUE time)
|
1999-08-13 01:45:20 -04:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
|
|
|
if (tobj->gmt) return Qtrue;
|
|
|
|
return Qfalse;
|
|
|
|
}
|
|
|
|
|
2003-12-27 01:33:45 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.hash => fixnum
|
|
|
|
*
|
|
|
|
* Return a hash code for this time object.
|
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_hash(VALUE time)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
1999-08-13 01:45:20 -04:00
|
|
|
long hash;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
|
|
|
hash = tobj->tv.tv_sec ^ tobj->tv.tv_usec;
|
2002-08-21 11:47:54 -04:00
|
|
|
return LONG2FIX(hash);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2004-01-18 09:16:47 -05:00
|
|
|
/* :nodoc: */
|
1999-08-13 01:45:20 -04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_init_copy(VALUE copy, VALUE time)
|
1999-08-13 01:45:20 -04:00
|
|
|
{
|
2002-08-27 04:31:08 -04:00
|
|
|
struct time_object *tobj, *tcopy;
|
1999-08-13 01:45:20 -04:00
|
|
|
|
2002-09-03 01:20:14 -04:00
|
|
|
if (copy == time) return copy;
|
|
|
|
time_modify(copy);
|
2002-08-27 04:31:08 -04:00
|
|
|
if (TYPE(time) != T_DATA || RDATA(time)->dfree != time_free) {
|
|
|
|
rb_raise(rb_eTypeError, "wrong argument type");
|
|
|
|
}
|
1999-08-13 01:45:20 -04:00
|
|
|
GetTimeval(time, tobj);
|
2002-08-27 04:31:08 -04:00
|
|
|
GetTimeval(copy, tcopy);
|
|
|
|
MEMCPY(tcopy, tobj, struct time_object, 1);
|
|
|
|
|
|
|
|
return copy;
|
|
|
|
}
|
1999-08-13 01:45:20 -04:00
|
|
|
|
2002-08-27 04:31:08 -04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_dup(VALUE time)
|
2002-08-27 04:31:08 -04:00
|
|
|
{
|
2006-10-31 03:08:46 -05:00
|
|
|
VALUE dup = time_s_alloc(CLASS_OF(time));
|
2003-05-19 01:41:08 -04:00
|
|
|
time_init_copy(dup, time);
|
2002-08-27 04:31:08 -04:00
|
|
|
return dup;
|
1999-08-13 01:45:20 -04:00
|
|
|
}
|
|
|
|
|
2003-12-27 01:33:45 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.localtime => time
|
|
|
|
*
|
|
|
|
* Converts <i>time</i> to local time (using the local time zone in
|
|
|
|
* effect for this process) modifying the receiver.
|
|
|
|
*
|
|
|
|
* t = Time.gm(2000, "jan", 1, 20, 15, 1)
|
|
|
|
* t.gmt? #=> true
|
|
|
|
* t.localtime #=> Sat Jan 01 14:15:01 CST 2000
|
|
|
|
* t.gmt? #=> false
|
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_localtime(VALUE time)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
|
|
|
struct tm *tm_tmp;
|
1999-08-13 01:45:20 -04:00
|
|
|
time_t t;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
2001-12-03 05:07:48 -05:00
|
|
|
if (!tobj->gmt) {
|
|
|
|
if (tobj->tm_got)
|
|
|
|
return time;
|
|
|
|
}
|
|
|
|
else {
|
2001-10-29 00:07:26 -05:00
|
|
|
time_modify(time);
|
2000-06-19 04:38:11 -04:00
|
|
|
}
|
1999-08-13 01:45:20 -04:00
|
|
|
t = tobj->tv.tv_sec;
|
|
|
|
tm_tmp = localtime(&t);
|
2001-12-17 01:45:37 -05:00
|
|
|
if (!tm_tmp)
|
|
|
|
rb_raise(rb_eArgError, "localtime error");
|
1998-01-16 07:13:05 -05:00
|
|
|
tobj->tm = *tm_tmp;
|
|
|
|
tobj->tm_got = 1;
|
|
|
|
tobj->gmt = 0;
|
|
|
|
return time;
|
|
|
|
}
|
|
|
|
|
2003-12-27 01:33:45 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.gmtime => time
|
|
|
|
* time.utc => time
|
|
|
|
*
|
|
|
|
* Converts <i>time</i> to UTC (GMT), modifying the receiver.
|
|
|
|
*
|
|
|
|
* t = Time.now #=> Wed Apr 09 08:56:03 CDT 2003
|
|
|
|
* t.gmt? #=> false
|
|
|
|
* t.gmtime #=> Wed Apr 09 13:56:03 UTC 2003
|
|
|
|
* t.gmt? #=> true
|
|
|
|
*
|
|
|
|
* t = Time.now #=> Wed Apr 09 08:56:04 CDT 2003
|
|
|
|
* t.utc? #=> false
|
|
|
|
* t.utc #=> Wed Apr 09 13:56:04 UTC 2003
|
|
|
|
* t.utc? #=> true
|
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_gmtime(VALUE time)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
|
|
|
struct tm *tm_tmp;
|
1999-08-13 01:45:20 -04:00
|
|
|
time_t t;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
2001-12-03 05:07:48 -05:00
|
|
|
if (tobj->gmt) {
|
|
|
|
if (tobj->tm_got)
|
|
|
|
return time;
|
|
|
|
}
|
|
|
|
else {
|
2001-10-29 00:07:26 -05:00
|
|
|
time_modify(time);
|
2000-06-19 04:38:11 -04:00
|
|
|
}
|
1999-08-13 01:45:20 -04:00
|
|
|
t = tobj->tv.tv_sec;
|
|
|
|
tm_tmp = gmtime(&t);
|
2001-12-17 01:45:37 -05:00
|
|
|
if (!tm_tmp)
|
|
|
|
rb_raise(rb_eArgError, "gmtime error");
|
1998-01-16 07:13:05 -05:00
|
|
|
tobj->tm = *tm_tmp;
|
|
|
|
tobj->tm_got = 1;
|
|
|
|
tobj->gmt = 1;
|
|
|
|
return time;
|
|
|
|
}
|
|
|
|
|
2003-12-27 01:33:45 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.getlocal => new_time
|
|
|
|
*
|
|
|
|
* Returns a new <code>new_time</code> object representing <i>time</i> in
|
|
|
|
* local time (using the local time zone in effect for this process).
|
|
|
|
*
|
|
|
|
* t = Time.gm(2000,1,1,20,15,1) #=> Sat Jan 01 20:15:01 UTC 2000
|
|
|
|
* t.gmt? #=> true
|
|
|
|
* l = t.getlocal #=> Sat Jan 01 14:15:01 CST 2000
|
|
|
|
* l.gmt? #=> false
|
|
|
|
* t == l #=> true
|
|
|
|
*/
|
|
|
|
|
2001-12-10 02:18:16 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_getlocaltime(VALUE time)
|
2001-12-10 02:18:16 -05:00
|
|
|
{
|
|
|
|
return time_localtime(time_dup(time));
|
|
|
|
}
|
|
|
|
|
2003-12-27 01:33:45 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.getgm => new_time
|
|
|
|
* time.getutc => new_time
|
|
|
|
*
|
|
|
|
* Returns a new <code>new_time</code> object representing <i>time</i> in
|
|
|
|
* UTC.
|
|
|
|
*
|
|
|
|
* t = Time.local(2000,1,1,20,15,1) #=> Sat Jan 01 20:15:01 CST 2000
|
|
|
|
* t.gmt? #=> false
|
|
|
|
* y = t.getgm #=> Sun Jan 02 02:15:01 UTC 2000
|
|
|
|
* y.gmt? #=> true
|
|
|
|
* t == y #=> true
|
|
|
|
*/
|
|
|
|
|
2001-12-10 02:18:16 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_getgmtime(VALUE time)
|
2001-12-10 02:18:16 -05:00
|
|
|
{
|
|
|
|
return time_gmtime(time_dup(time));
|
|
|
|
}
|
|
|
|
|
1999-08-13 01:45:20 -04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_get_tm(VALUE time, int gmt)
|
1999-08-13 01:45:20 -04:00
|
|
|
{
|
|
|
|
if (gmt) return time_gmtime(time);
|
|
|
|
return time_localtime(time);
|
|
|
|
}
|
|
|
|
|
2003-12-27 01:33:45 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.asctime => string
|
|
|
|
* time.ctime => string
|
|
|
|
*
|
|
|
|
* Returns a canonical string representation of <i>time</i>.
|
|
|
|
*
|
|
|
|
* Time.now.asctime #=> "Wed Apr 9 08:56:03 2003"
|
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_asctime(VALUE time)
|
1999-01-19 23:59:39 -05:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
|
|
|
char *s;
|
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
|
|
|
if (tobj->tm_got == 0) {
|
1999-08-13 01:45:20 -04:00
|
|
|
time_get_tm(time, tobj->gmt);
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
1999-08-13 01:45:20 -04:00
|
|
|
s = asctime(&tobj->tm);
|
1999-01-19 23:59:39 -05:00
|
|
|
if (s[24] == '\n') s[24] = '\0';
|
|
|
|
|
|
|
|
return rb_str_new2(s);
|
|
|
|
}
|
|
|
|
|
2003-12-27 01:33:45 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.inspect => string
|
|
|
|
* time.to_s => string
|
|
|
|
*
|
|
|
|
* Returns a string representing <i>time</i>. Equivalent to calling
|
|
|
|
* <code>Time#strftime</code> with a format string of ``<code>%a</code>
|
|
|
|
* <code>%b</code> <code>%d</code> <code>%H:%M:%S</code>
|
|
|
|
* <code>%Z</code> <code>%Y</code>''.
|
|
|
|
*
|
|
|
|
* Time.now.to_s #=> "Wed Apr 09 08:56:04 CDT 2003"
|
|
|
|
*/
|
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_to_s(VALUE time)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
1999-08-13 01:45:20 -04:00
|
|
|
char buf[128];
|
1998-01-16 07:13:05 -05:00
|
|
|
int len;
|
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
|
|
|
if (tobj->tm_got == 0) {
|
1999-08-13 01:45:20 -04:00
|
|
|
time_get_tm(time, tobj->gmt);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2006-09-07 12:10:33 -04:00
|
|
|
if (tobj->gmt == 1) {
|
|
|
|
len = strftime(buf, 128, "%Y-%m-%d %H:%M:%S UTC", &tobj->tm);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
time_t off;
|
|
|
|
char buf2[32];
|
|
|
|
char sign = '+';
|
2006-07-26 20:15:07 -04:00
|
|
|
#if defined(HAVE_STRUCT_TM_TM_GMTOFF)
|
2006-09-07 12:10:33 -04:00
|
|
|
off = tobj->tm.tm_gmtoff;
|
2006-07-26 20:15:07 -04:00
|
|
|
#else
|
2006-09-07 12:10:33 -04:00
|
|
|
VALUE tmp = time_utc_offset(time);
|
|
|
|
off = NUM2INT(tmp);
|
2006-07-26 20:15:07 -04:00
|
|
|
#endif
|
2006-09-07 12:10:33 -04:00
|
|
|
if (off < 0) {
|
|
|
|
sign = '-';
|
|
|
|
off = -off;
|
|
|
|
}
|
|
|
|
sprintf(buf2, "%%Y-%%m-%%d %%H:%%M:%%S %c%02d%02d",
|
|
|
|
sign, (int)(off/3600), (int)(off%3600/60));
|
|
|
|
len = strftime(buf, 128, buf2, &tobj->tm);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
1999-01-19 23:59:39 -05:00
|
|
|
return rb_str_new(buf, len);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2004-04-06 03:48:38 -04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_add(struct time_object *tobj, VALUE offset, int sign)
|
2004-04-06 03:48:38 -04:00
|
|
|
{
|
|
|
|
double v = NUM2DBL(offset);
|
|
|
|
double f, d;
|
|
|
|
unsigned_time_t sec_off;
|
|
|
|
time_t usec_off, sec, usec;
|
|
|
|
VALUE result;
|
|
|
|
|
|
|
|
if (v < 0) {
|
2004-06-23 08:59:01 -04:00
|
|
|
v = -v;
|
|
|
|
sign = -sign;
|
2004-04-06 03:48:38 -04:00
|
|
|
}
|
|
|
|
d = modf(v, &f);
|
|
|
|
sec_off = (unsigned_time_t)f;
|
|
|
|
if (f != (double)sec_off)
|
2004-06-23 08:59:01 -04:00
|
|
|
rb_raise(rb_eRangeError, "time %s %f out of Time range",
|
|
|
|
sign < 0 ? "-" : "+", v);
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-09 17:20:17 -04:00
|
|
|
usec_off = (time_t)(d*1e6+0.5);
|
2004-04-06 03:48:38 -04:00
|
|
|
|
|
|
|
if (sign < 0) {
|
2004-06-23 08:59:01 -04:00
|
|
|
sec = tobj->tv.tv_sec - sec_off;
|
|
|
|
usec = tobj->tv.tv_usec - usec_off;
|
|
|
|
if (sec > tobj->tv.tv_sec)
|
|
|
|
rb_raise(rb_eRangeError, "time - %f out of Time range", v);
|
2004-04-06 03:48:38 -04:00
|
|
|
}
|
|
|
|
else {
|
2004-06-23 08:59:01 -04:00
|
|
|
sec = tobj->tv.tv_sec + sec_off;
|
|
|
|
usec = tobj->tv.tv_usec + usec_off;
|
|
|
|
if (sec < tobj->tv.tv_sec)
|
|
|
|
rb_raise(rb_eRangeError, "time + %f out of Time range", v);
|
2004-04-06 03:48:38 -04:00
|
|
|
}
|
|
|
|
result = rb_time_new(sec, usec);
|
|
|
|
if (tobj->gmt) {
|
|
|
|
GetTimeval(result, tobj);
|
|
|
|
tobj->gmt = 1;
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2003-12-27 01:33:45 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time + numeric => time
|
|
|
|
*
|
|
|
|
* Addition---Adds some number of seconds (possibly fractional) to
|
|
|
|
* <i>time</i> and returns that value as a new time.
|
|
|
|
*
|
|
|
|
* t = Time.now #=> Wed Apr 09 08:56:03 CDT 2003
|
|
|
|
* t + (60 * 60 * 24) #=> Thu Apr 10 08:56:03 CDT 2003
|
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_plus(VALUE time1, VALUE time2)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
1999-08-13 01:45:20 -04:00
|
|
|
struct time_object *tobj;
|
|
|
|
GetTimeval(time1, tobj);
|
|
|
|
|
2002-08-27 04:31:08 -04:00
|
|
|
if (TYPE(time2) == T_DATA && RDATA(time2)->dfree == time_free) {
|
1999-08-13 01:45:20 -04:00
|
|
|
rb_raise(rb_eTypeError, "time + time?");
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2004-04-06 03:48:38 -04:00
|
|
|
return time_add(tobj, time2, 1);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2003-12-27 01:33:45 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time - other_time => float
|
|
|
|
* time - numeric => time
|
|
|
|
*
|
|
|
|
* Difference---Returns a new time that represents the difference
|
|
|
|
* between two times, or subtracts the given number of seconds in
|
|
|
|
* <i>numeric</i> from <i>time</i>.
|
|
|
|
*
|
|
|
|
* t = Time.now #=> Wed Apr 09 08:56:03 CDT 2003
|
|
|
|
* t2 = t + 2592000 #=> Fri May 09 08:56:03 CDT 2003
|
|
|
|
* t2 - t #=> 2592000.0
|
|
|
|
* t2 - 2592000 #=> Wed Apr 09 08:56:03 CDT 2003
|
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_minus(VALUE time1, VALUE time2)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
1999-08-13 01:45:20 -04:00
|
|
|
struct time_object *tobj;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
1999-08-13 01:45:20 -04:00
|
|
|
GetTimeval(time1, tobj);
|
2002-08-27 04:31:08 -04:00
|
|
|
if (TYPE(time2) == T_DATA && RDATA(time2)->dfree == time_free) {
|
1999-08-13 01:45:20 -04:00
|
|
|
struct time_object *tobj2;
|
2004-06-23 08:59:01 -04:00
|
|
|
double f;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
GetTimeval(time2, tobj2);
|
2001-12-03 05:07:48 -05:00
|
|
|
f = (double)tobj->tv.tv_sec - (double)tobj2->tv.tv_sec;
|
|
|
|
f += ((double)tobj->tv.tv_usec - (double)tobj2->tv.tv_usec)*1e-6;
|
2001-12-21 04:23:28 -05:00
|
|
|
/* XXX: should check float overflow on 64bit time_t platforms */
|
1998-01-16 07:13:05 -05:00
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
return rb_float_new(f);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2004-04-06 03:48:38 -04:00
|
|
|
return time_add(tobj, time2, -1);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2003-12-27 01:33:45 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.succ => new_time
|
|
|
|
*
|
|
|
|
* Return a new time object, one second later than <code>time</code>.
|
|
|
|
*/
|
|
|
|
|
2003-11-28 09:23:33 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_succ(VALUE time)
|
2003-11-28 09:23:33 -05:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
|
|
|
return rb_time_new(tobj->tv.tv_sec + 1, tobj->tv.tv_usec);
|
|
|
|
}
|
|
|
|
|
2003-12-27 01:33:45 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.sec => fixnum
|
|
|
|
*
|
|
|
|
* Returns the second of the minute (0..60)<em>[Yes, seconds really can
|
|
|
|
* range from zero to 60. This allows the system to inject leap seconds
|
|
|
|
* every now and then to correct for the fact that years are not really
|
|
|
|
* a convenient number of hours long.]</em> for <i>time</i>.
|
|
|
|
*
|
|
|
|
* t = Time.now #=> Wed Apr 09 08:56:04 CDT 2003
|
|
|
|
* t.sec #=> 4
|
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_sec(VALUE time)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
|
|
|
if (tobj->tm_got == 0) {
|
1999-08-13 01:45:20 -04:00
|
|
|
time_get_tm(time, tobj->gmt);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
return INT2FIX(tobj->tm.tm_sec);
|
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
VALUE
|
|
|
|
rb_time_succ(VALUE time)
|
|
|
|
{
|
|
|
|
return time_succ(time);
|
|
|
|
}
|
|
|
|
|
2003-12-27 01:33:45 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.min => fixnum
|
|
|
|
*
|
|
|
|
* Returns the minute of the hour (0..59) for <i>time</i>.
|
|
|
|
*
|
|
|
|
* t = Time.now #=> Wed Apr 09 08:56:03 CDT 2003
|
|
|
|
* t.min #=> 56
|
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_min(VALUE time)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
|
|
|
if (tobj->tm_got == 0) {
|
1999-08-13 01:45:20 -04:00
|
|
|
time_get_tm(time, tobj->gmt);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
return INT2FIX(tobj->tm.tm_min);
|
|
|
|
}
|
|
|
|
|
2003-12-27 01:33:45 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.hour => fixnum
|
|
|
|
*
|
|
|
|
* Returns the hour of the day (0..23) for <i>time</i>.
|
|
|
|
*
|
|
|
|
* t = Time.now #=> Wed Apr 09 08:56:03 CDT 2003
|
|
|
|
* t.hour #=> 8
|
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_hour(VALUE time)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
|
|
|
if (tobj->tm_got == 0) {
|
1999-08-13 01:45:20 -04:00
|
|
|
time_get_tm(time, tobj->gmt);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
return INT2FIX(tobj->tm.tm_hour);
|
|
|
|
}
|
|
|
|
|
2003-12-27 01:33:45 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.day => fixnum
|
|
|
|
* time.mday => fixnum
|
|
|
|
*
|
|
|
|
* Returns the day of the month (1..n) for <i>time</i>.
|
|
|
|
*
|
|
|
|
* t = Time.now #=> Wed Apr 09 08:56:03 CDT 2003
|
|
|
|
* t.day #=> 9
|
|
|
|
* t.mday #=> 9
|
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_mday(VALUE time)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
|
|
|
if (tobj->tm_got == 0) {
|
1999-08-13 01:45:20 -04:00
|
|
|
time_get_tm(time, tobj->gmt);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
return INT2FIX(tobj->tm.tm_mday);
|
|
|
|
}
|
|
|
|
|
2003-12-27 01:33:45 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.mon => fixnum
|
|
|
|
* time.month => fixnum
|
|
|
|
*
|
|
|
|
* Returns the month of the year (1..12) for <i>time</i>.
|
|
|
|
*
|
|
|
|
* t = Time.now #=> Wed Apr 09 08:56:03 CDT 2003
|
|
|
|
* t.mon #=> 4
|
|
|
|
* t.month #=> 4
|
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_mon(VALUE time)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
|
|
|
if (tobj->tm_got == 0) {
|
1999-08-13 01:45:20 -04:00
|
|
|
time_get_tm(time, tobj->gmt);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
1999-01-19 23:59:39 -05:00
|
|
|
return INT2FIX(tobj->tm.tm_mon+1);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2003-12-27 01:33:45 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.year => fixnum
|
|
|
|
*
|
|
|
|
* Returns the year for <i>time</i> (including the century).
|
|
|
|
*
|
|
|
|
* t = Time.now #=> Wed Apr 09 08:56:04 CDT 2003
|
|
|
|
* t.year #=> 2003
|
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_year(VALUE time)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
|
|
|
if (tobj->tm_got == 0) {
|
1999-08-13 01:45:20 -04:00
|
|
|
time_get_tm(time, tobj->gmt);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2001-12-17 01:45:37 -05:00
|
|
|
return LONG2NUM((long)tobj->tm.tm_year+1900);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2003-12-27 01:33:45 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.wday => fixnum
|
|
|
|
*
|
|
|
|
* Returns an integer representing the day of the week, 0..6, with
|
|
|
|
* Sunday == 0.
|
|
|
|
*
|
|
|
|
* t = Time.now #=> Wed Apr 09 08:56:04 CDT 2003
|
|
|
|
* t.wday #=> 3
|
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_wday(VALUE time)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
|
|
|
if (tobj->tm_got == 0) {
|
1999-08-13 01:45:20 -04:00
|
|
|
time_get_tm(time, tobj->gmt);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
return INT2FIX(tobj->tm.tm_wday);
|
|
|
|
}
|
|
|
|
|
2005-10-27 04:18:38 -04:00
|
|
|
#define wday_p(n) {\
|
|
|
|
struct time_object *tobj;\
|
|
|
|
GetTimeval(time, tobj);\
|
|
|
|
if (tobj->tm_got == 0) {\
|
|
|
|
time_get_tm(time, tobj->gmt);\
|
|
|
|
}\
|
|
|
|
return (tobj->tm.tm_wday == (n)) ? Qtrue : Qfalse;\
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.sunday? => true or false
|
|
|
|
*
|
|
|
|
* Returns <code>true</code> if <i>time</i> represents Sunday.
|
|
|
|
*
|
|
|
|
* t = Time.now #=> Sun Oct 23 00:14:54 UTC 2005
|
|
|
|
* t.sunday? #=> true
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
time_sunday(VALUE time)
|
|
|
|
{
|
|
|
|
wday_p(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.monday? => true or false
|
|
|
|
*
|
|
|
|
* Returns <code>true</code> if <i>time</i> represents Monday.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
time_monday(VALUE time)
|
|
|
|
{
|
|
|
|
wday_p(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.tuesday? => true or false
|
|
|
|
*
|
|
|
|
* Returns <code>true</code> if <i>time</i> represents Tuesday.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
time_tuesday(VALUE time)
|
|
|
|
{
|
|
|
|
wday_p(2);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.wednesday? => true or false
|
|
|
|
*
|
|
|
|
* Returns <code>true</code> if <i>time</i> represents Wednesday.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
time_wednesday(VALUE time)
|
|
|
|
{
|
|
|
|
wday_p(3);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.thursday? => true or false
|
|
|
|
*
|
|
|
|
* Returns <code>true</code> if <i>time</i> represents Thursday.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
time_thursday(VALUE time)
|
|
|
|
{
|
|
|
|
wday_p(4);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.friday? => true or false
|
|
|
|
*
|
|
|
|
* Returns <code>true</code> if <i>time</i> represents Friday.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
time_friday(VALUE time)
|
|
|
|
{
|
|
|
|
wday_p(5);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.saturday? => true or false
|
|
|
|
*
|
|
|
|
* Returns <code>true</code> if <i>time</i> represents Saturday.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
time_saturday(VALUE time)
|
|
|
|
{
|
|
|
|
wday_p(6);
|
|
|
|
}
|
|
|
|
|
2003-12-27 01:33:45 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.yday => fixnum
|
|
|
|
*
|
|
|
|
* Returns an integer representing the day of the year, 1..366.
|
|
|
|
*
|
|
|
|
* t = Time.now #=> Wed Apr 09 08:56:04 CDT 2003
|
|
|
|
* t.yday #=> 99
|
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_yday(VALUE time)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
|
|
|
if (tobj->tm_got == 0) {
|
1999-08-13 01:45:20 -04:00
|
|
|
time_get_tm(time, tobj->gmt);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
1999-08-13 01:45:20 -04:00
|
|
|
return INT2FIX(tobj->tm.tm_yday+1);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2003-12-27 01:33:45 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.isdst => true or false
|
|
|
|
* time.dst? => true or false
|
|
|
|
*
|
|
|
|
* Returns <code>true</code> if <i>time</i> occurs during Daylight
|
|
|
|
* Saving Time in its time zone.
|
|
|
|
*
|
|
|
|
* Time.local(2000, 7, 1).isdst #=> true
|
|
|
|
* Time.local(2000, 1, 1).isdst #=> false
|
|
|
|
* Time.local(2000, 7, 1).dst? #=> true
|
|
|
|
* Time.local(2000, 1, 1).dst? #=> false
|
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_isdst(VALUE time)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
|
|
|
if (tobj->tm_got == 0) {
|
1999-08-13 01:45:20 -04:00
|
|
|
time_get_tm(time, tobj->gmt);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
1999-01-19 23:59:39 -05:00
|
|
|
return tobj->tm.tm_isdst?Qtrue:Qfalse;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2003-12-27 01:33:45 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.zone => string
|
|
|
|
*
|
|
|
|
* Returns the name of the time zone used for <i>time</i>. As of Ruby
|
|
|
|
* 1.8, returns ``UTC'' rather than ``GMT'' for UTC times.
|
|
|
|
*
|
|
|
|
* t = Time.gm(2000, "jan", 1, 20, 15, 1)
|
|
|
|
* t.zone #=> "UTC"
|
|
|
|
* t = Time.local(2000, "jan", 1, 20, 15, 1)
|
|
|
|
* t.zone #=> "CST"
|
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_zone(VALUE time)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
2002-04-24 00:54:16 -04:00
|
|
|
#if !defined(HAVE_TM_ZONE) && (!defined(HAVE_TZNAME) || !defined(HAVE_DAYLIGHT))
|
1999-08-13 01:45:20 -04:00
|
|
|
char buf[64];
|
1998-01-16 07:13:05 -05:00
|
|
|
int len;
|
2002-04-24 00:54:16 -04:00
|
|
|
#endif
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
GetTimeval(time, tobj);
|
|
|
|
if (tobj->tm_got == 0) {
|
1999-08-13 01:45:20 -04:00
|
|
|
time_get_tm(time, tobj->gmt);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2001-03-20 22:41:45 -05:00
|
|
|
if (tobj->gmt == 1) {
|
|
|
|
return rb_str_new2("UTC");
|
|
|
|
}
|
2000-06-12 22:48:49 -04:00
|
|
|
#if defined(HAVE_TM_ZONE)
|
|
|
|
return rb_str_new2(tobj->tm.tm_zone);
|
|
|
|
#elif defined(HAVE_TZNAME) && defined(HAVE_DAYLIGHT)
|
2000-06-12 10:46:44 -04:00
|
|
|
return rb_str_new2(tzname[daylight && tobj->tm.tm_isdst]);
|
2000-06-12 03:48:31 -04:00
|
|
|
#else
|
1999-08-13 01:45:20 -04:00
|
|
|
len = strftime(buf, 64, "%Z", &tobj->tm);
|
1999-01-19 23:59:39 -05:00
|
|
|
return rb_str_new(buf, len);
|
2000-06-12 03:48:31 -04:00
|
|
|
#endif
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2003-12-27 01:33:45 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.gmt_offset => fixnum
|
|
|
|
* time.gmtoff => fixnum
|
|
|
|
* time.utc_offset => fixnum
|
|
|
|
*
|
|
|
|
* Returns the offset in seconds between the timezone of <i>time</i>
|
|
|
|
* and UTC.
|
|
|
|
*
|
|
|
|
* t = Time.gm(2000,1,1,20,15,1) #=> Sat Jan 01 20:15:01 UTC 2000
|
|
|
|
* t.gmt_offset #=> 0
|
|
|
|
* l = t.getlocal #=> Sat Jan 01 14:15:01 CST 2000
|
|
|
|
* l.gmt_offset #=> -21600
|
|
|
|
*/
|
|
|
|
|
2001-12-17 01:45:37 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_utc_offset(VALUE time)
|
2001-12-17 01:45:37 -05:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
|
|
|
if (tobj->tm_got == 0) {
|
|
|
|
time_get_tm(time, tobj->gmt);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (tobj->gmt == 1) {
|
|
|
|
return INT2FIX(0);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
#if defined(HAVE_STRUCT_TM_TM_GMTOFF)
|
|
|
|
return INT2NUM(tobj->tm.tm_gmtoff);
|
|
|
|
#else
|
|
|
|
struct tm *u, *l;
|
|
|
|
time_t t;
|
2002-08-28 04:05:23 -04:00
|
|
|
long off;
|
2001-12-17 01:45:37 -05:00
|
|
|
l = &tobj->tm;
|
|
|
|
t = tobj->tv.tv_sec;
|
|
|
|
u = gmtime(&t);
|
|
|
|
if (!u)
|
|
|
|
rb_raise(rb_eArgError, "gmtime error");
|
|
|
|
if (l->tm_year != u->tm_year)
|
|
|
|
off = l->tm_year < u->tm_year ? -1 : 1;
|
|
|
|
else if (l->tm_mon != u->tm_mon)
|
|
|
|
off = l->tm_mon < u->tm_mon ? -1 : 1;
|
|
|
|
else if (l->tm_mday != u->tm_mday)
|
|
|
|
off = l->tm_mday < u->tm_mday ? -1 : 1;
|
|
|
|
else
|
|
|
|
off = 0;
|
|
|
|
off = off * 24 + l->tm_hour - u->tm_hour;
|
|
|
|
off = off * 60 + l->tm_min - u->tm_min;
|
|
|
|
off = off * 60 + l->tm_sec - u->tm_sec;
|
2002-08-28 04:05:23 -04:00
|
|
|
return LONG2FIX(off);
|
2001-12-17 01:45:37 -05:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-12-27 01:33:45 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.to_a => array
|
|
|
|
*
|
|
|
|
* Returns a ten-element <i>array</i> of values for <i>time</i>:
|
|
|
|
* {<code>[ sec, min, hour, day, month, year, wday, yday, isdst, zone
|
|
|
|
* ]</code>}. See the individual methods for an explanation of the
|
|
|
|
* valid ranges of each value. The ten elements can be passed directly
|
|
|
|
* to <code>Time::utc</code> or <code>Time::local</code> to create a
|
|
|
|
* new <code>Time</code>.
|
|
|
|
*
|
|
|
|
* now = Time.now #=> Wed Apr 09 08:56:04 CDT 2003
|
|
|
|
* t = now.to_a #=> [4, 56, 8, 9, 4, 2003, 3, 99, true, "CDT"]
|
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_to_a(VALUE time)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
|
|
|
if (tobj->tm_got == 0) {
|
1999-08-13 01:45:20 -04:00
|
|
|
time_get_tm(time, tobj->gmt);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
1999-01-19 23:59:39 -05:00
|
|
|
return rb_ary_new3(10,
|
|
|
|
INT2FIX(tobj->tm.tm_sec),
|
|
|
|
INT2FIX(tobj->tm.tm_min),
|
|
|
|
INT2FIX(tobj->tm.tm_hour),
|
|
|
|
INT2FIX(tobj->tm.tm_mday),
|
|
|
|
INT2FIX(tobj->tm.tm_mon+1),
|
2001-12-17 01:45:37 -05:00
|
|
|
LONG2NUM((long)tobj->tm.tm_year+1900),
|
1999-01-19 23:59:39 -05:00
|
|
|
INT2FIX(tobj->tm.tm_wday),
|
1999-08-13 01:45:20 -04:00
|
|
|
INT2FIX(tobj->tm.tm_yday+1),
|
1999-01-19 23:59:39 -05:00
|
|
|
tobj->tm.tm_isdst?Qtrue:Qfalse,
|
|
|
|
time_zone(time));
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
1998-01-16 07:19:22 -05:00
|
|
|
#define SMALLBUF 100
|
|
|
|
static int
|
2006-03-01 05:06:03 -05:00
|
|
|
rb_strftime(char **buf, const char *format, struct tm *time)
|
1998-01-16 07:19:22 -05:00
|
|
|
{
|
2005-10-22 00:27:48 -04:00
|
|
|
int size, len, flen;
|
1998-01-16 07:19:22 -05:00
|
|
|
|
1999-08-13 01:45:20 -04:00
|
|
|
(*buf)[0] = '\0';
|
|
|
|
flen = strlen(format);
|
|
|
|
if (flen == 0) {
|
|
|
|
return 0;
|
|
|
|
}
|
1998-01-16 07:19:22 -05:00
|
|
|
len = strftime(*buf, SMALLBUF, format, time);
|
2001-03-26 09:29:57 -05:00
|
|
|
if (len != 0 || **buf == '\0') return len;
|
1999-08-13 01:45:20 -04:00
|
|
|
for (size=1024; ; size*=2) {
|
|
|
|
*buf = xmalloc(size);
|
|
|
|
(*buf)[0] = '\0';
|
|
|
|
len = strftime(*buf, size, format, time);
|
|
|
|
/*
|
|
|
|
* buflen can be zero EITHER because there's not enough
|
|
|
|
* room in the string, or because the control command
|
|
|
|
* goes to the empty string. Make a reasonable guess that
|
|
|
|
* if the buffer is 1024 times bigger than the length of the
|
|
|
|
* format string, it's not failing for lack of room.
|
|
|
|
*/
|
2001-12-10 02:18:16 -05:00
|
|
|
if (len > 0 || size >= 1024 * flen) return len;
|
1999-08-13 01:45:20 -04:00
|
|
|
free(*buf);
|
1998-01-16 07:19:22 -05:00
|
|
|
}
|
1999-08-13 01:45:20 -04:00
|
|
|
/* not reached */
|
1998-01-16 07:19:22 -05:00
|
|
|
}
|
|
|
|
|
2003-12-27 01:33:45 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.strftime( string ) => string
|
|
|
|
*
|
|
|
|
* Formats <i>time</i> according to the directives in the given format
|
|
|
|
* string. Any text not listed as a directive will be passed through
|
|
|
|
* to the output string.
|
|
|
|
*
|
|
|
|
* Format meaning:
|
|
|
|
* %a - The abbreviated weekday name (``Sun'')
|
|
|
|
* %A - The full weekday name (``Sunday'')
|
|
|
|
* %b - The abbreviated month name (``Jan'')
|
|
|
|
* %B - The full month name (``January'')
|
|
|
|
* %c - The preferred local date and time representation
|
|
|
|
* %d - Day of the month (01..31)
|
|
|
|
* %H - Hour of the day, 24-hour clock (00..23)
|
|
|
|
* %I - Hour of the day, 12-hour clock (01..12)
|
|
|
|
* %j - Day of the year (001..366)
|
|
|
|
* %m - Month of the year (01..12)
|
|
|
|
* %M - Minute of the hour (00..59)
|
|
|
|
* %p - Meridian indicator (``AM'' or ``PM'')
|
|
|
|
* %S - Second of the minute (00..60)
|
|
|
|
* %U - Week number of the current year,
|
|
|
|
* starting with the first Sunday as the first
|
|
|
|
* day of the first week (00..53)
|
|
|
|
* %W - Week number of the current year,
|
|
|
|
* starting with the first Monday as the first
|
|
|
|
* day of the first week (00..53)
|
|
|
|
* %w - Day of the week (Sunday is 0, 0..6)
|
|
|
|
* %x - Preferred representation for the date alone, no time
|
|
|
|
* %X - Preferred representation for the time alone, no date
|
|
|
|
* %y - Year without a century (00..99)
|
|
|
|
* %Y - Year with century
|
|
|
|
* %Z - Time zone name
|
|
|
|
* %% - Literal ``%'' character
|
|
|
|
*
|
|
|
|
* t = Time.now
|
|
|
|
* t.strftime("Printed on %m/%d/%Y") #=> "Printed on 04/09/2003"
|
|
|
|
* t.strftime("at %I:%M%p") #=> "at 08:56AM"
|
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_strftime(VALUE time, VALUE format)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
2005-10-22 00:27:48 -04:00
|
|
|
char buffer[SMALLBUF], *buf = buffer;
|
|
|
|
const char *fmt;
|
2002-08-21 11:47:54 -04:00
|
|
|
long len;
|
1998-01-16 07:19:22 -05:00
|
|
|
VALUE str;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
|
|
|
if (tobj->tm_got == 0) {
|
1999-08-13 01:45:20 -04:00
|
|
|
time_get_tm(time, tobj->gmt);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2001-05-02 00:22:21 -04:00
|
|
|
StringValue(format);
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 01:47:45 -05:00
|
|
|
format = rb_str_new4(format);
|
2006-08-31 06:47:44 -04:00
|
|
|
fmt = RSTRING_PTR(format);
|
|
|
|
len = RSTRING_LEN(format);
|
1999-08-13 01:45:20 -04:00
|
|
|
if (len == 0) {
|
|
|
|
rb_warning("strftime called with empty format string");
|
|
|
|
}
|
2003-04-09 11:27:39 -04:00
|
|
|
else if (strlen(fmt) < len) {
|
1998-01-16 07:19:22 -05:00
|
|
|
/* Ruby string may contain \0's. */
|
2005-10-22 00:27:48 -04:00
|
|
|
const char *p = fmt, *pe = fmt + len;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
str = rb_str_new(0, 0);
|
1998-01-16 07:13:05 -05:00
|
|
|
while (p < pe) {
|
1999-08-13 01:45:20 -04:00
|
|
|
len = rb_strftime(&buf, p, &tobj->tm);
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_str_cat(str, buf, len);
|
2006-09-04 08:14:47 -04:00
|
|
|
p += strlen(p);
|
2001-12-10 02:18:16 -05:00
|
|
|
if (buf != buffer) {
|
|
|
|
free(buf);
|
|
|
|
buf = buffer;
|
|
|
|
}
|
2005-10-22 00:27:48 -04:00
|
|
|
for (fmt = p; p < pe && !*p; ++p);
|
|
|
|
if (p > fmt) rb_str_cat(str, fmt, p - fmt);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
return str;
|
|
|
|
}
|
2003-04-09 11:27:39 -04:00
|
|
|
else {
|
2006-08-31 06:47:44 -04:00
|
|
|
len = rb_strftime(&buf, RSTRING_PTR(format), &tobj->tm);
|
2003-04-09 11:27:39 -04:00
|
|
|
}
|
1999-01-19 23:59:39 -05:00
|
|
|
str = rb_str_new(buf, len);
|
|
|
|
if (buf != buffer) free(buf);
|
1998-01-16 07:19:22 -05:00
|
|
|
return str;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2003-12-27 01:33:45 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* Time.times => struct_tms
|
|
|
|
*
|
|
|
|
* Deprecated in favor of <code>Process::times</code>
|
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_s_times(VALUE obj)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2001-02-16 02:53:21 -05:00
|
|
|
rb_warn("obsolete method Time::times; use Process::times");
|
|
|
|
return rb_proc_times(obj);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2003-12-30 11:38:32 -05:00
|
|
|
/*
|
|
|
|
* undocumented
|
|
|
|
*/
|
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_mdump(VALUE time)
|
1999-01-19 23:59:39 -05:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
1999-08-13 01:45:20 -04:00
|
|
|
struct tm *tm;
|
|
|
|
unsigned long p, s;
|
2003-08-16 10:58:34 -04:00
|
|
|
char buf[8];
|
1999-08-13 01:45:20 -04:00
|
|
|
time_t t;
|
1999-01-19 23:59:39 -05:00
|
|
|
int i;
|
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
1999-08-13 01:45:20 -04:00
|
|
|
|
|
|
|
t = tobj->tv.tv_sec;
|
|
|
|
tm = gmtime(&t);
|
|
|
|
|
2004-05-14 12:39:15 -04:00
|
|
|
if ((tm->tm_year & 0xffff) != tm->tm_year)
|
2004-03-29 02:54:38 -05:00
|
|
|
rb_raise(rb_eArgError, "year too big to marshal");
|
2006-12-31 10:02:22 -05:00
|
|
|
|
2006-07-09 21:08:15 -04:00
|
|
|
p = 0x1UL << 31 | /* 1 */
|
2004-05-14 12:39:15 -04:00
|
|
|
tobj->gmt << 30 | /* 1 */
|
|
|
|
tm->tm_year << 14 | /* 16 */
|
1999-08-13 01:45:20 -04:00
|
|
|
tm->tm_mon << 10 | /* 4 */
|
|
|
|
tm->tm_mday << 5 | /* 5 */
|
|
|
|
tm->tm_hour; /* 5 */
|
|
|
|
s = tm->tm_min << 26 | /* 6 */
|
|
|
|
tm->tm_sec << 20 | /* 6 */
|
|
|
|
tobj->tv.tv_usec; /* 20 */
|
1999-01-19 23:59:39 -05:00
|
|
|
|
|
|
|
for (i=0; i<4; i++) {
|
1999-08-13 01:45:20 -04:00
|
|
|
buf[i] = p & 0xff;
|
|
|
|
p = RSHIFT(p, 8);
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
|
|
|
for (i=4; i<8; i++) {
|
1999-08-13 01:45:20 -04:00
|
|
|
buf[i] = s & 0xff;
|
|
|
|
s = RSHIFT(s, 8);
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
1999-08-13 01:45:20 -04:00
|
|
|
|
2003-10-09 13:45:53 -04:00
|
|
|
return rb_str_new(buf, 8);
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
|
|
|
|
2003-12-30 11:38:32 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time._dump => string
|
|
|
|
*
|
|
|
|
* Dump _time_ for marshaling.
|
|
|
|
*/
|
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_dump(int argc, VALUE *argv, VALUE time)
|
2003-10-02 04:25:00 -04:00
|
|
|
{
|
2003-10-09 13:45:53 -04:00
|
|
|
VALUE str;
|
2003-10-02 04:25:00 -04:00
|
|
|
|
2003-10-09 13:45:53 -04:00
|
|
|
rb_scan_args(argc, argv, "01", 0);
|
|
|
|
str = time_mdump(time);
|
2004-05-14 12:39:15 -04:00
|
|
|
rb_copy_generic_ivar(str, time);
|
2003-10-09 13:45:53 -04:00
|
|
|
|
|
|
|
return str;
|
2003-10-02 04:25:00 -04:00
|
|
|
}
|
|
|
|
|
2003-12-30 11:38:32 -05:00
|
|
|
/*
|
|
|
|
* undocumented
|
|
|
|
*/
|
|
|
|
|
2003-10-02 04:25:00 -04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_mload(VALUE time, VALUE str)
|
1999-01-19 23:59:39 -05:00
|
|
|
{
|
2003-10-02 04:25:00 -04:00
|
|
|
struct time_object *tobj;
|
1999-08-13 01:45:20 -04:00
|
|
|
unsigned long p, s;
|
|
|
|
time_t sec, usec;
|
1999-01-19 23:59:39 -05:00
|
|
|
unsigned char *buf;
|
1999-08-13 01:45:20 -04:00
|
|
|
struct tm tm;
|
2004-05-14 12:39:15 -04:00
|
|
|
int i, gmt;
|
1999-01-19 23:59:39 -05:00
|
|
|
|
2003-10-02 04:25:00 -04:00
|
|
|
time_modify(time);
|
2001-05-02 00:22:21 -04:00
|
|
|
StringValue(str);
|
2006-08-31 06:47:44 -04:00
|
|
|
buf = (unsigned char *)RSTRING_PTR(str);
|
|
|
|
if (RSTRING_LEN(str) != 8) {
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_raise(rb_eTypeError, "marshaled time format differ");
|
|
|
|
}
|
|
|
|
|
1999-08-13 01:45:20 -04:00
|
|
|
p = s = 0;
|
1999-01-19 23:59:39 -05:00
|
|
|
for (i=0; i<4; i++) {
|
1999-08-13 01:45:20 -04:00
|
|
|
p |= buf[i]<<(8*i);
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
|
|
|
for (i=4; i<8; i++) {
|
1999-08-13 01:45:20 -04:00
|
|
|
s |= buf[i]<<(8*(i-4));
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
|
|
|
|
2006-07-03 16:07:10 -04:00
|
|
|
if ((p & (1UL<<31)) == 0) {
|
2005-09-24 19:45:46 -04:00
|
|
|
gmt = 0;
|
2003-10-02 04:25:00 -04:00
|
|
|
sec = p;
|
|
|
|
usec = s;
|
1999-08-13 01:45:20 -04:00
|
|
|
}
|
2003-10-02 04:25:00 -04:00
|
|
|
else {
|
2006-07-03 16:07:10 -04:00
|
|
|
p &= ~(1UL<<31);
|
2004-05-14 12:39:15 -04:00
|
|
|
gmt = (p >> 30) & 0x1;
|
|
|
|
tm.tm_year = (p >> 14) & 0xffff;
|
2003-10-02 04:25:00 -04:00
|
|
|
tm.tm_mon = (p >> 10) & 0xf;
|
|
|
|
tm.tm_mday = (p >> 5) & 0x1f;
|
|
|
|
tm.tm_hour = p & 0x1f;
|
|
|
|
tm.tm_min = (s >> 26) & 0x3f;
|
|
|
|
tm.tm_sec = (s >> 20) & 0x3f;
|
|
|
|
tm.tm_isdst = 0;
|
|
|
|
|
|
|
|
sec = make_time_t(&tm, Qtrue);
|
|
|
|
usec = (time_t)(s & 0xfffff);
|
|
|
|
}
|
2004-01-18 02:46:51 -05:00
|
|
|
time_overflow_p(&sec, &usec);
|
2003-10-02 04:25:00 -04:00
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
|
|
|
tobj->tm_got = 0;
|
2004-05-14 12:39:15 -04:00
|
|
|
tobj->gmt = gmt;
|
2003-10-02 04:25:00 -04:00
|
|
|
tobj->tv.tv_sec = sec;
|
|
|
|
tobj->tv.tv_usec = usec;
|
|
|
|
return time;
|
|
|
|
}
|
1999-08-13 01:45:20 -04:00
|
|
|
|
2003-12-30 11:38:32 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* Time._load(string) => time
|
|
|
|
*
|
|
|
|
* Unmarshal a dumped +Time+ object.
|
|
|
|
*/
|
|
|
|
|
2003-10-02 04:25:00 -04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
time_load(VALUE klass, VALUE str)
|
2003-10-02 04:25:00 -04:00
|
|
|
{
|
|
|
|
VALUE time = time_s_alloc(klass);
|
1999-08-13 01:45:20 -04:00
|
|
|
|
2004-05-14 12:39:15 -04:00
|
|
|
rb_copy_generic_ivar(time, str);
|
2003-10-02 04:25:00 -04:00
|
|
|
time_mload(time, str);
|
|
|
|
return time;
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
|
|
|
|
2003-12-27 01:33:45 -05:00
|
|
|
/*
|
|
|
|
* <code>Time</code> is an abstraction of dates and times. Time is
|
|
|
|
* stored internally as the number of seconds and microseconds since
|
|
|
|
* the <em>epoch</em>, January 1, 1970 00:00 UTC. On some operating
|
|
|
|
* systems, this offset is allowed to be negative. Also see the
|
|
|
|
* library modules <code>Date</code> and <code>ParseDate</code>. The
|
|
|
|
* <code>Time</code> class treats GMT (Greenwich Mean Time) and UTC
|
|
|
|
* (Coordinated Universal Time)<em>[Yes, UTC really does stand for
|
|
|
|
* Coordinated Universal Time. There was a committee involved.]</em>
|
|
|
|
* as equivalent. GMT is the older way of referring to these
|
|
|
|
* baseline times but persists in the names of calls on Posix
|
|
|
|
* systems.
|
|
|
|
*
|
|
|
|
* All times are stored with some number of microseconds. Be aware of
|
|
|
|
* this fact when comparing times with each other---times that are
|
|
|
|
* apparently equal when displayed may be different when compared.
|
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
Init_Time(void)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_cTime = rb_define_class("Time", rb_cObject);
|
|
|
|
rb_include_module(rb_cTime, rb_mComparable);
|
|
|
|
|
2002-12-20 03:33:17 -05:00
|
|
|
rb_define_alloc_func(rb_cTime, time_s_alloc);
|
2003-10-02 04:25:00 -04:00
|
|
|
rb_define_singleton_method(rb_cTime, "now", rb_class_new_instance, -1);
|
1999-10-29 05:25:48 -04:00
|
|
|
rb_define_singleton_method(rb_cTime, "at", time_s_at, -1);
|
2000-06-12 03:48:31 -04:00
|
|
|
rb_define_singleton_method(rb_cTime, "utc", time_s_mkutc, -1);
|
|
|
|
rb_define_singleton_method(rb_cTime, "gm", time_s_mkutc, -1);
|
|
|
|
rb_define_singleton_method(rb_cTime, "local", time_s_mktime, -1);
|
|
|
|
rb_define_singleton_method(rb_cTime, "mktime", time_s_mktime, -1);
|
1999-01-19 23:59:39 -05:00
|
|
|
|
|
|
|
rb_define_singleton_method(rb_cTime, "times", time_s_times, 0);
|
|
|
|
|
|
|
|
rb_define_method(rb_cTime, "to_i", time_to_i, 0);
|
|
|
|
rb_define_method(rb_cTime, "to_f", time_to_f, 0);
|
|
|
|
rb_define_method(rb_cTime, "<=>", time_cmp, 1);
|
|
|
|
rb_define_method(rb_cTime, "eql?", time_eql, 1);
|
|
|
|
rb_define_method(rb_cTime, "hash", time_hash, 0);
|
2003-10-02 05:20:31 -04:00
|
|
|
rb_define_method(rb_cTime, "initialize", time_init, 0);
|
2003-05-19 01:41:08 -04:00
|
|
|
rb_define_method(rb_cTime, "initialize_copy", time_init_copy, 1);
|
1999-01-19 23:59:39 -05:00
|
|
|
|
|
|
|
rb_define_method(rb_cTime, "localtime", time_localtime, 0);
|
|
|
|
rb_define_method(rb_cTime, "gmtime", time_gmtime, 0);
|
2000-07-06 03:21:26 -04:00
|
|
|
rb_define_method(rb_cTime, "utc", time_gmtime, 0);
|
2001-12-10 02:18:16 -05:00
|
|
|
rb_define_method(rb_cTime, "getlocal", time_getlocaltime, 0);
|
|
|
|
rb_define_method(rb_cTime, "getgm", time_getgmtime, 0);
|
|
|
|
rb_define_method(rb_cTime, "getutc", time_getgmtime, 0);
|
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_define_method(rb_cTime, "ctime", time_asctime, 0);
|
|
|
|
rb_define_method(rb_cTime, "asctime", time_asctime, 0);
|
|
|
|
rb_define_method(rb_cTime, "to_s", time_to_s, 0);
|
|
|
|
rb_define_method(rb_cTime, "inspect", time_to_s, 0);
|
|
|
|
rb_define_method(rb_cTime, "to_a", time_to_a, 0);
|
|
|
|
|
|
|
|
rb_define_method(rb_cTime, "+", time_plus, 1);
|
|
|
|
rb_define_method(rb_cTime, "-", time_minus, 1);
|
|
|
|
|
2003-11-28 09:23:33 -05:00
|
|
|
rb_define_method(rb_cTime, "succ", time_succ, 0);
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_define_method(rb_cTime, "sec", time_sec, 0);
|
|
|
|
rb_define_method(rb_cTime, "min", time_min, 0);
|
|
|
|
rb_define_method(rb_cTime, "hour", time_hour, 0);
|
|
|
|
rb_define_method(rb_cTime, "mday", time_mday, 0);
|
|
|
|
rb_define_method(rb_cTime, "day", time_mday, 0);
|
|
|
|
rb_define_method(rb_cTime, "mon", time_mon, 0);
|
|
|
|
rb_define_method(rb_cTime, "month", time_mon, 0);
|
|
|
|
rb_define_method(rb_cTime, "year", time_year, 0);
|
|
|
|
rb_define_method(rb_cTime, "wday", time_wday, 0);
|
|
|
|
rb_define_method(rb_cTime, "yday", time_yday, 0);
|
|
|
|
rb_define_method(rb_cTime, "isdst", time_isdst, 0);
|
2000-10-17 14:14:05 -04:00
|
|
|
rb_define_method(rb_cTime, "dst?", time_isdst, 0);
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_define_method(rb_cTime, "zone", time_zone, 0);
|
2001-12-17 01:45:37 -05:00
|
|
|
rb_define_method(rb_cTime, "gmtoff", time_utc_offset, 0);
|
|
|
|
rb_define_method(rb_cTime, "gmt_offset", time_utc_offset, 0);
|
|
|
|
rb_define_method(rb_cTime, "utc_offset", time_utc_offset, 0);
|
1999-01-19 23:59:39 -05:00
|
|
|
|
2000-06-19 04:38:11 -04:00
|
|
|
rb_define_method(rb_cTime, "utc?", time_utc_p, 0);
|
|
|
|
rb_define_method(rb_cTime, "gmt?", time_utc_p, 0);
|
1999-08-13 01:45:20 -04:00
|
|
|
|
2005-10-27 04:18:38 -04:00
|
|
|
rb_define_method(rb_cTime, "sunday?", time_sunday, 0);
|
|
|
|
rb_define_method(rb_cTime, "monday?", time_monday, 0);
|
|
|
|
rb_define_method(rb_cTime, "tuesday?", time_tuesday, 0);
|
|
|
|
rb_define_method(rb_cTime, "wednesday?", time_wednesday, 0);
|
|
|
|
rb_define_method(rb_cTime, "thursday?", time_thursday, 0);
|
|
|
|
rb_define_method(rb_cTime, "friday?", time_friday, 0);
|
|
|
|
rb_define_method(rb_cTime, "saturday?", time_saturday, 0);
|
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_define_method(rb_cTime, "tv_sec", time_to_i, 0);
|
|
|
|
rb_define_method(rb_cTime, "tv_usec", time_usec, 0);
|
|
|
|
rb_define_method(rb_cTime, "usec", time_usec, 0);
|
|
|
|
|
|
|
|
rb_define_method(rb_cTime, "strftime", time_strftime, 1);
|
1998-01-16 07:13:05 -05:00
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
/* methods for marshaling */
|
1999-08-13 01:45:20 -04:00
|
|
|
rb_define_method(rb_cTime, "_dump", time_dump, -1);
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_define_singleton_method(rb_cTime, "_load", time_load, 1);
|
2003-10-02 04:25:00 -04:00
|
|
|
#if 0
|
|
|
|
/* Time will support marshal_dump and marshal_load in the future (1.9 maybe) */
|
|
|
|
rb_define_method(rb_cTime, "marshal_dump", time_mdump, 0);
|
|
|
|
rb_define_method(rb_cTime, "marshal_load", time_mload, 1);
|
|
|
|
#endif
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|