diff options
author | Andy Wingo <wingo@pobox.com> | 2011-04-29 11:07:25 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2011-04-29 11:07:25 +0200 |
commit | 501cf7d6074eab3330555c1d57284fbd34e286d8 (patch) | |
tree | 9618a98649f3b22e57e341604db0424acc276ab1 | |
parent | ad378da9757ebc503a9d6237afbc74dacea1b348 (diff) | |
download | guile-501cf7d6074eab3330555c1d57284fbd34e286d8.tar.gz |
latin1 strings in vm error messages
* libguile/vm-engine.c: Use latin1 strings here for the string
literals.
-rw-r--r-- | libguile/vm-engine.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/libguile/vm-engine.c b/libguile/vm-engine.c index 4b0ca3ec3..ab9ffc98c 100644 --- a/libguile/vm-engine.c +++ b/libguile/vm-engine.c @@ -134,21 +134,21 @@ VM_NAME (SCM vm, SCM program, SCM *argv, int nargs) /* FIXME: need to sync regs before allocating anything, in each case. */ vm_error_bad_instruction: - err_msg = scm_from_locale_string ("VM: Bad instruction: ~s"); + err_msg = scm_from_latin1_string ("VM: Bad instruction: ~s"); finish_args = scm_list_1 (scm_from_uchar (ip[-1])); goto vm_error; vm_error_unbound: /* FINISH_ARGS should be the name of the unbound variable. */ SYNC_ALL (); - err_msg = scm_from_locale_string ("Unbound variable: ~s"); + err_msg = scm_from_latin1_string ("Unbound variable: ~s"); scm_error_scm (scm_misc_error_key, program, err_msg, scm_list_1 (finish_args), SCM_BOOL_F); goto vm_error; vm_error_unbound_fluid: SYNC_ALL (); - err_msg = scm_from_locale_string ("Unbound fluid: ~s"); + err_msg = scm_from_latin1_string ("Unbound fluid: ~s"); scm_error_scm (scm_misc_error_key, program, err_msg, scm_list_1 (finish_args), SCM_BOOL_F); goto vm_error; @@ -167,26 +167,26 @@ VM_NAME (SCM vm, SCM program, SCM *argv, int nargs) vm_error_kwargs_length_not_even: SYNC_ALL (); - err_msg = scm_from_locale_string ("Odd length of keyword argument list"); + err_msg = scm_from_latin1_string ("Odd length of keyword argument list"); scm_error_scm (sym_keyword_argument_error, program, err_msg, SCM_EOL, SCM_BOOL_F); vm_error_kwargs_invalid_keyword: /* FIXME say which one it was */ SYNC_ALL (); - err_msg = scm_from_locale_string ("Invalid keyword"); + err_msg = scm_from_latin1_string ("Invalid keyword"); scm_error_scm (sym_keyword_argument_error, program, err_msg, SCM_EOL, SCM_BOOL_F); vm_error_kwargs_unrecognized_keyword: /* FIXME say which one it was */ SYNC_ALL (); - err_msg = scm_from_locale_string ("Unrecognized keyword"); + err_msg = scm_from_latin1_string ("Unrecognized keyword"); scm_error_scm (sym_keyword_argument_error, program, err_msg, SCM_EOL, SCM_BOOL_F); vm_error_too_many_args: - err_msg = scm_from_locale_string ("VM: Too many arguments"); + err_msg = scm_from_latin1_string ("VM: Too many arguments"); finish_args = scm_list_1 (scm_from_int (nargs)); goto vm_error; @@ -204,7 +204,7 @@ VM_NAME (SCM vm, SCM program, SCM *argv, int nargs) goto vm_error; vm_error_stack_overflow: - err_msg = scm_from_locale_string ("VM: Stack overflow"); + err_msg = scm_from_latin1_string ("VM: Stack overflow"); finish_args = SCM_EOL; if (stack_limit < vp->stack_base + vp->stack_size) /* There are VM_STACK_RESERVE_SIZE bytes left. Make them available so @@ -213,12 +213,12 @@ VM_NAME (SCM vm, SCM program, SCM *argv, int nargs) goto vm_error; vm_error_stack_underflow: - err_msg = scm_from_locale_string ("VM: Stack underflow"); + err_msg = scm_from_latin1_string ("VM: Stack underflow"); finish_args = SCM_EOL; goto vm_error; vm_error_improper_list: - err_msg = scm_from_locale_string ("Expected a proper list, but got object with tail ~s"); + err_msg = scm_from_latin1_string ("Expected a proper list, but got object with tail ~s"); goto vm_error; vm_error_not_a_pair: @@ -246,41 +246,41 @@ VM_NAME (SCM vm, SCM program, SCM *argv, int nargs) goto vm_error; vm_error_no_values: - err_msg = scm_from_locale_string ("Zero values returned to single-valued continuation"); + err_msg = scm_from_latin1_string ("Zero values returned to single-valued continuation"); finish_args = SCM_EOL; goto vm_error; vm_error_not_enough_values: - err_msg = scm_from_locale_string ("Too few values returned to continuation"); + err_msg = scm_from_latin1_string ("Too few values returned to continuation"); finish_args = SCM_EOL; goto vm_error; vm_error_continuation_not_rewindable: - err_msg = scm_from_locale_string ("Unrewindable partial continuation"); + err_msg = scm_from_latin1_string ("Unrewindable partial continuation"); finish_args = scm_cons (finish_args, SCM_EOL); goto vm_error; vm_error_bad_wide_string_length: - err_msg = scm_from_locale_string ("VM: Bad wide string length: ~S"); + err_msg = scm_from_latin1_string ("VM: Bad wide string length: ~S"); goto vm_error; #ifdef VM_CHECK_IP vm_error_invalid_address: - err_msg = scm_from_locale_string ("VM: Invalid program address"); + err_msg = scm_from_latin1_string ("VM: Invalid program address"); finish_args = SCM_EOL; goto vm_error; #endif #if VM_CHECK_OBJECT vm_error_object: - err_msg = scm_from_locale_string ("VM: Invalid object table access"); + err_msg = scm_from_latin1_string ("VM: Invalid object table access"); finish_args = SCM_EOL; goto vm_error; #endif #if VM_CHECK_FREE_VARIABLES vm_error_free_variable: - err_msg = scm_from_locale_string ("VM: Invalid free variable access"); + err_msg = scm_from_latin1_string ("VM: Invalid free variable access"); finish_args = SCM_EOL; goto vm_error; #endif |