From 4a655e50a3890da9cd453a0b2c83dacc2cfcc34e Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Fri, 7 Jan 2011 09:08:58 -0800 Subject: use scm_from_latin1_symboln for string literals and load-symbol * libguile/bytevectors.c: * libguile/eval.c: * libguile/goops.c: * libguile/i18n.c: * libguile/load.c: * libguile/memoize.c: * libguile/modules.c: * libguile/ports.c: * libguile/print.c: * libguile/procs.c: * libguile/programs.c: * libguile/read.c: * libguile/script.c: * libguile/srfi-14.c: * libguile/stacks.c: * libguile/strings.c: * libguile/throw.c: * libguile/vm.c: Use scm_from_latin1_symboln to make symbols from string literals, because they aren't in the user's locale -- they are in ASCII, and we can optimize this case. * libguile/vm-i-loader.c: Also use scm_from_latin1_symboln when loading narrow symbols. --- libguile/eval.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libguile/eval.c') diff --git a/libguile/eval.c b/libguile/eval.c index 414645fca..785217825 100644 --- a/libguile/eval.c +++ b/libguile/eval.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010 +/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011 * Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or @@ -162,14 +162,14 @@ static void error_used_before_defined (void) static void error_invalid_keyword (SCM proc) { - scm_error_scm (scm_from_locale_symbol ("keyword-argument-error"), proc, + scm_error_scm (scm_from_latin1_symbol ("keyword-argument-error"), proc, scm_from_locale_string ("Invalid keyword"), SCM_EOL, SCM_BOOL_F); } static void error_unrecognized_keyword (SCM proc) { - scm_error_scm (scm_from_locale_symbol ("keyword-argument-error"), proc, + scm_error_scm (scm_from_latin1_symbol ("keyword-argument-error"), proc, scm_from_locale_string ("Unrecognized keyword"), SCM_EOL, SCM_BOOL_F); } @@ -1012,9 +1012,9 @@ boot_closure_print (SCM closure, SCM port, scm_print_state *pstate) scm_uintprint ((scm_t_bits)SCM2PTR (closure), 16, port); scm_putc (' ', port); args = scm_make_list (scm_from_int (BOOT_CLOSURE_NUM_REQUIRED_ARGS (closure)), - scm_from_locale_symbol ("_")); + scm_from_latin1_symbol ("_")); if (!BOOT_CLOSURE_IS_FIXED (closure) && BOOT_CLOSURE_HAS_REST_ARGS (closure)) - args = scm_cons_star (scm_from_locale_symbol ("_"), args); + args = scm_cons_star (scm_from_latin1_symbol ("_"), args); /* FIXME: optionals and rests */ scm_display (args, port); scm_putc ('>', port); -- cgit v1.2.3