From d5c420a88880caf1e364af7339b66932411b5234 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 7 May 2019 02:28:26 -0400 Subject: Add 'scm_c_make_char' and use it where appropriate. This reverts the change to SCM_MAKE_CHAR made in the previous commit 63818453ad226cd3c2d1fd8ade12e3d7c1d43c05, which used an arithmetic trick to avoid evaluating its argument more than once. Here, we restore the previous implementation of SCM_MAKE_CHAR, which evaluates its argument twice. Instead, we introduce a new inlinable function 'scm_c_make_char' and replace uses of SCM_MAKE_CHAR with calls to 'scm_c_make_char' where appropriate. * libguile/chars.h (scm_c_make_char): New inline function. * libguile/inline.c: Include chars.h. * libguile/srfi-13.c (REF_IN_CHARSET, scm_string_any, scm_string_every) (scm_string_trim, scm_string_trim_right, scm_string_trim_both) (scm_string_index, scm_string_index_right, scm_string_skip) (scm_string_skip_right, scm_string_count, string_titlecase_x) (string_reverse_x, scm_string_fold, scm_string_fold_right) (scm_string_for_each, scm_string_filter, scm_string_delete): Use 'scm_c_make_char' instead of 'SCM_MAKE_CHAR' in cases where the argument calls a function. * libguile/chars.c (scm_char_upcase, scm_char_downcase, scm_char_titlecase), libguile/ports.c (scm_port_decode_char), libguile/print.c (scm_simple_format), libguile/read.c (scm_read_character), libguile/strings.c (scm_string_ref, scm_c_string_ref), --- libguile/inline.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libguile/inline.c') diff --git a/libguile/inline.c b/libguile/inline.c index 6ab14c2dd..900b3253e 100644 --- a/libguile/inline.c +++ b/libguile/inline.c @@ -1,4 +1,4 @@ -/* Copyright 2001,2006,2008,2011-2013,2018 +/* Copyright 2001,2006,2008,2011-2013,2018-2019 Free Software Foundation, Inc. This file is part of Guile. @@ -25,6 +25,7 @@ #define SCM_INLINE_C_IMPLEMENTING_INLINES 1 #include "array-handle.h" +#include "chars.h" #include "gc.h" #include "pairs.h" #include "ports.h" -- cgit v1.2.1