diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-09-06 07:47:47 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-09-06 07:47:47 +0000 |
| commit | f29380628f569131bd7e917b6b9eb05734ffb81e (patch) | |
| tree | 89cbb92857f1c9d3f35eadd421cbdc1bba146610 | |
| parent | 20af3b306654bddff93a14216eae58c72f969b4e (diff) | |
* class.c (rb_include_module): should check whole ancestors to
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
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | class.c | 9 | ||||
| -rw-r--r-- | eval.c | 2 | ||||
| -rw-r--r-- | string.c | 4 | ||||
| -rw-r--r-- | version.h | 4 |
5 files changed, 18 insertions, 11 deletions
@@ -1,3 +1,8 @@ +Thu Sep 6 03:15:24 2001 Yukihiro Matsumoto <[email protected]> + + * class.c (rb_include_module): should check whole ancestors to + avoid duplicate module inclusion. + Thu Sep 6 14:27:54 2001 Akinori MUSHA <[email protected]> * 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 <[email protected]> * lib/jcode.rb (_regexp_quote): fix quote handling. +Wed Sep 5 20:02:27 2001 Shin'ya Adzumi <[email protected]> + + * string.c (trnext): should check backslash before updating "now" + position. + Mon Sep 3 20:26:08 2001 Nobuyoshi Nakada <[email protected]> * intern.h (rb_find_file_ext): changed from rb_find_file_noext(). @@ -278,17 +278,14 @@ rb_include_module(klass, module) for (p = RCLASS(klass)->super; p; p = RCLASS(p)->super) { if (BUILTIN_TYPE(p) == T_ICLASS && RCLASS(p)->m_tbl == RCLASS(module)->m_tbl) { - if (RCLASS(module)->super) { - rb_include_module(p, RCLASS(module)->super); - } - if (changed) rb_clear_cache(); - return; + goto skip; } } RCLASS(klass)->super = include_class_new(module, RCLASS(klass)->super); klass = RCLASS(klass)->super; - module = RCLASS(module)->super; changed = 1; + skip: + module = RCLASS(module)->super; } if (changed) rb_clear_cache(); } @@ -5311,7 +5311,7 @@ rb_feature_p(feature, wait) return Qtrue; } -static const char *const loadable_ext[] = { +static const char * const loadable_ext[] = { ".rb", DLEXT, #ifdef DLEXT2 DLEXT2, @@ -1793,11 +1793,11 @@ trnext(t) for (;;) { if (!t->gen) { if (t->p == t->pend) return -1; - t->now = *(USTR)t->p++; if (t->p < t->pend - 1 && *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++; if (t->p < t->pend) { if (t->now > *(USTR)t->p) { @@ -1,4 +1,4 @@ #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_RELEASE_CODE 20010905 +#define RUBY_RELEASE_CODE 20010906 |