diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | eval.c | 4 | ||||
| -rw-r--r-- | test/ruby/test_refinement.rb | 27 |
3 files changed, 38 insertions, 0 deletions
@@ -1,3 +1,10 @@ +Sat Dec 8 13:17:55 2012 Shugo Maeda <shugo@ruby-lang.org> + + * eval.c (top_using): raise a RuntimeError if using is called in a + module definition or a method definition. + + * test/ruby/test_refinement.rb: related test. + Sat Dec 8 15:01:35 2012 Eric Hodel <drbrain@segment7.net> * lib/rubygems/commands/cleanup_command.rb: Skip default gems when @@ -1393,7 +1393,11 @@ static VALUE top_using(VALUE self, VALUE module) { NODE *cref = rb_vm_cref(); + rb_control_frame_t *prev_cfp = previous_frame(GET_THREAD()); + if (cref->nd_next || (prev_cfp && prev_cfp->me)) { + rb_raise(rb_eRuntimeError, "using is permitted only at toplevel"); + } Check_Type(module, T_MODULE); rb_using_module(cref, module); rb_clear_cache(); diff --git a/test/ruby/test_refinement.rb b/test/ruby/test_refinement.rb index 0d934d737e..016aa15f19 100644 --- a/test/ruby/test_refinement.rb +++ b/test/ruby/test_refinement.rb @@ -624,6 +624,33 @@ class TestRefinement < Test::Unit::TestCase end end + def test_using_in_module + assert_raise(RuntimeError) do + eval(<<-EOF, TOPLEVEL_BINDING) + $main = self + module M + end + module M2 + $main.send(:using, M) + end + EOF + end + end + + def test_using_in_method + assert_raise(RuntimeError) do + eval(<<-EOF, TOPLEVEL_BINDING) + $main = self + module M + end + def call_using_in_method + $main.send(:using, M) + end + call_using_in_method + EOF + end + end + private def eval_using(mod, s) |