From 1f85d6255d6929edbcfc087e4e07c2fde39c3632 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky
Date: Thu, 1 May 2014 01:35:38 +0300
Subject: py: Add tentative scheme for error messages configuration.

---
 py/objfun.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'py/objfun.c')

diff --git a/py/objfun.c b/py/objfun.c
index 1c3208aca..94f6d26d7 100644
--- a/py/objfun.c
+++ b/py/objfun.c
@@ -152,8 +152,18 @@ STATIC void dump_args(const mp_obj_t *a, int sz) {
 #endif
 
 STATIC NORETURN void fun_pos_args_mismatch(mp_obj_fun_bc_t *f, uint expected, uint given) {
+#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+    // Generic message, to be reused for other argument issues
+    nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError,
+        "argument num/types mismatch"));
+#elif MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_NORMAL
     nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError,
         "function takes %d positional arguments but %d were given", expected, given));
+#elif MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_DETAILED
+    nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError,
+        "%s() takes %d positional arguments but %d were given",
+        mp_obj_fun_get_name(f), expected, given));
+#endif
 }
 
 // If it's possible to call a function without allocating new argument array,
-- 
cgit v1.2.3