2015-11-14 03:00:29 -05:00
|
|
|
# frozen_string_literal: true
|
|
|
|
|
2011-10-05 20:14:55 -04:00
|
|
|
require 'date'
|
2003-01-21 11:06:32 -05:00
|
|
|
|
2011-10-05 20:14:55 -04:00
|
|
|
# = time.rb
|
2003-01-21 11:06:32 -05:00
|
|
|
#
|
2011-10-05 20:14:55 -04:00
|
|
|
# When 'time' is required, Time is extended with additional methods for parsing
|
|
|
|
# and converting Times.
|
2008-09-14 11:18:53 -04:00
|
|
|
#
|
2011-10-05 20:14:55 -04:00
|
|
|
# == Features
|
2008-09-14 11:18:53 -04:00
|
|
|
#
|
2011-10-05 20:14:55 -04:00
|
|
|
# This library extends the Time class with the following conversions between
|
|
|
|
# date strings and Time objects:
|
2008-09-14 11:18:53 -04:00
|
|
|
#
|
2011-10-06 01:59:35 -04:00
|
|
|
# * date-time defined by {RFC 2822}[http://www.ietf.org/rfc/rfc2822.txt]
|
|
|
|
# * HTTP-date defined by {RFC 2616}[http://www.ietf.org/rfc/rfc2616.txt]
|
|
|
|
# * dateTime defined by XML Schema Part 2: Datatypes ({ISO
|
|
|
|
# 8601}[http://www.iso.org/iso/date_and_time_format])
|
2011-10-05 20:14:55 -04:00
|
|
|
# * various formats handled by Date._parse
|
2011-10-06 01:59:35 -04:00
|
|
|
# * custom formats handled by Date._strptime
|
2008-09-14 11:18:53 -04:00
|
|
|
#
|
2011-10-05 20:14:55 -04:00
|
|
|
# == Examples
|
2008-09-14 11:18:53 -04:00
|
|
|
#
|
2011-10-05 20:14:55 -04:00
|
|
|
# All examples assume you have loaded Time with:
|
2008-09-14 11:18:53 -04:00
|
|
|
#
|
2011-10-05 20:14:55 -04:00
|
|
|
# require 'time'
|
2008-09-14 11:18:53 -04:00
|
|
|
#
|
2011-10-05 20:14:55 -04:00
|
|
|
# All of these examples were done using the EST timezone which is GMT-5.
|
2008-09-14 11:18:53 -04:00
|
|
|
#
|
2011-10-06 01:59:35 -04:00
|
|
|
# === Converting to a String
|
2008-09-14 11:18:53 -04:00
|
|
|
#
|
2011-10-06 01:59:35 -04:00
|
|
|
# t = Time.now
|
|
|
|
# t.iso8601 # => "2011-10-05T22:26:12-04:00"
|
|
|
|
# t.rfc2822 # => "Wed, 05 Oct 2011 22:26:12 -0400"
|
|
|
|
# t.httpdate # => "Thu, 06 Oct 2011 02:26:12 GMT"
|
2008-09-14 11:18:53 -04:00
|
|
|
#
|
2011-10-05 20:14:55 -04:00
|
|
|
# === Time.parse
|
2003-01-21 11:06:32 -05:00
|
|
|
#
|
2011-10-05 20:14:55 -04:00
|
|
|
# #parse takes a string representation of a Time and attempts to parse it
|
|
|
|
# using a heuristic.
|
2011-01-12 05:36:08 -05:00
|
|
|
#
|
2015-01-01 10:49:50 -05:00
|
|
|
# Time.parse("2010-10-31") #=> 2010-10-31 00:00:00 -0500
|
2011-10-05 20:14:55 -04:00
|
|
|
#
|
|
|
|
# Any missing pieces of the date are inferred based on the current date.
|
|
|
|
#
|
|
|
|
# # assuming the current date is "2011-10-31"
|
|
|
|
# Time.parse("12:00") #=> 2011-10-31 12:00:00 -0500
|
|
|
|
#
|
|
|
|
# We can change the date used to infer our missing elements by passing a second
|
|
|
|
# object that responds to #mon, #day and #year, such as Date, Time or DateTime.
|
|
|
|
# We can also use our own object.
|
|
|
|
#
|
|
|
|
# class MyDate
|
|
|
|
# attr_reader :mon, :day, :year
|
|
|
|
#
|
|
|
|
# def initialize(mon, day, year)
|
|
|
|
# @mon, @day, @year = mon, day, year
|
|
|
|
# end
|
|
|
|
# end
|
|
|
|
#
|
|
|
|
# d = Date.parse("2010-10-28")
|
|
|
|
# t = Time.parse("2010-10-29")
|
|
|
|
# dt = DateTime.parse("2010-10-30")
|
|
|
|
# md = MyDate.new(10,31,2010)
|
2003-01-21 11:06:32 -05:00
|
|
|
#
|
2011-10-06 01:59:35 -04:00
|
|
|
# Time.parse("12:00", d) #=> 2010-10-28 12:00:00 -0500
|
|
|
|
# Time.parse("12:00", t) #=> 2010-10-29 12:00:00 -0500
|
|
|
|
# Time.parse("12:00", dt) #=> 2010-10-30 12:00:00 -0500
|
|
|
|
# Time.parse("12:00", md) #=> 2010-10-31 12:00:00 -0500
|
2003-01-21 11:06:32 -05:00
|
|
|
#
|
2011-10-05 20:14:55 -04:00
|
|
|
# #parse also accepts an optional block. You can use this block to specify how
|
|
|
|
# to handle the year component of the date. This is specifically designed for
|
|
|
|
# handling two digit years. For example, if you wanted to treat all two digit
|
|
|
|
# years prior to 70 as the year 2000+ you could write this:
|
|
|
|
#
|
|
|
|
# Time.parse("01-10-31") {|year| year + (year < 70 ? 2000 : 1900)}
|
|
|
|
# #=> 2001-10-31 00:00:00 -0500
|
|
|
|
# Time.parse("70-10-31") {|year| year + (year < 70 ? 2000 : 1900)}
|
|
|
|
# #=> 1970-10-31 00:00:00 -0500
|
|
|
|
#
|
|
|
|
# === Time.strptime
|
|
|
|
#
|
|
|
|
# #strptime works similar to +parse+ except that instead of using a heuristic
|
|
|
|
# to detect the format of the input string, you provide a second argument that
|
2013-10-07 07:32:05 -04:00
|
|
|
# describes the format of the string. For example:
|
2011-10-05 20:14:55 -04:00
|
|
|
#
|
|
|
|
# Time.strptime("2000-10-31", "%Y-%m-%d") #=> 2000-10-31 00:00:00 -0500
|
|
|
|
|
2001-12-10 01:52:47 -05:00
|
|
|
class Time
|
|
|
|
class << Time
|
|
|
|
|
2011-10-06 01:59:35 -04:00
|
|
|
#
|
|
|
|
# A hash of timezones mapped to hour differences from UTC. The
|
|
|
|
# set of time zones corresponds to the ones specified by RFC 2822
|
|
|
|
# and ISO 8601.
|
|
|
|
#
|
|
|
|
ZoneOffset = { # :nodoc:
|
2001-12-10 01:52:47 -05:00
|
|
|
'UTC' => 0,
|
|
|
|
# ISO 8601
|
|
|
|
'Z' => 0,
|
|
|
|
# RFC 822
|
|
|
|
'UT' => 0, 'GMT' => 0,
|
|
|
|
'EST' => -5, 'EDT' => -4,
|
|
|
|
'CST' => -6, 'CDT' => -5,
|
|
|
|
'MST' => -7, 'MDT' => -6,
|
|
|
|
'PST' => -8, 'PDT' => -7,
|
|
|
|
# Following definition of military zones is original one.
|
2005-01-05 23:48:31 -05:00
|
|
|
# See RFC 1123 and RFC 2822 for the error in RFC 822.
|
2008-09-14 11:18:53 -04:00
|
|
|
'A' => +1, 'B' => +2, 'C' => +3, 'D' => +4, 'E' => +5, 'F' => +6,
|
2001-12-10 01:52:47 -05:00
|
|
|
'G' => +7, 'H' => +8, 'I' => +9, 'K' => +10, 'L' => +11, 'M' => +12,
|
2008-09-14 11:18:53 -04:00
|
|
|
'N' => -1, 'O' => -2, 'P' => -3, 'Q' => -4, 'R' => -5, 'S' => -6,
|
2001-12-10 01:52:47 -05:00
|
|
|
'T' => -7, 'U' => -8, 'V' => -9, 'W' => -10, 'X' => -11, 'Y' => -12,
|
|
|
|
}
|
2011-10-06 01:59:35 -04:00
|
|
|
|
|
|
|
#
|
|
|
|
# Return the number of seconds the specified time zone differs
|
|
|
|
# from UTC.
|
|
|
|
#
|
|
|
|
# Numeric time zones that include minutes, such as
|
|
|
|
# <code>-10:00</code> or <code>+1330</code> will work, as will
|
|
|
|
# simpler hour-only time zones like <code>-10</code> or
|
|
|
|
# <code>+13</code>.
|
|
|
|
#
|
|
|
|
# Textual time zones listed in ZoneOffset are also supported.
|
|
|
|
#
|
|
|
|
# If the time zone does not match any of the above, +zone_offset+
|
|
|
|
# will check if the local time zone (both with and without
|
|
|
|
# potential Daylight Saving \Time changes being in effect) matches
|
|
|
|
# +zone+. Specifying a value for +year+ will change the year used
|
|
|
|
# to find the local time zone.
|
|
|
|
#
|
|
|
|
# If +zone_offset+ is unable to determine the offset, nil will be
|
|
|
|
# returned.
|
2008-01-13 19:27:35 -05:00
|
|
|
def zone_offset(zone, year=self.now.year)
|
2001-12-10 01:52:47 -05:00
|
|
|
off = nil
|
|
|
|
zone = zone.upcase
|
2003-03-29 01:39:50 -05:00
|
|
|
if /\A([+-])(\d\d):?(\d\d)\z/ =~ zone
|
2001-12-10 01:52:47 -05:00
|
|
|
off = ($1 == '-' ? -1 : 1) * ($2.to_i * 60 + $3.to_i) * 60
|
2003-03-29 01:39:50 -05:00
|
|
|
elsif /\A[+-]\d\d\z/ =~ zone
|
2001-12-10 01:52:47 -05:00
|
|
|
off = zone.to_i * 3600
|
|
|
|
elsif ZoneOffset.include?(zone)
|
|
|
|
off = ZoneOffset[zone] * 3600
|
2008-01-13 19:27:35 -05:00
|
|
|
elsif ((t = self.local(year, 1, 1)).zone.upcase == zone rescue false)
|
2001-12-17 02:22:03 -05:00
|
|
|
off = t.utc_offset
|
2008-01-13 19:27:35 -05:00
|
|
|
elsif ((t = self.local(year, 7, 1)).zone.upcase == zone rescue false)
|
2001-12-17 02:22:03 -05:00
|
|
|
off = t.utc_offset
|
2001-12-10 01:52:47 -05:00
|
|
|
end
|
|
|
|
off
|
|
|
|
end
|
|
|
|
|
2005-01-05 23:48:31 -05:00
|
|
|
def zone_utc?(zone)
|
2008-11-26 08:41:59 -05:00
|
|
|
# * +0000
|
|
|
|
# In RFC 2822, +0000 indicate a time zone at Universal Time.
|
|
|
|
# Europe/Lisbon is "a time zone at Universal Time" in Winter.
|
|
|
|
# Atlantic/Reykjavik is "a time zone at Universal Time".
|
|
|
|
# Africa/Dakar is "a time zone at Universal Time".
|
|
|
|
# So +0000 is a local time such as Europe/London, etc.
|
|
|
|
# * GMT
|
|
|
|
# GMT is used as a time zone abbreviation in Europe/London,
|
|
|
|
# Africa/Dakar, etc.
|
|
|
|
# So it is a local time.
|
|
|
|
#
|
|
|
|
# * -0000, -00:00
|
|
|
|
# In RFC 2822, -0000 the date-time contains no information about the
|
|
|
|
# local time zone.
|
|
|
|
# In RFC 3339, -00:00 is used for the time in UTC is known,
|
|
|
|
# but the offset to local time is unknown.
|
|
|
|
# They are not appropriate for specific time zone such as
|
2009-03-05 22:56:38 -05:00
|
|
|
# Europe/London because time zone neutral,
|
2008-11-26 08:41:59 -05:00
|
|
|
# So -00:00 and -0000 are treated as UTC.
|
2008-11-24 04:38:00 -05:00
|
|
|
if /\A(?:-00:00|-0000|-00|UTC|Z|UT)\z/i =~ zone
|
2005-01-05 23:48:31 -05:00
|
|
|
true
|
|
|
|
else
|
|
|
|
false
|
|
|
|
end
|
|
|
|
end
|
|
|
|
private :zone_utc?
|
|
|
|
|
2014-05-04 05:01:19 -04:00
|
|
|
def force_zone!(t, zone, offset=nil)
|
|
|
|
if zone_utc?(zone)
|
|
|
|
t.utc
|
|
|
|
elsif offset ||= zone_offset(zone)
|
2014-05-04 11:57:16 -04:00
|
|
|
# Prefer the local timezone over the fixed offset timezone because
|
|
|
|
# the former is a real timezone and latter is an artificial timezone.
|
2014-05-04 07:52:26 -04:00
|
|
|
t.localtime
|
|
|
|
if t.utc_offset != offset
|
2014-05-04 11:51:05 -04:00
|
|
|
# Use the fixed offset timezone only if the local timezone cannot
|
|
|
|
# represent the given offset.
|
2014-05-04 07:52:26 -04:00
|
|
|
t.localtime(offset)
|
|
|
|
end
|
2014-05-04 05:01:19 -04:00
|
|
|
else
|
|
|
|
t.localtime
|
|
|
|
end
|
|
|
|
end
|
|
|
|
private :force_zone!
|
|
|
|
|
2013-08-10 21:44:42 -04:00
|
|
|
LeapYearMonthDays = [31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31] # :nodoc:
|
|
|
|
CommonYearMonthDays = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31] # :nodoc:
|
2005-06-17 00:04:44 -04:00
|
|
|
def month_days(y, m)
|
|
|
|
if ((y % 4 == 0) && (y % 100 != 0)) || (y % 400 == 0)
|
|
|
|
LeapYearMonthDays[m-1]
|
|
|
|
else
|
|
|
|
CommonYearMonthDays[m-1]
|
|
|
|
end
|
|
|
|
end
|
|
|
|
private :month_days
|
|
|
|
|
|
|
|
def apply_offset(year, mon, day, hour, min, sec, off)
|
|
|
|
if off < 0
|
|
|
|
off = -off
|
|
|
|
off, o = off.divmod(60)
|
|
|
|
if o != 0 then sec += o; o, sec = sec.divmod(60); off += o end
|
|
|
|
off, o = off.divmod(60)
|
|
|
|
if o != 0 then min += o; o, min = min.divmod(60); off += o end
|
|
|
|
off, o = off.divmod(24)
|
|
|
|
if o != 0 then hour += o; o, hour = hour.divmod(24); off += o end
|
|
|
|
if off != 0
|
|
|
|
day += off
|
2014-07-18 22:56:39 -04:00
|
|
|
days = month_days(year, mon)
|
|
|
|
if days and days < day
|
2005-06-17 00:04:44 -04:00
|
|
|
mon += 1
|
|
|
|
if 12 < mon
|
|
|
|
mon = 1
|
|
|
|
year += 1
|
|
|
|
end
|
|
|
|
day = 1
|
|
|
|
end
|
|
|
|
end
|
|
|
|
elsif 0 < off
|
|
|
|
off, o = off.divmod(60)
|
|
|
|
if o != 0 then sec -= o; o, sec = sec.divmod(60); off -= o end
|
|
|
|
off, o = off.divmod(60)
|
|
|
|
if o != 0 then min -= o; o, min = min.divmod(60); off -= o end
|
|
|
|
off, o = off.divmod(24)
|
|
|
|
if o != 0 then hour -= o; o, hour = hour.divmod(24); off -= o end
|
|
|
|
if off != 0 then
|
|
|
|
day -= off
|
|
|
|
if day < 1
|
|
|
|
mon -= 1
|
|
|
|
if mon < 1
|
|
|
|
year -= 1
|
|
|
|
mon = 12
|
|
|
|
end
|
|
|
|
day = month_days(year, mon)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
return year, mon, day, hour, min, sec
|
|
|
|
end
|
|
|
|
private :apply_offset
|
|
|
|
|
2016-04-19 00:20:48 -04:00
|
|
|
def make_time(date, year, mon, day, hour, min, sec, sec_fraction, zone, now)
|
2014-05-06 05:04:09 -04:00
|
|
|
if !year && !mon && !day && !hour && !min && !sec && !sec_fraction
|
|
|
|
raise ArgumentError, "no time information in #{date.inspect}"
|
|
|
|
end
|
|
|
|
|
2016-04-19 00:20:48 -04:00
|
|
|
off_year = year || now.year
|
2014-05-06 05:50:08 -04:00
|
|
|
off = nil
|
2016-04-19 00:20:48 -04:00
|
|
|
off = zone_offset(zone, off_year) if zone
|
2014-05-06 05:50:08 -04:00
|
|
|
|
|
|
|
if off
|
|
|
|
now = now.getlocal(off) if now.utc_offset != off
|
|
|
|
else
|
|
|
|
now = now.getlocal
|
|
|
|
end
|
|
|
|
|
2005-08-28 11:40:28 -04:00
|
|
|
usec = nil
|
2007-11-19 04:24:28 -05:00
|
|
|
usec = sec_fraction * 1000000 if sec_fraction
|
2014-05-06 05:50:08 -04:00
|
|
|
|
* 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
|
|
|
if now
|
|
|
|
begin
|
|
|
|
break if year; year = now.year
|
|
|
|
break if mon; mon = now.mon
|
|
|
|
break if day; day = now.day
|
|
|
|
break if hour; hour = now.hour
|
|
|
|
break if min; min = now.min
|
|
|
|
break if sec; sec = now.sec
|
2005-08-28 11:40:28 -04:00
|
|
|
break if sec_fraction; usec = now.tv_usec
|
* 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
|
|
|
end until true
|
|
|
|
end
|
|
|
|
|
|
|
|
year ||= 1970
|
|
|
|
mon ||= 1
|
|
|
|
day ||= 1
|
|
|
|
hour ||= 0
|
|
|
|
min ||= 0
|
|
|
|
sec ||= 0
|
2005-08-28 11:40:28 -04:00
|
|
|
usec ||= 0
|
* 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
|
|
|
|
2016-04-19 00:20:48 -04:00
|
|
|
if year != off_year
|
|
|
|
off = nil
|
2014-05-06 05:50:08 -04:00
|
|
|
off = zone_offset(zone, year) if zone
|
|
|
|
end
|
* 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
|
|
|
|
|
|
|
if off
|
2005-06-17 00:04:44 -04:00
|
|
|
year, mon, day, hour, min, sec =
|
|
|
|
apply_offset(year, mon, day, hour, min, sec, off)
|
2008-01-13 19:27:35 -05:00
|
|
|
t = self.utc(year, mon, day, hour, min, sec, usec)
|
2014-05-04 05:01:19 -04:00
|
|
|
force_zone!(t, zone, off)
|
* 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
|
|
|
t
|
|
|
|
else
|
2006-10-31 03:08:46 -05:00
|
|
|
self.local(year, mon, day, hour, min, sec, usec)
|
* 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
|
|
|
end
|
|
|
|
end
|
2005-06-16 00:00:01 -04:00
|
|
|
private :make_time
|
* 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
|
|
|
|
2003-01-21 11:06:32 -05:00
|
|
|
#
|
2005-08-28 11:40:28 -04:00
|
|
|
# Parses +date+ using Date._parse and converts it to a Time object.
|
2003-01-21 11:06:32 -05:00
|
|
|
#
|
|
|
|
# If a block is given, the year described in +date+ is converted by the
|
|
|
|
# block. For example:
|
|
|
|
#
|
2009-04-23 13:47:58 -04:00
|
|
|
# Time.parse(...) {|y| 0 <= y && y < 100 ? (y >= 69 ? y + 1900 : y + 2000) : y}
|
2003-01-21 11:06:32 -05:00
|
|
|
#
|
|
|
|
# If the upper components of the given time are broken or missing, they are
|
|
|
|
# supplied with those of +now+. For the lower components, the minimum
|
|
|
|
# values (1 or 0) are assumed if broken or missing. For example:
|
|
|
|
#
|
2014-05-06 04:18:13 -04:00
|
|
|
# # Suppose it is "Thu Nov 29 14:33:20 2001" now and
|
2014-05-06 04:27:47 -04:00
|
|
|
# # your time zone is EST which is GMT-5.
|
2014-05-06 04:18:13 -04:00
|
|
|
# now = Time.parse("Thu Nov 29 14:33:20 2001")
|
|
|
|
# Time.parse("16:30", now) #=> 2001-11-29 16:30:00 -0500
|
2014-05-06 04:27:47 -04:00
|
|
|
# Time.parse("7/23", now) #=> 2001-07-23 00:00:00 -0500
|
|
|
|
# Time.parse("Aug 31", now) #=> 2001-08-31 00:00:00 -0500
|
|
|
|
# Time.parse("Aug 2000", now) #=> 2000-08-01 00:00:00 -0500
|
2003-01-21 11:06:32 -05:00
|
|
|
#
|
2011-10-06 01:59:35 -04:00
|
|
|
# Since there are numerous conflicts among locally defined time zone
|
|
|
|
# abbreviations all over the world, this method is not intended to
|
2003-01-21 11:06:32 -05:00
|
|
|
# understand all of them. For example, the abbreviation "CST" is
|
|
|
|
# used variously as:
|
|
|
|
#
|
|
|
|
# -06:00 in America/Chicago,
|
|
|
|
# -05:00 in America/Havana,
|
|
|
|
# +08:00 in Asia/Harbin,
|
|
|
|
# +09:30 in Australia/Darwin,
|
|
|
|
# +10:30 in Australia/Adelaide,
|
|
|
|
# etc.
|
|
|
|
#
|
2011-10-06 01:59:35 -04:00
|
|
|
# Based on this fact, this method only understands the time zone
|
|
|
|
# abbreviations described in RFC 822 and the system time zone, in the
|
2003-01-21 11:06:32 -05:00
|
|
|
# order named. (i.e. a definition in RFC 822 overrides the system
|
2011-10-06 01:59:35 -04:00
|
|
|
# time zone definition.) The system time zone is taken from
|
2003-01-21 11:06:32 -05:00
|
|
|
# <tt>Time.local(year, 1, 1).zone</tt> and
|
|
|
|
# <tt>Time.local(year, 7, 1).zone</tt>.
|
2011-10-06 01:59:35 -04:00
|
|
|
# If the extracted time zone abbreviation does not match any of them,
|
2003-01-21 11:06:32 -05:00
|
|
|
# it is ignored and the given time is regarded as a local time.
|
|
|
|
#
|
2005-08-28 11:40:28 -04:00
|
|
|
# ArgumentError is raised if Date._parse cannot extract information from
|
2011-10-06 01:59:35 -04:00
|
|
|
# +date+ or if the Time class cannot represent specified date.
|
2003-01-21 11:06:32 -05:00
|
|
|
#
|
2011-10-06 01:59:35 -04:00
|
|
|
# This method can be used as a fail-safe for other parsing methods as:
|
2003-01-21 11:06:32 -05:00
|
|
|
#
|
|
|
|
# Time.rfc2822(date) rescue Time.parse(date)
|
|
|
|
# Time.httpdate(date) rescue Time.parse(date)
|
|
|
|
# Time.xmlschema(date) rescue Time.parse(date)
|
|
|
|
#
|
2011-10-06 01:59:35 -04:00
|
|
|
# A failure of Time.parse should be checked, though.
|
2003-01-21 11:06:32 -05:00
|
|
|
#
|
2011-10-06 01:59:35 -04:00
|
|
|
# You must require 'time' to use this method.
|
2009-11-26 09:32:15 -05:00
|
|
|
#
|
2008-01-13 19:27:35 -05:00
|
|
|
def parse(date, now=self.now)
|
2009-04-22 06:34:29 -04:00
|
|
|
comp = !block_given?
|
|
|
|
d = Date._parse(date, comp)
|
2005-08-28 11:40:28 -04:00
|
|
|
year = d[:year]
|
2009-04-22 06:34:29 -04:00
|
|
|
year = yield(year) if year && !comp
|
2016-04-19 00:20:48 -04:00
|
|
|
make_time(date, year, d[:mon], d[:mday], d[:hour], d[:min], d[:sec], d[:sec_fraction], d[:zone], now)
|
* 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
|
|
|
end
|
2001-12-10 01:52:47 -05:00
|
|
|
|
* 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
|
|
|
#
|
2005-08-28 11:40:28 -04:00
|
|
|
# Parses +date+ using Date._strptime and converts it to a Time object.
|
* 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
|
|
|
#
|
|
|
|
# If a block is given, the year described in +date+ is converted by the
|
|
|
|
# block. For example:
|
|
|
|
#
|
2011-10-05 20:14:55 -04:00
|
|
|
# Time.strptime(...) {|y| y < 100 ? (y >= 69 ? y + 1900 : y + 2000) : y}
|
|
|
|
#
|
2013-12-26 08:17:48 -05:00
|
|
|
# Below is a list of the formatting options:
|
2011-10-05 20:14:55 -04:00
|
|
|
#
|
|
|
|
# %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
|
|
|
|
# %C :: Century (20 in 2009)
|
|
|
|
# %d :: Day of the month (01..31)
|
|
|
|
# %D :: Date (%m/%d/%y)
|
|
|
|
# %e :: Day of the month, blank-padded ( 1..31)
|
|
|
|
# %F :: Equivalent to %Y-%m-%d (the ISO 8601 date format)
|
|
|
|
# %h :: Equivalent to %b
|
|
|
|
# %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)
|
|
|
|
# %k :: hour, 24-hour clock, blank-padded ( 0..23)
|
|
|
|
# %l :: hour, 12-hour clock, blank-padded ( 0..12)
|
|
|
|
# %L :: Millisecond of the second (000..999)
|
|
|
|
# %m :: Month of the year (01..12)
|
|
|
|
# %M :: Minute of the hour (00..59)
|
|
|
|
# %n :: Newline (\n)
|
|
|
|
# %N :: Fractional seconds digits, default is 9 digits (nanosecond)
|
|
|
|
# %3N :: millisecond (3 digits)
|
|
|
|
# %6N :: microsecond (6 digits)
|
|
|
|
# %9N :: nanosecond (9 digits)
|
|
|
|
# %p :: Meridian indicator ("AM" or "PM")
|
|
|
|
# %P :: Meridian indicator ("am" or "pm")
|
|
|
|
# %r :: time, 12-hour (same as %I:%M:%S %p)
|
|
|
|
# %R :: time, 24-hour (%H:%M)
|
|
|
|
# %s :: Number of seconds since 1970-01-01 00:00:00 UTC.
|
|
|
|
# %S :: Second of the minute (00..60)
|
|
|
|
# %t :: Tab character (\t)
|
|
|
|
# %T :: time, 24-hour (%H:%M:%S)
|
|
|
|
# %u :: Day of the week as a decimal, Monday being 1. (1..7)
|
|
|
|
# %U :: Week number of the current year, starting with the first Sunday as
|
|
|
|
# the first day of the first week (00..53)
|
|
|
|
# %v :: VMS date (%e-%b-%Y)
|
|
|
|
# %V :: Week number of year according to ISO 8601 (01..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)
|
2014-07-27 16:58:05 -04:00
|
|
|
# %Y :: Year which may include century, if provided
|
2011-10-05 20:14:55 -04:00
|
|
|
# %z :: Time zone as hour offset from UTC (e.g. +0900)
|
|
|
|
# %Z :: Time zone name
|
|
|
|
# %% :: Literal "%" character
|
|
|
|
|
2008-01-13 19:27:35 -05:00
|
|
|
def strptime(date, format, now=self.now)
|
2005-08-28 11:40:28 -04:00
|
|
|
d = Date._strptime(date, format)
|
|
|
|
raise ArgumentError, "invalid strptime format - `#{format}'" unless d
|
2011-10-04 03:37:11 -04:00
|
|
|
if seconds = d[:seconds]
|
2015-02-28 19:12:48 -05:00
|
|
|
if sec_fraction = d[:sec_fraction]
|
|
|
|
usec = sec_fraction * 1000000
|
|
|
|
usec *= -1 if seconds < 0
|
|
|
|
else
|
|
|
|
usec = 0
|
|
|
|
end
|
|
|
|
t = Time.at(seconds, usec)
|
2014-05-03 11:23:29 -04:00
|
|
|
if zone = d[:zone]
|
2014-05-04 05:01:19 -04:00
|
|
|
force_zone!(t, zone)
|
2014-05-03 11:23:29 -04:00
|
|
|
end
|
2011-10-04 03:37:11 -04:00
|
|
|
else
|
|
|
|
year = d[:year]
|
|
|
|
year = yield(year) if year && block_given?
|
2016-04-19 00:20:48 -04:00
|
|
|
t = make_time(date, year, d[:mon], d[:mday], d[:hour], d[:min], d[:sec], d[:sec_fraction], d[:zone], now)
|
2014-05-03 07:31:33 -04:00
|
|
|
end
|
|
|
|
t
|
2001-12-10 01:52:47 -05:00
|
|
|
end
|
|
|
|
|
2013-08-10 21:44:42 -04:00
|
|
|
MonthValue = { # :nodoc:
|
2001-12-10 01:52:47 -05:00
|
|
|
'JAN' => 1, 'FEB' => 2, 'MAR' => 3, 'APR' => 4, 'MAY' => 5, 'JUN' => 6,
|
|
|
|
'JUL' => 7, 'AUG' => 8, 'SEP' => 9, 'OCT' =>10, 'NOV' =>11, 'DEC' =>12
|
|
|
|
}
|
|
|
|
|
2003-01-21 11:06:32 -05:00
|
|
|
#
|
|
|
|
# Parses +date+ as date-time defined by RFC 2822 and converts it to a Time
|
|
|
|
# object. The format is identical to the date format defined by RFC 822 and
|
|
|
|
# updated by RFC 1123.
|
|
|
|
#
|
|
|
|
# ArgumentError is raised if +date+ is not compliant with RFC 2822
|
2011-10-06 01:59:35 -04:00
|
|
|
# or if the Time class cannot represent specified date.
|
2003-01-21 11:06:32 -05:00
|
|
|
#
|
|
|
|
# See #rfc2822 for more information on this format.
|
|
|
|
#
|
2011-10-06 01:59:35 -04:00
|
|
|
# You must require 'time' to use this method.
|
2009-11-26 09:32:15 -05:00
|
|
|
#
|
2001-12-10 01:52:47 -05:00
|
|
|
def rfc2822(date)
|
|
|
|
if /\A\s*
|
|
|
|
(?:(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun)\s*,\s*)?
|
|
|
|
(\d{1,2})\s+
|
|
|
|
(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s+
|
|
|
|
(\d{2,})\s+
|
|
|
|
(\d{2})\s*
|
|
|
|
:\s*(\d{2})\s*
|
|
|
|
(?::\s*(\d{2}))?\s+
|
2003-03-29 01:39:50 -05:00
|
|
|
([+-]\d{4}|
|
2001-12-10 01:52:47 -05:00
|
|
|
UT|GMT|EST|EDT|CST|CDT|MST|MDT|PST|PDT|[A-IK-Z])/ix =~ date
|
|
|
|
# Since RFC 2822 permit comments, the regexp has no right anchor.
|
|
|
|
day = $1.to_i
|
|
|
|
mon = MonthValue[$2.upcase]
|
|
|
|
year = $3.to_i
|
2014-05-03 14:11:53 -04:00
|
|
|
short_year_p = $3.length <= 3
|
2001-12-10 01:52:47 -05:00
|
|
|
hour = $4.to_i
|
|
|
|
min = $5.to_i
|
|
|
|
sec = $6 ? $6.to_i : 0
|
|
|
|
zone = $7
|
|
|
|
|
2014-05-03 14:11:53 -04:00
|
|
|
if short_year_p
|
|
|
|
# following year completion is compliant with RFC 2822.
|
|
|
|
year = if year < 50
|
|
|
|
2000 + year
|
|
|
|
else
|
|
|
|
1900 + year
|
|
|
|
end
|
|
|
|
end
|
2001-12-10 01:52:47 -05:00
|
|
|
|
2014-05-03 14:11:53 -04:00
|
|
|
off = zone_offset(zone)
|
2005-06-17 00:04:44 -04:00
|
|
|
year, mon, day, hour, min, sec =
|
2014-05-03 14:11:53 -04:00
|
|
|
apply_offset(year, mon, day, hour, min, sec, off)
|
2006-10-31 03:08:46 -05:00
|
|
|
t = self.utc(year, mon, day, hour, min, sec)
|
2014-05-04 05:01:19 -04:00
|
|
|
force_zone!(t, zone, off)
|
2005-06-17 00:04:44 -04:00
|
|
|
t
|
2001-12-10 01:52:47 -05:00
|
|
|
else
|
|
|
|
raise ArgumentError.new("not RFC 2822 compliant date: #{date.inspect}")
|
|
|
|
end
|
|
|
|
end
|
|
|
|
alias rfc822 rfc2822
|
|
|
|
|
2003-01-21 11:06:32 -05:00
|
|
|
#
|
2011-10-06 01:59:35 -04:00
|
|
|
# Parses +date+ as an HTTP-date defined by RFC 2616 and converts it to a
|
|
|
|
# Time object.
|
2003-01-21 11:06:32 -05:00
|
|
|
#
|
2011-10-06 01:59:35 -04:00
|
|
|
# ArgumentError is raised if +date+ is not compliant with RFC 2616 or if
|
|
|
|
# the Time class cannot represent specified date.
|
2003-01-21 11:06:32 -05:00
|
|
|
#
|
|
|
|
# See #httpdate for more information on this format.
|
|
|
|
#
|
2011-10-06 01:59:35 -04:00
|
|
|
# You must require 'time' to use this method.
|
2009-11-26 09:32:15 -05:00
|
|
|
#
|
2001-12-10 01:52:47 -05:00
|
|
|
def httpdate(date)
|
|
|
|
if /\A\s*
|
|
|
|
(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun),\x20
|
|
|
|
(\d{2})\x20
|
|
|
|
(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\x20
|
|
|
|
(\d{4})\x20
|
|
|
|
(\d{2}):(\d{2}):(\d{2})\x20
|
|
|
|
GMT
|
|
|
|
\s*\z/ix =~ date
|
2014-05-03 14:47:29 -04:00
|
|
|
self.rfc2822(date).utc
|
2001-12-10 01:52:47 -05:00
|
|
|
elsif /\A\s*
|
|
|
|
(?:Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday),\x20
|
|
|
|
(\d\d)-(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)-(\d\d)\x20
|
|
|
|
(\d\d):(\d\d):(\d\d)\x20
|
|
|
|
GMT
|
|
|
|
\s*\z/ix =~ date
|
2007-12-23 05:48:54 -05:00
|
|
|
year = $3.to_i
|
|
|
|
if year < 50
|
|
|
|
year += 2000
|
|
|
|
else
|
|
|
|
year += 1900
|
|
|
|
end
|
2008-01-13 19:27:35 -05:00
|
|
|
self.utc(year, $2, $1.to_i, $4.to_i, $5.to_i, $6.to_i)
|
2001-12-10 01:52:47 -05:00
|
|
|
elsif /\A\s*
|
|
|
|
(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun)\x20
|
|
|
|
(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\x20
|
|
|
|
(\d\d|\x20\d)\x20
|
|
|
|
(\d\d):(\d\d):(\d\d)\x20
|
|
|
|
(\d{4})
|
|
|
|
\s*\z/ix =~ date
|
2006-10-31 03:08:46 -05:00
|
|
|
self.utc($6.to_i, MonthValue[$1.upcase], $2.to_i,
|
2001-12-10 01:52:47 -05:00
|
|
|
$3.to_i, $4.to_i, $5.to_i)
|
|
|
|
else
|
|
|
|
raise ArgumentError.new("not RFC 2616 compliant date: #{date.inspect}")
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2003-01-21 11:06:32 -05:00
|
|
|
#
|
2011-10-06 01:59:35 -04:00
|
|
|
# Parses +date+ as a dateTime defined by the XML Schema and converts it to
|
|
|
|
# a Time object. The format is a restricted version of the format defined
|
|
|
|
# by ISO 8601.
|
2003-01-21 11:06:32 -05:00
|
|
|
#
|
2011-10-06 01:59:35 -04:00
|
|
|
# ArgumentError is raised if +date+ is not compliant with the format or if
|
|
|
|
# the Time class cannot represent specified date.
|
2003-01-21 11:06:32 -05:00
|
|
|
#
|
|
|
|
# See #xmlschema for more information on this format.
|
|
|
|
#
|
2011-10-06 01:59:35 -04:00
|
|
|
# You must require 'time' to use this method.
|
2009-11-26 09:32:15 -05:00
|
|
|
#
|
2001-12-10 01:52:47 -05:00
|
|
|
def xmlschema(date)
|
|
|
|
if /\A\s*
|
|
|
|
(-?\d+)-(\d\d)-(\d\d)
|
|
|
|
T
|
|
|
|
(\d\d):(\d\d):(\d\d)
|
2008-06-13 05:10:44 -04:00
|
|
|
(\.\d+)?
|
2003-03-29 01:39:50 -05:00
|
|
|
(Z|[+-]\d\d:\d\d)?
|
2001-12-10 01:52:47 -05:00
|
|
|
\s*\z/ix =~ date
|
2005-06-17 00:04:44 -04:00
|
|
|
year = $1.to_i
|
|
|
|
mon = $2.to_i
|
|
|
|
day = $3.to_i
|
|
|
|
hour = $4.to_i
|
|
|
|
min = $5.to_i
|
|
|
|
sec = $6.to_i
|
|
|
|
usec = 0
|
2008-06-05 11:08:12 -04:00
|
|
|
if $7
|
2008-06-13 05:10:44 -04:00
|
|
|
usec = Rational($7) * 1000000
|
2008-06-05 11:08:12 -04:00
|
|
|
end
|
2005-06-17 00:04:44 -04:00
|
|
|
if $8
|
|
|
|
zone = $8
|
2014-05-03 14:11:53 -04:00
|
|
|
off = zone_offset(zone)
|
2005-06-17 00:04:44 -04:00
|
|
|
year, mon, day, hour, min, sec =
|
2014-05-03 14:11:53 -04:00
|
|
|
apply_offset(year, mon, day, hour, min, sec, off)
|
|
|
|
t = self.utc(year, mon, day, hour, min, sec, usec)
|
2014-05-04 05:01:19 -04:00
|
|
|
force_zone!(t, zone, off)
|
2014-05-03 14:11:53 -04:00
|
|
|
t
|
2005-06-17 00:04:44 -04:00
|
|
|
else
|
2008-01-13 19:27:35 -05:00
|
|
|
self.local(year, mon, day, hour, min, sec, usec)
|
2005-06-17 00:04:44 -04:00
|
|
|
end
|
2001-12-10 01:52:47 -05:00
|
|
|
else
|
|
|
|
raise ArgumentError.new("invalid date: #{date.inspect}")
|
|
|
|
end
|
|
|
|
end
|
|
|
|
alias iso8601 xmlschema
|
2003-01-21 11:06:32 -05:00
|
|
|
end # class << self
|
|
|
|
|
|
|
|
#
|
|
|
|
# Returns a string which represents the time as date-time defined by RFC 2822:
|
|
|
|
#
|
|
|
|
# day-of-week, DD month-name CCYY hh:mm:ss zone
|
|
|
|
#
|
|
|
|
# where zone is [+-]hhmm.
|
|
|
|
#
|
2008-11-24 04:38:00 -05:00
|
|
|
# If +self+ is a UTC time, -0000 is used as zone.
|
2003-01-21 11:06:32 -05:00
|
|
|
#
|
2011-10-06 01:59:35 -04:00
|
|
|
# You must require 'time' to use this method.
|
2009-11-26 09:32:15 -05:00
|
|
|
#
|
2001-12-10 01:52:47 -05:00
|
|
|
def rfc2822
|
2009-11-24 06:34:45 -05:00
|
|
|
sprintf('%s, %02d %s %0*d %02d:%02d:%02d ',
|
2001-12-10 01:52:47 -05:00
|
|
|
RFC2822_DAY_NAME[wday],
|
2009-11-24 06:34:45 -05:00
|
|
|
day, RFC2822_MONTH_NAME[mon-1], year < 0 ? 5 : 4, year,
|
2015-11-14 07:45:30 -05:00
|
|
|
hour, min, sec) <<
|
2001-12-10 01:52:47 -05:00
|
|
|
if utc?
|
2008-11-24 04:38:00 -05:00
|
|
|
'-0000'
|
2001-12-10 01:52:47 -05:00
|
|
|
else
|
2001-12-17 02:22:03 -05:00
|
|
|
off = utc_offset
|
|
|
|
sign = off < 0 ? '-' : '+'
|
|
|
|
sprintf('%s%02d%02d', sign, *(off.abs / 60).divmod(60))
|
2001-12-10 01:52:47 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
alias rfc822 rfc2822
|
|
|
|
|
2013-08-10 13:44:55 -04:00
|
|
|
|
2013-08-10 21:44:42 -04:00
|
|
|
RFC2822_DAY_NAME = [ # :nodoc:
|
2003-01-21 11:06:32 -05:00
|
|
|
'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'
|
|
|
|
]
|
2013-08-10 13:44:55 -04:00
|
|
|
|
2013-08-10 21:44:42 -04:00
|
|
|
RFC2822_MONTH_NAME = [ # :nodoc:
|
2003-01-21 11:06:32 -05:00
|
|
|
'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
|
|
|
|
'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'
|
|
|
|
]
|
2001-12-10 01:52:47 -05:00
|
|
|
|
2003-01-21 11:06:32 -05:00
|
|
|
#
|
2011-10-06 01:59:35 -04:00
|
|
|
# Returns a string which represents the time as RFC 1123 date of HTTP-date
|
2008-09-14 11:18:53 -04:00
|
|
|
# defined by RFC 2616:
|
|
|
|
#
|
2003-01-21 11:06:32 -05:00
|
|
|
# day-of-week, DD month-name CCYY hh:mm:ss GMT
|
|
|
|
#
|
|
|
|
# Note that the result is always UTC (GMT).
|
|
|
|
#
|
2011-10-06 01:59:35 -04:00
|
|
|
# You must require 'time' to use this method.
|
2009-11-26 09:32:15 -05:00
|
|
|
#
|
2001-12-10 01:52:47 -05:00
|
|
|
def httpdate
|
|
|
|
t = dup.utc
|
2009-11-24 06:34:45 -05:00
|
|
|
sprintf('%s, %02d %s %0*d %02d:%02d:%02d GMT',
|
2001-12-10 01:52:47 -05:00
|
|
|
RFC2822_DAY_NAME[t.wday],
|
2009-11-24 06:34:45 -05:00
|
|
|
t.day, RFC2822_MONTH_NAME[t.mon-1], t.year < 0 ? 5 : 4, t.year,
|
2001-12-10 01:52:47 -05:00
|
|
|
t.hour, t.min, t.sec)
|
|
|
|
end
|
|
|
|
|
2003-01-21 11:06:32 -05:00
|
|
|
#
|
2011-10-06 01:59:35 -04:00
|
|
|
# Returns a string which represents the time as a dateTime defined by XML
|
2003-01-21 11:06:32 -05:00
|
|
|
# Schema:
|
|
|
|
#
|
|
|
|
# CCYY-MM-DDThh:mm:ssTZD
|
|
|
|
# CCYY-MM-DDThh:mm:ss.sssTZD
|
|
|
|
#
|
|
|
|
# where TZD is Z or [+-]hh:mm.
|
|
|
|
#
|
|
|
|
# If self is a UTC time, Z is used as TZD. [+-]hh:mm is used otherwise.
|
|
|
|
#
|
2011-10-06 01:59:35 -04:00
|
|
|
# +fractional_digits+ specifies a number of digits to use for fractional
|
|
|
|
# seconds. Its default value is 0.
|
2009-11-26 09:32:15 -05:00
|
|
|
#
|
2011-10-06 01:59:35 -04:00
|
|
|
# You must require 'time' to use this method.
|
2009-11-26 09:32:15 -05:00
|
|
|
#
|
2002-01-06 22:56:55 -05:00
|
|
|
def xmlschema(fraction_digits=0)
|
2012-02-28 03:16:03 -05:00
|
|
|
fraction_digits = fraction_digits.to_i
|
|
|
|
s = strftime("%FT%T")
|
|
|
|
if fraction_digits > 0
|
|
|
|
s << strftime(".%#{fraction_digits}N")
|
2001-12-10 01:52:47 -05:00
|
|
|
end
|
2012-02-28 03:16:03 -05:00
|
|
|
s << (utc? ? 'Z' : strftime("%:z"))
|
2001-12-10 01:52:47 -05:00
|
|
|
end
|
|
|
|
alias iso8601 xmlschema
|
|
|
|
end
|
|
|
|
|