From fc4dc85900a25dc1bfa33b1b2ea290e96ecd1890 Mon Sep 17 00:00:00 2001 From: matz Date: Wed, 12 Dec 2001 09:07:35 +0000 Subject: * parse.y (str_extend): make up pushback call. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@1906 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ parse.y | 1 + variable.c | 8 +++++--- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 51f007fe08..2506760e9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Mon Dec 10 17:40:02 2001 K.Kosako + + * parse.y (str_extend): make up pushback call. + Mon Dec 10 01:06:56 2001 Yukihiro Matsumoto * parse.y (gettable): should freeze __FILE__ string. diff --git a/parse.y b/parse.y index da7cc60065..539ac9ab51 100644 --- a/parse.y +++ b/parse.y @@ -3772,6 +3772,7 @@ str_extend(list, term, paren) goto refetch; } if (!is_identchar(c)) { + pushback(c); invalid_interporate: { VALUE s = rb_str_new2("#"); diff --git a/variable.c b/variable.c index 4798b961cc..e2d9451182 100644 --- a/variable.c +++ b/variable.c @@ -142,13 +142,15 @@ classname(klass) VALUE path = Qnil; ID classpath = rb_intern("__classpath__"); + if (TYPE(klass) == T_ICLASS) { + klass = RBASIC(klass)->klass; + } while (TYPE(klass) == T_ICLASS || FL_TEST(klass, FL_SINGLETON)) { klass = (VALUE)RCLASS(klass)->super; } if (!klass) klass = rb_cObject; - if (!ROBJECT(klass)->iv_tbl) - ROBJECT(klass)->iv_tbl = st_init_numtable(); - else if (!st_lookup(ROBJECT(klass)->iv_tbl, classpath, &path)) { + if (ROBJECT(klass)->iv_tbl && + !st_lookup(ROBJECT(klass)->iv_tbl, classpath, &path)) { ID classid = rb_intern("__classid__"); if (st_lookup(ROBJECT(klass)->iv_tbl, classid, &path)) { -- cgit v1.2.3