tadf	2010-11-23 07:59:48 +0900 (Tue, 23 Nov 2010)

  New Revision: 29883

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29883

  Log:
    * lib/date/delta/parser.{ry,rb}: fixed a bug of token scanner.

  Modified files:
    trunk/ChangeLog
    trunk/lib/date/delta/parser.rb
    trunk/lib/date/delta/parser.ry

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 29882)
+++ ChangeLog	(revision 29883)
@@ -1,3 +1,7 @@
+Tue Nov 23 07:57:31 2010  Tadayoshi Funaba  <tadf@d...>
+
+	* lib/date/delta/parser.{ry,rb}: fixed a bug of token scanner.
+
 Tue Nov 23 07:29:24 2010  Tadayoshi Funaba  <tadf@d...>
 
 	* complex.c, rational.c ({nucomp,nurat}_expt): added a check.
Index: lib/date/delta/parser.ry
===================================================================
--- lib/date/delta/parser.ry	(revision 29882)
+++ lib/date/delta/parser.ry	(revision 29883)
@@ -1,4 +1,4 @@
-# parser.ry: Written by Tadayoshi Funaba 2006,2008,2009 -*- ruby -*-
+# parser.ry: Written by Tadayoshi Funaba 2006,2008-2010 -*- ruby -*-
 
 class Date::Delta::Parser
 
@@ -53,7 +53,8 @@
     until str.empty?
       case str
       when /\A\s+/
-      when /\AP(\d+y)?(\d+m)?(\d+d)?t?(\d+h)?(\d+m)?(\d+s)?(\d+w)?/i
+      when /\Ap\d+[ymdhsw]/i
+	/\Ap(\d+y)?(\d+m)?(\d+d)?t?(\d+h)?(\d+m)?(\d+s)?(\d+w)?/i =~ str
 	y, m, d, h, min, s, w =
 	  [$1, $2, $3, $4, $5, $6, $7].collect{|x| x.to_i}
 	y *= UNITS4KEY['years']
Index: lib/date/delta/parser.rb
===================================================================
--- lib/date/delta/parser.rb	(revision 29882)
+++ lib/date/delta/parser.rb	(revision 29883)
@@ -13,7 +13,7 @@
 
     class Parser < Racc::Parser
 
-module_eval <<'..end parser.ry modeval..id43bff5dec9', 'parser.ry', 42
+module_eval <<'..end parser.ry modeval..idf2987de166', 'parser.ry', 42
 
   def lookup(str)
     t = str.downcase
@@ -28,7 +28,8 @@
     until str.empty?
       case str
       when /\A\s+/
-      when /\AP(\d+y)?(\d+m)?(\d+d)?t?(\d+h)?(\d+m)?(\d+s)?(\d+w)?/i
+      when /\Ap\d+[ymdhsw]/i
+	/\Ap(\d+y)?(\d+m)?(\d+d)?t?(\d+h)?(\d+m)?(\d+s)?(\d+w)?/i =~ str
 	y, m, d, h, min, s, w =
 	  [$1, $2, $3, $4, $5, $6, $7].collect{|x| x.to_i}
 	y *= UNITS4KEY['years']
@@ -56,7 +57,7 @@
     @q.shift
   end
 
-..end parser.ry modeval..id43bff5dec9
+..end parser.ry modeval..idf2987de166
 
 ##### racc 1.4.5 generates ###
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/