aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--eval.c11
2 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index fbec45f698..7bc5689428 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Nov 7 17:18:11 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (method_missing): update old argument adjustment.
+
Tue Nov 7 16:41:21 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (when_check): need to splat for NODE_ARGSCAT as well.
diff --git a/eval.c b/eval.c
index cbf0e19606..8b25fa1550 100644
--- a/eval.c
+++ b/eval.c
@@ -5515,14 +5515,17 @@ method_missing(VALUE obj, ID id, int argc, const VALUE *argv,
}
if (argc < 0) {
VALUE tmp;
+ int n;
- argc = -argc-1;
+ argc = -argc;
+ n = argc / 256 - 1;
+ argc %= 256;
tmp = svalue_to_avalue(argv[argc]);
- nargv = ALLOCA_N(VALUE, argc + RARRAY_LEN(tmp) + 1);
+ nargv = ALLOCA_N(VALUE, argc + RARRAY_LEN(tmp) + n + 1);
MEMCPY(nargv+1, argv, VALUE, argc);
MEMCPY(nargv+1+argc, RARRAY_PTR(tmp), VALUE, RARRAY_LEN(tmp));
- argc += RARRAY_LEN(tmp);
-
+ MEMCPY(nargv+1+argc+RARRAY_LEN(tmp), argv+argc+1, VALUE, n);
+ argc += RARRAY_LEN(tmp)+n;
}
else {
nargv = ALLOCA_N(VALUE, argc+1);