From 0e866a2e516d5b7bea0a602d1048b5bdc22a2f98 Mon Sep 17 00:00:00 2001
From: tadf <tadf@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 22 Jun 2002 15:26:58 +0000
Subject: updated to the new version (based on date2 3.3).

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2589 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 sample/cal.rb        | 18 +++++++++---------
 sample/goodfriday.rb |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'sample')

diff --git a/sample/cal.rb b/sample/cal.rb
index 92f43e2a72..0b2d9216ac 100644
--- a/sample/cal.rb
+++ b/sample/cal.rb
@@ -1,7 +1,7 @@
 #! /usr/bin/env ruby
 
 # cal.rb: Written by Tadayoshi Funaba 1998-2002
-# $Id: cal.rb,v 2.3 2002-05-14 07:43:39+09 tadf Exp $
+# $Id: cal.rb,v 2.4 2002-06-08 00:40:29+09 tadf Exp $
 
 require 'date'
 require 'getopts'
@@ -37,7 +37,7 @@ def usage
 end
 
 def pict(y, m, sg)
-  d = (1..31).detect{|d| Date.exist?(y, m, d, sg)}
+  d = (1..31).detect{|d| Date.valid_date?(y, m, d, sg)}
   fi = Date.new(y, m, d, sg)
   fi -= (fi.jd - $k + 1) % 7
 
@@ -93,7 +93,7 @@ m ||= to.mon
 
 usage unless m >= 1 and m <= 12
 usage unless y >= -4712
-usage unless sg = $tab[$OPT_c]
+usage if (sg = $tab[$OPT_c]).nil?
 
 $dw = if $OPT_j then 3 else 2 end
 $mw = ($dw + 1) * 7 - 1
@@ -103,9 +103,9 @@ $tw = ($mw + 2) * $mn - 2
 $k  = if $OPT_m then 1 else 0 end
 $da = if $OPT_j then :yday else :mday end
 
-print (if not $OPT_y
-	 unlines(pict(y, m, sg))
-       else
-	 y.to_s.center($tw) + "\n\n" +
-	   unlines(block((1..12).collect{|m| pict(y, m, sg)}, $mn)) + "\n"
-       end)
+print(if not $OPT_y
+	unlines(pict(y, m, sg))
+      else
+	y.to_s.center($tw) + "\n\n" +
+	  unlines(block((1..12).collect{|m| pict(y, m, sg)}, $mn)) + "\n"
+      end)
diff --git a/sample/goodfriday.rb b/sample/goodfriday.rb
index 07809cf129..a95cfe819f 100644
--- a/sample/goodfriday.rb
+++ b/sample/goodfriday.rb
@@ -1,7 +1,7 @@
 #! /usr/bin/env ruby
 
-# goodfriday.rb: Written by Tadayoshi Funaba 1998, 2000
-# $Id: goodfriday.rb,v 1.1.1.1 2000-07-16 10:25:30+09 tadf Exp $
+# goodfriday.rb: Written by Tadayoshi Funaba 1998, 2000, 2002
+# $Id: goodfriday.rb,v 1.1 1998-03-08 18:44:44+09 tadf Exp $
 
 require 'date'
 
@@ -44,5 +44,5 @@ es = Date.new(*easter(Time.now.year))
  [8*7,  'Trinity Sunday'],
  [60,   'Corpus Christi (Thursday after Trinity)']].
 each do |xs|
-  puts ((es + xs.shift).to_s + '  ' + xs.shift)
+  puts((es + xs.shift).to_s + '  ' + xs.shift)
 end
-- 
cgit v1.2.3