19991214

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_4@587 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

11 files changed, 28 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 5ec0405ea9..b27c62d568 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Sat Dec 11 03:34:38 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* gc.c (mark_hashentry): key should be VALUE, not ID.
+
+	* io.c (argf_eof): should check next_p too.
+
+Thu Dec  9 18:09:13 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
+
+	* error.c (exc_set_backtrace): forgot to declare a VALUE argument.
+
 Tue Dec  7 18:25:26 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
 	* stable version 1.4.3 released.
diff --git a/README b/README
index 2953cc98da..5ed6015be0 100644
--- a/README
+++ b/README
@@ -135,7 +135,7 @@ You can redistribute it and/or modify it under either the terms of the GPL
 
 The URL of the Ruby home-page is:
 
-   http://www.netlab.co.jp/ruby/
+   http://www.ruby-lang.org/
 
 * The Author
 
diff --git a/README.jp b/README.jp
index 6c320c89f4..515f658609 100644
--- a/README.jp
+++ b/README.jp
@@ -44,7 +44,7 @@ Rubyはテキスト処理関係の能力などに優れ，Perlと同じくらい強力
 
 RubyのホームページのURLは
 
-   http://www.netlab.co.jp/ruby/jp/
+   http://www.ruby-lang.org/
 
 です．
 
diff --git a/error.c b/error.c
index feb3778d54..ec66ba1b9a 100644
--- a/error.c
+++ b/error.c
@@ -386,6 +386,7 @@ check_backtrace(bt)
 static VALUE
 exc_set_backtrace(exc, bt)
     VALUE exc;
+    VALUE bt;
 {
     return rb_iv_set(exc, "bt", check_backtrace(bt));
 }
diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
index c933f9db8b..9f1bae1d40 100644
--- a/ext/tk/lib/tk.rb
+++ b/ext/tk/lib/tk.rb
@@ -2150,7 +2150,7 @@ class TkListbox<TkTextWin
   def nearest(y)
     tk_send('nearest', y).to_i
   end
-  def size(y)
+  def size
     tk_send('size').to_i
   end
   def selection_anchor(index)
@@ -2159,8 +2159,8 @@ class TkListbox<TkTextWin
   def selection_clear(first, last=None)
     tk_send 'selection', 'clear', first, last
   end
-  def selection_includes
-    bool(tk_send('selection', 'includes'))
+  def selection_includes(index)
+    bool(tk_send('selection', 'includes', index))
   end
   def selection_set(first, last=None)
     tk_send 'selection', 'set', first, last
diff --git a/gc.c b/gc.c
index 6122724175..465014c1d3 100644
--- a/gc.c
+++ b/gc.c
@@ -370,7 +370,7 @@ rb_mark_tbl(tbl)
 
 static int
 mark_hashentry(key, value)
-    ID key;
+    VALUE key;
     VALUE value;
 {
     rb_gc_mark(key);
diff --git a/io.c b/io.c
index 9d098b331a..60909af7a3 100644
--- a/io.c
+++ b/io.c
@@ -3070,6 +3070,8 @@ argf_eof()
 {
     if (init_p == 0 && !next_argv())
 	return Qtrue;
+    if (next_p == -1)
+	return Qtrue;
     if (TYPE(current_file) != T_FILE) {
 	return argf_forward();
     }
diff --git a/ruby.h b/ruby.h
index 765fd75ee8..1f56f7a67b 100644
--- a/ruby.h
+++ b/ruby.h
@@ -89,7 +89,7 @@ extern "C" {
 ---->> ruby requires sizeof(void*) == sizeof(long) to be compiled. <<----
 #endif
 typedef unsigned long VALUE;
-typedef unsigned int ID;
+typedef unsigned long ID;
 
 #ifdef __STDC__
 # include <limits.h>
@@ -117,6 +117,8 @@ typedef unsigned int ID;
 #define INT2FIX(i) (VALUE)(((long)(i))<<1 | FIXNUM_FLAG)
 VALUE rb_int2inum _((long));
 #define INT2NUM(v) rb_int2inum(v)
+VALUE rb_uint2inum _((unsigned long));
+#define UINT2NUM(v) rb_uint2inum(v)
 
 #define FIX2LONG(x) RSHIFT((long)x,1)
 #define FIX2ULONG(x) (((unsigned long)(x))>>1)
diff --git a/sample/mine.rb b/sample/mine.rb
index 35660e0760..8fc27e0c6d 100644
--- a/sample/mine.rb
+++ b/sample/mine.rb
@@ -81,7 +81,7 @@ class Board
     elsif y < 0 then 0
     elsif y >= @hi then 0
     else
-      @data[x*@wi+x]
+      @data[y*@wi+x]
     end
   end
   def count(x,y)
diff --git a/struct.c b/struct.c
index e22c539fac..56710b676f 100644
--- a/struct.c
+++ b/struct.c
@@ -224,6 +224,7 @@ static VALUE
 rb_struct_s_def(argc, argv, klass)
     int argc;
     VALUE *argv;
+    VALUE klass;
 {
     VALUE name, rest;
     long i;
diff --git a/version.h b/version.h
index f650ac72c6..2d1af6448f 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
-#define RUBY_VERSION "1.4.3"
-#define RUBY_RELEASE_DATE "1999-12-08"
-#define RUBY_VERSION_CODE 143
-#define RUBY_RELEASE_CODE 19991208
+#define RUBY_VERSION "1.4.4"
+#define RUBY_RELEASE_DATE "1999-12-14"
+#define RUBY_VERSION_CODE 144
+#define RUBY_RELEASE_CODE 19991214