1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

031031

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2003-10-30 16:33:32 +00:00
parent 2c2b30dde4
commit 394738639e
5 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
Fri Oct 31 01:02:24 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
* compar.c (cmp_equal): protect exceptions from <=> comparison
again. returns nil if any exception or error happened during
comparison.
* eval.c (search_required): should update *featurep when DLEXT2 is
defined. (ruby-bugs-ja PR#581)
Thu Oct 30 23:41:04 2003 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp> Thu Oct 30 23:41:04 2003 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* lib/drb/drb.rb: add DRbArray * lib/drb/drb.rb: add DRbArray

2
bcc32/Makefile.sub
View File

@ -514,7 +514,7 @@ $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: rbconfig.rb
.y.c: .y.c:
$(YACC) $(YFLAGS) $(<:\=/) $(YACC) $(YFLAGS) $(<:\=/)
sed -e "s!^extern char \*getenv();!/* & */!;s/^\(#.*\)y\.tab/\1parse/" y.tab.c > $(@F) sed -e "s!^ *extern char \*getenv();!/* & */!;s/^\(#.*\)y\.tab/\1parse/" y.tab.c > $(@F)
@del y.tab.c @del y.tab.c
parse.c: parse.y parse.c: parse.y

26
compar.c
View File

@ -52,19 +52,33 @@ rb_cmperr(x, y)
#define cmperr() (rb_cmperr(x, y), Qnil) #define cmperr() (rb_cmperr(x, y), Qnil)
static VALUE
cmp_eq(a)
VALUE *a;
{
VALUE c = rb_funcall(a[0], cmp, 1, a[1]);
if (NIL_P(c)) return Qnil;
if (rb_cmpint(c, a[0], a[1]) == 0) return Qtrue;
return Qfalse;
}
static VALUE
cmp_failed()
{
return Qnil;
}
static VALUE static VALUE
cmp_equal(x, y) cmp_equal(x, y)
VALUE x, y; VALUE x, y;
{ {
int c; VALUE a[2];
if (x == y) return Qtrue; if (x == y) return Qtrue;
c = rb_funcall(x, cmp, 1, y); a[0] = x; a[1] = y;
if (NIL_P(c)) return Qnil; return rb_rescue(cmp_eq, (VALUE)a, cmp_failed, 0);
if (c == INT2FIX(0)) return Qtrue;
if (rb_cmpint(c, x, y) == 0) return Qtrue;
return Qfalse;
} }
static VALUE static VALUE

1
eval.c
View File

@ -6011,6 +6011,7 @@ search_required(fname, featurep, path)
*featurep = tmp; *featurep = tmp;
#ifdef DLEXT2 #ifdef DLEXT2
if (rb_find_file_ext(&tmp, loadable_ext+1)) { if (rb_find_file_ext(&tmp, loadable_ext+1)) {
*featurep = tmp;
*path = rb_find_file(tmp); *path = rb_find_file(tmp);
return 's'; return 's';
} }

6
version.h
View File

@ -1,11 +1,11 @@
#define RUBY_VERSION "1.8.1" #define RUBY_VERSION "1.8.1"
#define RUBY_RELEASE_DATE "2003-10-30" #define RUBY_RELEASE_DATE "2003-10-31"
#define RUBY_VERSION_CODE 181 #define RUBY_VERSION_CODE 181
#define RUBY_RELEASE_CODE 20031030 #define RUBY_RELEASE_CODE 20031031
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1
#define RUBY_RELEASE_YEAR 2003 #define RUBY_RELEASE_YEAR 2003
#define RUBY_RELEASE_MONTH 10 #define RUBY_RELEASE_MONTH 10
#define RUBY_RELEASE_DAY 30 #define RUBY_RELEASE_DAY 31