From c81c2ad3a59fdfb54260af2c159fac56de4daf3a Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Wed, 23 Nov 2011 12:21:22 +0100 Subject: [PATCH] use new scm_make_fluid_with_default * libguile/load.c (scm_init_load): * libguile/ports.c (scm_init_ports): * libguile/read.c (scm_init_read): Use scm_make_fluid_with_default. --- libguile/load.c | 3 +-- libguile/ports.c | 10 +++++----- libguile/read.c | 3 +-- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/libguile/load.c b/libguile/load.c index 21008cbef..66e3cc40a 100644 --- a/libguile/load.c +++ b/libguile/load.c @@ -1043,8 +1043,7 @@ scm_init_load () scm_loc_fresh_auto_compile = SCM_VARIABLE_LOC (scm_c_define ("%fresh-auto-compile", SCM_BOOL_F)); - the_reader = scm_make_fluid (); - scm_fluid_set_x (the_reader, SCM_BOOL_F); + the_reader = scm_make_fluid_with_default (SCM_BOOL_F); scm_c_define("current-reader", the_reader); scm_c_define ("load-compiled", diff --git a/libguile/ports.c b/libguile/ports.c index 6bb96103c..6467228c0 100644 --- a/libguile/ports.c +++ b/libguile/ports.c @@ -2549,13 +2549,13 @@ scm_init_ports () #include "libguile/ports.x" /* Use Latin-1 as the default port encoding. */ - SCM_VARIABLE_SET (default_port_encoding_var, scm_make_fluid ()); - scm_fluid_set_x (SCM_VARIABLE_REF (default_port_encoding_var), SCM_BOOL_F); + SCM_VARIABLE_SET (default_port_encoding_var, + scm_make_fluid_with_default (SCM_BOOL_F)); scm_port_encoding_init = 1; - SCM_VARIABLE_SET (scm_conversion_strategy, scm_make_fluid ()); - scm_fluid_set_x (SCM_VARIABLE_REF (scm_conversion_strategy), - scm_from_int ((int) SCM_FAILED_CONVERSION_QUESTION_MARK)); + SCM_VARIABLE_SET (scm_conversion_strategy, + scm_make_fluid_with_default + (scm_from_int ((int) SCM_FAILED_CONVERSION_QUESTION_MARK))); scm_conversion_strategy_init = 1; } diff --git a/libguile/read.c b/libguile/read.c index a9404b177..616672418 100644 --- a/libguile/read.c +++ b/libguile/read.c @@ -1759,8 +1759,7 @@ scm_init_read () { SCM read_hash_procs; - read_hash_procs = scm_make_fluid (); - scm_fluid_set_x (read_hash_procs, SCM_EOL); + read_hash_procs = scm_make_fluid_with_default (SCM_EOL); scm_i_read_hash_procedures = SCM_VARIABLE_LOC (scm_c_define ("%read-hash-procedures", read_hash_procs)); -- 2.20.1