mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-05 11:40:20 +02:00
* libguile/arbiters.c (scm_init_arbiters): Don't invoke `scm_set_smob_mark'. * libguile/async.c (async_gc_mark): Removed. (scm_init_async): Don't invoke `scm_set_smob_mark'. * libguile/coop-pthreads.c (thread_mark): Removed. (create_thread): Use `scm_gc_malloc' instead of `scm_malloc' when allocating `launch_data'. (mutex_mark): Removed. (scm_threads_init): Don't invoke `scm_set_smob_mark' and `scm_set_smob_free'. * libguile/debug.c (scm_init_debug): Don't invoke `scm_set_smob_mark'. * libguile/dynl.c (dynl_obj_mark): Removed. (scm_init_dynamic_linking): Don't invoke `scm_set_smob_mark'. * libguile/dynwind.c (winder_mark): Removed. (scm_init_dynwind): Don't invoke `scm_set_smob_mark'. * libguile/environments.c (environment_mark): Removed. (environment_free): Removed. (observer_mark): Removed. (core_environments_mark): Removed. (core_environments_finalize): Removed. (leaf_environment_mark): Removed. (leaf_environment_free): Removed. (leaf_environment_funcs): Don't refer to the above funcs. (eval_environment_mark): Removed. (eval_environment_free): Removed. (eval_environment_funcs): Don't refer to the above funcs. (import_environment_mark): Removed. (import_environment_free): Removed. (import_environment_funcs): Don't refer to the above funcs. (export_environment_mark): Removed. (export_environment_free): Removed. (export_environment_funcs): Don't refer to the above funcs. (scm_environments_prehistory): Don't invoke `scm_set_smob_mark' and `scm_set_smob_free'. * libguile/environments.h (scm_environment_funcs)[mark]: Removed. [free]: Removed. * libguile/eval.c (promise_mark): Removed. (promise_free): Removed. (scm_init_eval): Don't invoke `scm_set_smob_mark' and `scm_set_smob_free'. * libguile/fluids.c (fluid_free): Removed. (scm_fluids_prehistory): Don't invoke `scm_set_smob_mark' and `scm_set_smob_free'. * libguile/futures.c (future_mark): Removed. (scm_init_futures): Don't invoke `scm_set_smob_mark'. * libguile/hashtab.c (hashtable_free): Removed. (scm_hashtab_prehistory): Don't invoke `scm_set_smob_mark' and `scm_set_smob_free'. * libguile/hooks.c (scm_init_hooks): Don't invoke `scm_set_smob_mark'. * libguile/keywords.c (scm_init_keywords): Don't invoke `scm_set_smob_mark'. * libguile/macros.c (scm_init_macros): Don't invoke `scm_set_smob_mark'. * libguile/modules.c (scm_init_modules): Don't invoke `scm_set_smob_mark'. * libguile/print.c (scm_init_print): Don't invoke `scm_set_smob_mark'. * libguile/random.c (scm_i_copy_rstate): Use `scm_gc_malloc' instead of `scm_malloc'. (scm_c_make_rstate): Likewise. (rstate_free): Removed. (scm_init_random): Don't invoke `scm_set_smob_free'. * libguile/srcprop.c (srcprops_mark): Removed. (scm_init_srcprop): Don't invoke `srcprops_mark'. * libguile/srfi-14.c (charset_free): Removed. (scm_init_srfi_14): Don't invoke `scm_set_smob_free'. * libguile/srfi-4.c (uvec_mark): Removed. (uvec_free): Removed. (scm_init_srfi_4): Don't invoke `scm_set_smob_free' and `scm_set_smob_mark'. * libguile/threads.c (thread_mark): Removed. (fat_mutex_mark): Removed. (fat_cond_mark): Removed. (scm_init_threads): Dont invoke `scm_set_smob_mark' and `scm_set_smob_free'. * libguile/unif.c (bitvector_free): Removed. (array_mark): Removed. (array_free): Removed. (scm_init_unif): Don't invoke `scm_set_smob_free' and `scm_set_smob_mark'. git-archimport-id: lcourtes@laas.fr--2005-libre/guile-core--boehm-gc--1.9--patch-28
125 lines
3.2 KiB
C
125 lines
3.2 KiB
C
/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2003, 2004, 2006 Free Software Foundation, Inc.
|
||
*
|
||
* This library is free software; you can redistribute it and/or
|
||
* modify it under the terms of the GNU Lesser General Public
|
||
* License as published by the Free Software Foundation; either
|
||
* version 2.1 of the License, or (at your option) any later version.
|
||
*
|
||
* This library is distributed in the hope that it will be useful,
|
||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||
* Lesser General Public License for more details.
|
||
*
|
||
* You should have received a copy of the GNU Lesser General Public
|
||
* License along with this library; if not, write to the Free Software
|
||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||
*/
|
||
|
||
|
||
|
||
|
||
#include <string.h>
|
||
|
||
#include "libguile/_scm.h"
|
||
#include "libguile/async.h"
|
||
#include "libguile/ports.h"
|
||
#include "libguile/root.h"
|
||
#include "libguile/smob.h"
|
||
#include "libguile/hashtab.h"
|
||
|
||
#include "libguile/validate.h"
|
||
#include "libguile/keywords.h"
|
||
#include "libguile/strings.h"
|
||
|
||
|
||
|
||
scm_t_bits scm_tc16_keyword;
|
||
|
||
#define KEYWORDP(X) (SCM_SMOB_PREDICATE (scm_tc16_keyword, (X)))
|
||
#define KEYWORDSYM(X) (SCM_SMOB_OBJECT (X))
|
||
|
||
static int
|
||
keyword_print (SCM exp, SCM port, scm_print_state *pstate SCM_UNUSED)
|
||
{
|
||
scm_puts ("#:", port);
|
||
scm_display (KEYWORDSYM (exp), port);
|
||
return 1;
|
||
}
|
||
|
||
SCM_DEFINE (scm_keyword_p, "keyword?", 1, 0, 0,
|
||
(SCM obj),
|
||
"Return @code{#t} if the argument @var{obj} is a keyword, else\n"
|
||
"@code{#f}.")
|
||
#define FUNC_NAME s_scm_keyword_p
|
||
{
|
||
return scm_from_bool (KEYWORDP (obj));
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
SCM_DEFINE (scm_symbol_to_keyword, "symbol->keyword", 1, 0, 0,
|
||
(SCM symbol),
|
||
"Return the keyword with the same name as @var{symbol}.")
|
||
#define FUNC_NAME s_scm_symbol_to_keyword
|
||
{
|
||
SCM keyword;
|
||
|
||
SCM_ASSERT_TYPE (scm_is_symbol (symbol), symbol, 0, NULL, "symbol");
|
||
|
||
SCM_CRITICAL_SECTION_START;
|
||
/* njrev: NEWSMOB and hashq_set_x can raise errors */
|
||
keyword = scm_hashq_ref (scm_keyword_obarray, symbol, SCM_BOOL_F);
|
||
if (scm_is_false (keyword))
|
||
{
|
||
SCM_NEWSMOB (keyword, scm_tc16_keyword, SCM_UNPACK (symbol));
|
||
scm_hashq_set_x (scm_keyword_obarray, symbol, keyword);
|
||
}
|
||
SCM_CRITICAL_SECTION_END;
|
||
return keyword;
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
SCM_DEFINE (scm_keyword_to_symbol, "keyword->symbol", 1, 0, 0,
|
||
(SCM keyword),
|
||
"Return the symbol with the same name as @var{keyword}.")
|
||
#define FUNC_NAME s_scm_keyword_to_symbol
|
||
{
|
||
scm_assert_smob_type (scm_tc16_keyword, keyword);
|
||
return KEYWORDSYM (keyword);
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
int
|
||
scm_is_keyword (SCM val)
|
||
{
|
||
return KEYWORDP (val);
|
||
}
|
||
|
||
SCM
|
||
scm_from_locale_keyword (const char *str)
|
||
{
|
||
return scm_symbol_to_keyword (scm_from_locale_symbol (str));
|
||
}
|
||
|
||
SCM
|
||
scm_from_locale_keywordn (const char *str, size_t len)
|
||
{
|
||
return scm_symbol_to_keyword (scm_from_locale_symboln (str, len));
|
||
}
|
||
|
||
/* njrev: critical sections reviewed so far up to here */
|
||
void
|
||
scm_init_keywords ()
|
||
{
|
||
scm_tc16_keyword = scm_make_smob_type ("keyword", 0);
|
||
scm_set_smob_print (scm_tc16_keyword, keyword_print);
|
||
|
||
scm_keyword_obarray = scm_c_make_hash_table (0);
|
||
#include "libguile/keywords.x"
|
||
}
|
||
|
||
|
||
/*
|
||
Local Variables:
|
||
c-file-style: "gnu"
|
||
End:
|
||
*/
|