diff options
author | Mark H Weaver <mhw@netris.org> | 2013-07-16 01:33:27 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2013-07-16 01:33:27 -0400 |
commit | 28d5d2537c0321643c3b511a2195cd491204e7f2 (patch) | |
tree | 16b46ded431848672722595b87024fb7ffc48142 /libguile/eval.c | |
parent | 178a40928ab5221f6ce57c5af1067abe30a342b3 (diff) | |
parent | 95ed221785f5b1203e998823455f682c1830498b (diff) | |
download | guile-28d5d2537c0321643c3b511a2195cd491204e7f2.tar.gz |
Merge remote-tracking branch 'origin/stable-2.0'
Conflicts:
libguile/keywords.c
libguile/vm.c
Diffstat (limited to 'libguile/eval.c')
-rw-r--r-- | libguile/eval.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libguile/eval.c b/libguile/eval.c index b245026f0..f5e1524c7 100644 --- a/libguile/eval.c +++ b/libguile/eval.c @@ -162,18 +162,18 @@ static void error_used_before_defined (void) "Variable used before given a value", SCM_EOL, SCM_BOOL_F); } -static void error_invalid_keyword (SCM proc) +static void error_invalid_keyword (SCM proc, SCM obj) { scm_error_scm (scm_from_latin1_symbol ("keyword-argument-error"), proc, scm_from_locale_string ("Invalid keyword"), SCM_EOL, - SCM_BOOL_F); + scm_list_1 (obj)); } -static void error_unrecognized_keyword (SCM proc) +static void error_unrecognized_keyword (SCM proc, SCM kw) { scm_error_scm (scm_from_latin1_symbol ("keyword-argument-error"), proc, scm_from_locale_string ("Unrecognized keyword"), SCM_EOL, - SCM_BOOL_F); + scm_list_1 (kw)); } @@ -818,10 +818,10 @@ prepare_boot_closure_env_for_apply (SCM proc, SCM args, break; } if (scm_is_null (walk) && scm_is_false (aok)) - error_unrecognized_keyword (proc); + error_unrecognized_keyword (proc, k); } if (scm_is_pair (args) && scm_is_false (rest)) - error_invalid_keyword (proc); + error_invalid_keyword (proc, CAR (args)); /* Now fill in unbound values, evaluating init expressions in their appropriate environment. */ |