Author: ko1
Date: 2005-08-16 04:27:09 +0900 (Tue, 16 Aug 2005)
New Revision: 238

Modified:
   trunk/ChangeLog
   trunk/intern.h
   trunk/object.c
   trunk/range.c
   trunk/rb/diff.rb
   trunk/version.h
Log:
	* base ruby : ruby 1.9.0 (2005-08-15)



Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2005-08-15 18:55:24 UTC (rev 237)
+++ trunk/ChangeLog	2005-08-15 19:27:09 UTC (rev 238)
@@ -4,6 +4,11 @@
 #  from Mon, 03 May 2004 01:24:19 +0900
 #
 
+2005-08-16(Tue) 04:26:08 +0900  Koichi Sasada  <ko1 atdot.net>
+
+	* base ruby : ruby 1.9.0 (2005-08-15)
+
+
 2005-08-16(Tue) 03:54:17 +0900  Koichi Sasada  <ko1 atdot.net>
 
 	* common.mk, Makefile.in : move some rules to common.mk

Modified: trunk/intern.h
===================================================================
--- trunk/intern.h	2005-08-15 18:55:24 UTC (rev 237)
+++ trunk/intern.h	2005-08-15 19:27:09 UTC (rev 238)
@@ -2,8 +2,8 @@
 
   intern.h -
 
-  $Author: matz $
-  $Date: 2005/08/12 08:13:28 $
+  $Author: nobu $
+  $Date: 2005/08/14 22:25:09 $
   created at: Thu Jun 10 14:22:17 JST 1993
 
   Copyright (C) 1993-2003 Yukihiro Matsumoto
@@ -375,6 +375,7 @@
 VALUE rb_class_inherited_p _((VALUE, VALUE));
 VALUE rb_convert_type _((VALUE,int,const char*,const char*));
 VALUE rb_check_convert_type _((VALUE,int,const char*,const char*));
+VALUE rb_check_to_integer _((VALUE, const char *));
 VALUE rb_to_int _((VALUE));
 VALUE rb_Integer _((VALUE));
 VALUE rb_Float _((VALUE));

Modified: trunk/object.c
===================================================================
--- trunk/object.c	2005-08-15 18:55:24 UTC (rev 237)
+++ trunk/object.c	2005-08-15 19:27:09 UTC (rev 238)
@@ -2,8 +2,8 @@
 
   object.c -
 
-  $Author: matz $
-  $Date: 2005/08/04 04:31:33 $
+  $Author: nobu $
+  $Date: 2005/08/14 22:25:09 $
   created at: Thu Jul 15 12:01:24 JST 1993
 
   Copyright (C) 1993-2003 Yukihiro Matsumoto
@@ -2082,7 +2082,7 @@
 static VALUE
 rb_to_integer(val, method)
     VALUE val;
-    char *method;
+    const char *method;
 {
     VALUE v = convert_type(val, "Integer", method, Qtrue);
     if (!rb_obj_is_kind_of(v, rb_cInteger)) {
@@ -2096,7 +2096,7 @@
 VALUE
 rb_check_to_integer(val, method)
     VALUE val;
-    char *method;
+    const char *method;
 {
     VALUE v = convert_type(val, "Integer", method, Qfalse);
     if (!rb_obj_is_kind_of(v, rb_cInteger)) {

Modified: trunk/range.c
===================================================================
--- trunk/range.c	2005-08-15 18:55:24 UTC (rev 237)
+++ trunk/range.c	2005-08-15 19:27:09 UTC (rev 238)
@@ -2,8 +2,8 @@
 
   range.c -
 
-  $Author: matz $
-  $Date: 2005/08/04 11:29:51 $
+  $Author: nobu $
+  $Date: 2005/08/14 15:39:22 $
   created at: Thu Aug 19 17:46:47 JST 1993
 
   Copyright (C) 1993-2003 Yukihiro Matsumoto
@@ -29,11 +29,7 @@
 range_check(args)
     VALUE *args;
 {
-    VALUE v;
-
-    v = rb_funcall(args[0], id_cmp, 1, args[1]);
-    if (NIL_P(v)) range_failed();
-    return Qnil;
+    return rb_funcall(args[0], id_cmp, 1, args[1]);
 }
 
 static void
@@ -47,7 +43,10 @@
     args[1] = end;
     
     if (!FIXNUM_P(beg) || !FIXNUM_P(end)) {
-	rb_rescue(range_check, (VALUE)args, range_failed, 0);
+	VALUE v;
+
+	v = rb_rescue(range_check, (VALUE)args, range_failed, 0);
+	if (NIL_P(v)) range_failed();
     }
 
     SET_EXCL(range, exclude_end);

Modified: trunk/rb/diff.rb
===================================================================
--- trunk/rb/diff.rb	2005-08-15 18:55:24 UTC (rev 237)
+++ trunk/rb/diff.rb	2005-08-15 19:27:09 UTC (rev 238)
@@ -1,11 +1,29 @@
-rubydir = ARGV.shift
+rubydir = ARGV.shift or raise "specify Ruby HEAD directory"
 
+if rubydir == 'clean'
+  system('rm -f p.* *.rej *.orig')
+  exit
+end
+
+if ARGV.size > 0
+  dirs = ARGV
+else
+  dirs = Dir.glob('*.[chy]')
+end
+
 IGNORE = ['eval.c', 'version.c', 'inits.c']
 
-Dir.glob('*.[ch]'){|f|
+dirs.each{|f|
   rubyfile = File.join(rubydir, f)
   if FileTest.exist?(rubyfile) && !IGNORE.include?(f)
-    system("diff -bu #{f} #{rubyfile}")
+    diff = `diff -b -U 8 #{f} #{rubyfile}`
+    if diff.size > 0
+      p f
+      open("p.#{f}", 'w'){|f|
+        f.write diff
+      }
+      puts diff
+    end
   end
 }
 

Modified: trunk/version.h
===================================================================
--- trunk/version.h	2005-08-15 18:55:24 UTC (rev 237)
+++ trunk/version.h	2005-08-15 19:27:09 UTC (rev 238)
@@ -1,14 +1,14 @@
 #define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2005-08-13"
+#define RUBY_RELEASE_DATE "2005-08-15"
 #define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20050813
+#define RUBY_RELEASE_CODE 20050815
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 0
 #define RUBY_RELEASE_YEAR 2005
 #define RUBY_RELEASE_MONTH 8
-#define RUBY_RELEASE_DAY 13
+#define RUBY_RELEASE_DAY 15
 
 RUBY_EXTERN const char ruby_version[];
 RUBY_EXTERN const char ruby_release_date[];


--
ML: yarv-diff quickml.atdot.net
Info: http://www.atdot.net/~ko1/quickml