diff --git a/src/vm/jvm/runtime/org/perl6/nqp/runtime/ArgsExpectation.java b/src/vm/jvm/runtime/org/perl6/nqp/runtime/ArgsExpectation.java index 59a320516b..e7d2266dce 100644 --- a/src/vm/jvm/runtime/org/perl6/nqp/runtime/ArgsExpectation.java +++ b/src/vm/jvm/runtime/org/perl6/nqp/runtime/ArgsExpectation.java @@ -28,7 +28,8 @@ public static void invokeByExpectation(ThreadContext tc, CodeRef cr, if (csd.argFlags.length != 0) ExceptionHandling.dieInternal(tc, "Wrong number of arguments passed; expected 0..0, but got " + - csd.numPositionals); + csd.argFlags.length + + " (" + csd.numPositionals + " of those positional)"); } cr.staticInfo.mh.invokeExact(tc, cr, csd); break; @@ -63,13 +64,15 @@ public static void invokeByExpectation(ThreadContext tc, CodeRef cr, default: ExceptionHandling.dieInternal(tc, "Wrong number of arguments passed; expected 1..1, but got " + - csd.numPositionals); + csd.argFlags.length + + " (" + csd.numPositionals + " of those positional)"); } } else { ExceptionHandling.dieInternal(tc, "Wrong number of arguments passed; expected 1..1, but got " + - csd.numPositionals); + csd.argFlags.length + + " (" + csd.numPositionals + " of those positional)"); } } break; @@ -105,7 +108,8 @@ public static void invokeByExpectation(ThreadContext tc, CodeRef cr, default: ExceptionHandling.dieInternal(tc, "Wrong number of arguments passed; expected 2..2, but got " + - csd.numPositionals); + csd.argFlags.length + + " (" + csd.numPositionals + " of those positional)"); } switch (csd.argFlags[1]) { case CallSiteDescriptor.ARG_OBJ: @@ -123,14 +127,16 @@ public static void invokeByExpectation(ThreadContext tc, CodeRef cr, default: ExceptionHandling.dieInternal(tc, "Wrong number of arguments passed; expected 2..2, but got " + - csd.numPositionals); + csd.argFlags.length + + " (" + csd.numPositionals + " of those positional)"); } cr.staticInfo.mh.invokeExact(tc, cr, csd, arg1, arg2); } else { ExceptionHandling.dieInternal(tc, "Wrong number of arguments passed; expected 2..2, but got " + - csd.numPositionals); + csd.argFlags.length + + " (" + csd.numPositionals + " of those positional)"); } } break; diff --git a/src/vm/jvm/runtime/org/perl6/nqp/runtime/CallSiteDescriptor.java b/src/vm/jvm/runtime/org/perl6/nqp/runtime/CallSiteDescriptor.java index 2177957927..41b403068c 100644 --- a/src/vm/jvm/runtime/org/perl6/nqp/runtime/CallSiteDescriptor.java +++ b/src/vm/jvm/runtime/org/perl6/nqp/runtime/CallSiteDescriptor.java @@ -87,7 +87,7 @@ public CallSiteDescriptor(byte[] flags, String[] names) { hasFlattening = true; break; default: - new RuntimeException("Unhandld argument flag: " + af); + new RuntimeException("Unhandled argument flag: " + af); } } }