diff options
author | Marius Vollmer <mvo@zagadka.de> | 2004-01-06 18:08:31 +0000 |
---|---|---|
committer | Marius Vollmer <mvo@zagadka.de> | 2004-01-06 18:08:31 +0000 |
commit | a52dbe0177291dc914cbfff2cb2a7652d3b9713f (patch) | |
tree | c591e52f6ed8dc7a51bc123584cf1d1a23841be6 /libguile | |
parent | a520e4f0d0268236bea18a890b5320f358d5f487 (diff) | |
download | guile-a52dbe0177291dc914cbfff2cb2a7652d3b9713f.tar.gz |
(scm_make_initial_fluids, scm_copy_fluids, scm_swap_fluids,
scm_swap_fluids_reverse): Renamed to scm_i_... since they are
internal. Changed all uses.
Diffstat (limited to 'libguile')
-rw-r--r-- | libguile/fluids.c | 14 | ||||
-rw-r--r-- | libguile/fluids.h | 8 | ||||
-rw-r--r-- | libguile/init.c | 2 | ||||
-rw-r--r-- | libguile/root.c | 2 |
4 files changed, 13 insertions, 13 deletions
diff --git a/libguile/fluids.c b/libguile/fluids.c index 826883e4e..32a5ffd37 100644 --- a/libguile/fluids.c +++ b/libguile/fluids.c @@ -35,7 +35,7 @@ static volatile long n_fluids; scm_t_bits scm_tc16_fluid; SCM -scm_make_initial_fluids () +scm_i_make_initial_fluids () { return scm_c_make_vector (INITIAL_FLUIDS, SCM_BOOL_F); } @@ -65,7 +65,7 @@ grow_fluids (scm_root_state *root_state, int new_length) } void -scm_copy_fluids (scm_root_state *root_state) +scm_i_copy_fluids (scm_root_state *root_state) { grow_fluids (root_state, SCM_VECTOR_LENGTH (root_state->fluids)); } @@ -153,7 +153,7 @@ SCM_DEFINE (scm_fluid_set_x, "fluid-set!", 2, 0, 0, #undef FUNC_NAME void -scm_swap_fluids (SCM fluids, SCM vals) +scm_i_swap_fluids (SCM fluids, SCM vals) { while (!SCM_NULL_OR_NIL_P (fluids)) { @@ -170,13 +170,13 @@ scm_swap_fluids (SCM fluids, SCM vals) same fluid appears multiple times in the fluids list. */ void -scm_swap_fluids_reverse (SCM fluids, SCM vals) +scm_i_swap_fluids_reverse (SCM fluids, SCM vals) { if (!SCM_NULL_OR_NIL_P (fluids)) { SCM fl, old_val; - scm_swap_fluids_reverse (SCM_CDR (fluids), SCM_CDR (vals)); + scm_i_swap_fluids_reverse (SCM_CDR (fluids), SCM_CDR (vals)); fl = SCM_CAR (fluids); old_val = scm_fluid_ref (fl); scm_fluid_set_x (fl, SCM_CAR (vals)); @@ -215,11 +215,11 @@ scm_c_with_fluids (SCM fluids, SCM values, SCM (*cproc) (), void *cdata) if (flen != vlen) scm_out_of_range (s_scm_with_fluids, values); - scm_swap_fluids (fluids, values); + scm_i_swap_fluids (fluids, values); scm_dynwinds = scm_acons (fluids, values, scm_dynwinds); ans = cproc (cdata); scm_dynwinds = SCM_CDR (scm_dynwinds); - scm_swap_fluids_reverse (fluids, values); + scm_i_swap_fluids_reverse (fluids, values); return ans; } #undef FUNC_NAME diff --git a/libguile/fluids.h b/libguile/fluids.h index 4cf26ecdd..07dce8523 100644 --- a/libguile/fluids.h +++ b/libguile/fluids.h @@ -76,10 +76,10 @@ SCM_API SCM scm_c_with_fluid (SCM fluid, SCM val, SCM (*cproc)(void *), void *cdata); SCM_API SCM scm_with_fluids (SCM fluids, SCM vals, SCM thunk); -SCM_API SCM scm_make_initial_fluids (void); -SCM_API void scm_copy_fluids (scm_root_state *); -SCM_API void scm_swap_fluids (SCM fluids, SCM vals); -SCM_API void scm_swap_fluids_reverse (SCM fluids, SCM vals); +SCM_API SCM scm_i_make_initial_fluids (void); +SCM_API void scm_i_copy_fluids (scm_root_state *); +SCM_API void scm_i_swap_fluids (SCM fluids, SCM vals); +SCM_API void scm_i_swap_fluids_reverse (SCM fluids, SCM vals); SCM_API void scm_init_fluids (void); diff --git a/libguile/init.c b/libguile/init.c index b3bf57504..3e96942d1 100644 --- a/libguile/init.c +++ b/libguile/init.c @@ -152,7 +152,7 @@ start_stack (void *base) scm_exitval = SCM_BOOL_F; /* vestigial */ - scm_root->fluids = scm_make_initial_fluids (); + scm_root->fluids = scm_i_make_initial_fluids (); /* Create an object to hold the root continuation. */ diff --git a/libguile/root.c b/libguile/root.c index c98b29176..dc80f7469 100644 --- a/libguile/root.c +++ b/libguile/root.c @@ -112,7 +112,7 @@ scm_make_root (SCM parent) if (SCM_ROOTP (parent)) /* Must be done here so that fluids are GC protected */ - scm_copy_fluids (root_state); + scm_i_copy_fluids (root_state); return root; } |