From b393a2bc5fe07abef59656a6358f7ee7113bbe8b Mon Sep 17 00:00:00 2001
From: tadf <tadf@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 6 Feb 2005 05:05:18 +0000
Subject: [PATCH] synchronized with date2 3.6.3

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7895 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog          |  7 +++++++
 lib/date.rb        |  8 ++++----
 lib/date/format.rb | 41 ++++++++++++++++++++++++++++++++++++-----
 3 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2b9edb8831..1019e90a68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Feb  6 13:56:19 2005  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date.rb (new_with_hash): changed messages of exception.
+
+	* lib/date/format.rb (str[fp]time): undocumented conversion
+	  specifications %[1-3] are now deprecated.
+
 Sun Feb  6 11:27:37 2005  Tanaka Akira  <akr@m17n.org>
 
 	* ext/dl/dl.c (Init_dl): function declaration should precede
diff --git a/lib/date.rb b/lib/date.rb
index d67b1bab7e..9771825411 100644
--- a/lib/date.rb
+++ b/lib/date.rb
@@ -1,12 +1,12 @@
 #
 # date.rb - date and time library
 #
-# Author: Tadayoshi Funaba 1998-2004
+# Author: Tadayoshi Funaba 1998-2005
 #
 # Documentation: William Webber <william@williamwebber.com>
 #
 #--
-# $Id: date.rb,v 2.14 2004-09-25 09:51:25+09 tadf Exp $
+# $Id: date.rb,v 2.15 2005-02-06 11:09:53+09 tadf Exp $
 #++
 #
 # == Overview
@@ -647,7 +647,7 @@ class Date
     elem ||= {}
     y, m, d = elem.values_at(:year, :mon, :mday)
     if [y, m, d].include? nil
-      raise ArgumentError, 'invalid date'
+      raise ArgumentError, '3 elements of civil date are necessary'
     else
       civil(y, m, d, sg)
     end
@@ -1203,7 +1203,7 @@ class DateTime < Date
     fr  ||= 0
     of  ||= 0
     if [y, m, d].include? nil
-      raise ArgumentError, 'invalid date'
+      raise ArgumentError, '3 elements of civil date are necessary'
     else
       civil(y, m, d, h, min, s, of.to_r/86400, sg) + (fr/86400)
     end
diff --git a/lib/date/format.rb b/lib/date/format.rb
index d821ecb04e..babcffbfc5 100644
--- a/lib/date/format.rb
+++ b/lib/date/format.rb
@@ -1,5 +1,5 @@
-# format.rb: Written by Tadayoshi Funaba 1999-2004
-# $Id: format.rb,v 2.14 2004-11-06 10:58:40+09 tadf Exp $
+# format.rb: Written by Tadayoshi Funaba 1999-2005
+# $Id: format.rb,v 2.15 2005-02-06 13:28:48+09 tadf Exp $
 
 require 'rational'
 
@@ -116,6 +116,12 @@ class Date
 	val = $1.to_i
 	return unless (1..12) === val
 	elem[:mon] = val
+=begin
+      when '%N'
+	return unless str.sub!(/\A(\d+)/o, '')
+	val = $1.to_i.to_r / (10**9)
+	elem[:sec_fraction] = val
+=end
       when '%n'
 	return unless __strptime(str, ' ', elem)
       when '%p', '%P'
@@ -191,12 +197,21 @@ class Date
 	elem[:sec_fraction] = val
 =end
       when '%1'
+	if $VERBOSE
+	  warn("warning: %1 is deprecated; forget this")
+	end
 	return unless str.sub!(/\A(\d+)/o, '')
 	val = $1.to_i
 	elem[:jd] = val
       when '%2'
+	if $VERBOSE
+	  warn("warning: %2 is deprecated; use '%Y-%j'")
+	end
 	return unless __strptime(str, '%Y-%j', elem)
       when '%3'
+	if $VERBOSE
+	  warn("warning: %3 is deprecated; use '%F'")
+	end
 	return unless __strptime(str, '%F', elem)
       else
 	return unless str.sub!(Regexp.new('\\A' + Regexp.quote(c)), '')
@@ -498,6 +513,10 @@ class Date
       when '%l'; o <<  '%2d' % ((hour % 12).nonzero? or 12)	# AR,TZ,GL
       when '%M'; o << '%02d' % min
       when '%m'; o << '%02d' % mon
+=begin
+      when '%N'							# GNU date
+	o << '%09d' % (sec_fraction / (1.to_r/86400/(10**9)))
+=end
       when '%n'; o << "\n"					# P2,ID
       when '%P'; o << if hour < 12 then 'am' else 'pm' end	# GL
       when '%p'; o << if hour < 12 then 'AM' else 'PM' end
@@ -537,9 +556,21 @@ class Date
       when '%.'
 	o << '%06d' % (sec_fraction / (1.to_r/86400/(10**6)))
 =end
-      when '%1'; o <<   '%d' % jd
-      when '%2'; o << strftime('%Y-%j')
-      when '%3'; o << strftime('%Y-%m-%d')
+      when '%1'
+	if $VERBOSE
+	  warn("warning: %1 is deprecated; forget this")
+	end
+	o <<   '%d' % jd
+      when '%2'
+	if $VERBOSE
+	  warn("warning: %2 is deprecated; use '%Y-%j'")
+	end
+	o << strftime('%Y-%j')
+      when '%3'
+	if $VERBOSE
+	  warn("warning: %3 is deprecated; use '%F'")
+	end
+	o << strftime('%F')
       else;      o << c
       end
     end