kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* class.c (rb_include_module): should check whole ancestors to

Browse source 
avoid duplicate module inclusion.

* string.c (trnext): should check backslash before updating "now"
  position.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@1737 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2001-09-06 07:47:47 +00:00
parent 20af3b3066
commit f29380628f
5 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,8 @@
Thu Sep 6 03:15:24 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
* class.c (rb_include_module): should check whole ancestors to
avoid duplicate module inclusion.
Thu Sep 6 14:27:54 2001 Akinori MUSHA <knu@iDaemons.org> Thu Sep 6 14:27:54 2001 Akinori MUSHA <knu@iDaemons.org>
* ext/digest/digest.c (rb_digest_base_s_hexdigest): remove a debug * ext/digest/digest.c (rb_digest_base_s_hexdigest): remove a debug
@ -22,6 +27,11 @@ Wed Sep 5 17:41:11 2001 WATANABE Hirofumi <eban@ruby-lang.org>
* lib/jcode.rb (_regexp_quote): fix quote handling. * lib/jcode.rb (_regexp_quote): fix quote handling.
Wed Sep 5 20:02:27 2001 Shin'ya Adzumi <adzumi@denpa.org>
* string.c (trnext): should check backslash before updating "now"
position.
Mon Sep 3 20:26:08 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp> Mon Sep 3 20:26:08 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
* intern.h (rb_find_file_ext): changed from rb_find_file_noext(). * intern.h (rb_find_file_ext): changed from rb_find_file_noext().

9
class.c
View file

@ -278,17 +278,14 @@ rb_include_module(klass, module)
for (p = RCLASS(klass)->super; p; p = RCLASS(p)->super) { for (p = RCLASS(klass)->super; p; p = RCLASS(p)->super) {
if (BUILTIN_TYPE(p) == T_ICLASS && if (BUILTIN_TYPE(p) == T_ICLASS &&
RCLASS(p)->m_tbl == RCLASS(module)->m_tbl) { RCLASS(p)->m_tbl == RCLASS(module)->m_tbl) {
if (RCLASS(module)->super) { goto skip;
rb_include_module(p, RCLASS(module)->super);
}
if (changed) rb_clear_cache();
return;
} }
} }
RCLASS(klass)->super = include_class_new(module, RCLASS(klass)->super); RCLASS(klass)->super = include_class_new(module, RCLASS(klass)->super);
klass = RCLASS(klass)->super; klass = RCLASS(klass)->super;
module = RCLASS(module)->super;
changed = 1; changed = 1;
skip:
module = RCLASS(module)->super;
} }
if (changed) rb_clear_cache(); if (changed) rb_clear_cache();
} }

2
eval.c
View file

@ -5311,7 +5311,7 @@ rb_feature_p(feature, wait)
return Qtrue; return Qtrue;
} }
static const char *const loadable_ext[] = { static const char * const loadable_ext[] = {
".rb", DLEXT, ".rb", DLEXT,
#ifdef DLEXT2 #ifdef DLEXT2
DLEXT2, DLEXT2,

4
string.c
View file

@ -1793,11 +1793,11 @@ trnext(t)
for (;;) { for (;;) {
if (!t->gen) { if (!t->gen) {
if (t->p == t->pend) return -1; if (t->p == t->pend) return -1;
t->now = *(USTR)t->p++;
if (t->p < t->pend - 1 && *t->p == '\\') { if (t->p < t->pend - 1 && *t->p == '\\') {
t->p++; t->p++;
} }
else if (t->p < t->pend - 1 && *t->p == '-') { t->now = *(USTR)t->p++;
if (t->p < t->pend - 1 && *t->p == '-') {
t->p++; t->p++;
if (t->p < t->pend) { if (t->p < t->pend) {
if (t->now > *(USTR)t->p) { if (t->now > *(USTR)t->p) {

4
version.h
View file

@ -1,4 +1,4 @@
#define RUBY_VERSION "1.6.5" #define RUBY_VERSION "1.6.5"
#define RUBY_RELEASE_DATE "2001-09-05" #define RUBY_RELEASE_DATE "2001-09-06"
#define RUBY_VERSION_CODE 165 #define RUBY_VERSION_CODE 165
#define RUBY_RELEASE_CODE 20010905 #define RUBY_RELEASE_CODE 20010906