version 1.0-971209v1_0_971209

https://cache.ruby-lang.org/pub/ruby/1.0/ruby-1.0-971209.tar.gz

Tue Dec  9 17:54:56 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>

	* version 1.0-971209

	* sample/ruby-mode.el (ruby-expr-beg): forgot to handle modifiers.

	* parse.y (tokadd): token buffer overrun.

2 files changed, 12 insertions, 6 deletions

diff --git a/lib/date.rb b/lib/date.rb
index 260f6e79ec..cfb9b96904 100644
--- a/lib/date.rb
+++ b/lib/date.rb
@@ -73,8 +73,8 @@ class Date
   end
   
   def +(o)
-    if o.kind_of?(Integer)
-      d = self.period + o
+    if o.kind_of?(Numeric)
+      d = Integer(self.period + o)
     elsif o.kind_of?(Date)
       d = self.period + o.period
     else
@@ -84,10 +84,10 @@ class Date
   end
   
   def -(o)
-    if o.kind_of?(Integer)
-      d = self.period - o
+    if o.kind_of?(Numeric)
+      d = Integer(self.period - o)
     elsif o.kind_of?(Date)
-      d = self.period - o.period
+      return Integer(self.period - o.period)
     else
       raise TypeError, "Illegal type. (Integer or Date)"
     end
@@ -150,6 +150,12 @@ class Date
 end
 
 def Date.at(d)
+  if d.kind_of? Time
+    return Date.new(1900+d.year, d.mon, d.mday)
+  end
+  if d.kind_of? Date
+    return Date.at(d.period)
+  end
   mm = 1
   yy = (d / 366.0).to_i
   if yy != 0
diff --git a/lib/tkcanvas.rb b/lib/tkcanvas.rb
index 26f0ac0c7b..de727c3e79 100644
--- a/lib/tkcanvas.rb
+++ b/lib/tkcanvas.rb
@@ -92,7 +92,7 @@ class TkCanvas<TkWindow
   def itemtype(tag)
     tk_send 'type', tagid(tag)
   end
-  def postscript(keys=None)
+  def postscript(keys)
     tk_send "postscript", *hash_kv(keys)
   end
   def raise(tag, above=None)