summaryrefslogtreecommitdiff
path: root/eval.c
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-07 19:16:10 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-07 19:16:10 +0000
commitc223c92afdfeb8049b97e687533767c8177b4811 (patch)
tree3909901d4f3c49f07e4837fd372b9dc2dc680f67 /eval.c
parent6b3661a5d7adc9a27cb9600210f1a0d06ce9cdf1 (diff)
merge revision(s) 13957:
* eval.c (rb_alias): do not call hook functions until initialization finishes. [ruby-talk:279538] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@16949 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval.c')
-rw-r--r--eval.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/eval.c b/eval.c
index 132d2809cb..080aaf40d6 100644
--- a/eval.c
+++ b/eval.c
@@ -2168,6 +2168,9 @@ rb_alias(klass, name, def)
st_insert(RCLASS(klass)->m_tbl, name,
(st_data_t)NEW_METHOD(NEW_FBODY(body, def, origin),
NOEX_WITH_SAFE(orig->nd_noex)));
+
+ if (!ruby_running) return;
+
if (singleton) {
rb_funcall(singleton, singleton_added, 1, ID2SYM(name));
}
tool/fake.rbnobu 2014-07-06fake.rb.in: override File::ALT_SEPARATORnobu 2012-11-22Drop executable bits of files that are not executable.knu 2012-08-09fake.rb.in: remove duplicationsnobu 2011-02-11* template/fake.rb.in (CROSS_COMPILING): get rid of NameError.nobu 2011-01-23* template/fake.rb.in (ruby): suppress warnings.nobu 2010-07-21* template/fake.rb.in: get rid of embeding an absolute path.nobu 2010-04-24* template/fake.rb.in: no need for hook if extmk.nobu 2010-04-06* template/fake.rb.in: not define $extout to make target in cwd.nobu 2010-04-06* template/fake.rb.in: hooks for extconf.rb.nobu 2009-08-20* configure.in (RUBY_PROGRAM_VERSION, RUBY_RELEASE_DATE): extractsnobu 2009-02-19* template/fake.rb.in: extracted from Makefile.in.nobu