Merge pull request #1358 from krekoten/core_module_define_method_19

Check for args number in methods created by Module#define_method
rubinius · Oct 25, 2011 · 80e8429 · 80e8429
2 parents db32bc2 + edf6f1d
commit 80e8429
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/spec/tags/19/ruby/core/module/define_method_tags.txt b/spec/tags/19/ruby/core/module/define_method_tags.txt
diff --git a/vm/builtin/block_as_method.cpp b/vm/builtin/block_as_method.cpp
@@ -10,6 +10,8 @@
 
 #include "object_utils.hpp"
 
+#include "configuration.hpp"
+
 namespace rubinius {
   BlockAsMethod* BlockAsMethod::create(STATE, Object* self, BlockEnvironment* be) {
     BlockAsMethod* pe = state->new_object<BlockAsMethod>(as<Class>(self));
@@ -35,7 +37,7 @@ namespace rubinius {
      *  -------------|---------------|-------|-------
      *  { || }       |  0            |  nil  |  ==
      *  {  }         |  0            |  -2   |  none
-     *  { |a| }      |  1            |  nil  |  none
+     *  { |a| }      |  1            |  nil  |  none (1.8), == (>= 1.9)
      *  { |*a| }     |  0            |  0    |  none
      *  { |a, b| }   |  2            |  nil  |  ==
      *  { |a, *b| }  |  1            |  1    |  >=
@@ -45,8 +47,9 @@ namespace rubinius {
      * no arguments are passed). This is handled by the bytecode prologue
      * of the block.
      */
-    if((splat->nil_p() && (required == 0 || required > 1)
-            && (size_t)required != args.total())
+    if((splat->nil_p()
+          && ((LANGUAGE_18_ENABLED(state) && (required == 0 || required > 1)) || !LANGUAGE_18_ENABLED(state))
+          && (size_t)required != args.total())
         || (!splat->nil_p() && required > 0 && (size_t)required > args.total())) {
       Exception* exc =
         Exception::make_argument_error(state, required, args.total(), args.name());