mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 03:40:34 +02:00
* libguile/root.h * libguile/root.c (scm_sys_protects): It used to be that for some reason we'd define a special array of "protected" values. This was a little silly, always, but with the BDW GC it's completely unnecessary. Also many of these variables were unused, and none of them were good API. So remove this array, and either eliminate, make static, or make internal the various values. * libguile/snarf.h: No need to generate calls to scm_permanent_object. * guile-readline/readline.c (scm_init_readline): No need to call scm_permanent_object. * libguile/array-map.c (ramap, rafe): Remove the dubious nullvect optimizations. * libguile/async.c (scm_init_async): No need to init scm_asyncs, it is no more. * libguile/eval.c (scm_init_eval): No need to init scm_listofnull, it is no more. * libguile/gc.c: Make scm_protects a static var. (scm_storage_prehistory): Change the sanity check to use the address of protects. (scm_init_gc_protect_object): No need to clear the scm_sys_protects, as it is no more. * libguile/keywords.c: Make the keyword obarray a static var. * libguile/numbers.c: Make flo0 a static var. * libguile/objprop.c: Make object_whash a static var. * libguile/properties.c: Make properties_whash a static var. * libguile/srcprop.h: * libguile/srcprop.c: Make scm_source_whash a global with internal linkage. * libguile/strings.h: * libguile/strings.c: Make scm_nullstr a global with internal linkage. * libguile/vectors.c (scm_init_vectors): No need to init scm_nullvect, it's unused.
108 lines
2.8 KiB
C
108 lines
2.8 KiB
C
/* Copyright (C) 1995,1996, 2000, 2001, 2003, 2006, 2008, 2009 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 3 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
|
||
*/
|
||
|
||
|
||
|
||
#ifdef HAVE_CONFIG_H
|
||
# include <config.h>
|
||
#endif
|
||
|
||
#include "libguile/_scm.h"
|
||
#include "libguile/async.h"
|
||
#include "libguile/hashtab.h"
|
||
#include "libguile/alist.h"
|
||
#include "libguile/root.h"
|
||
#include "libguile/weaks.h"
|
||
|
||
#include "libguile/objprop.h"
|
||
|
||
|
||
/* {Object Properties}
|
||
*/
|
||
|
||
static SCM object_whash;
|
||
|
||
SCM_DEFINE (scm_object_properties, "object-properties", 1, 0, 0,
|
||
(SCM obj),
|
||
"Return @var{obj}'s property list.")
|
||
#define FUNC_NAME s_scm_object_properties
|
||
{
|
||
return scm_hashq_ref (object_whash, obj, SCM_EOL);
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
|
||
SCM_DEFINE (scm_set_object_properties_x, "set-object-properties!", 2, 0, 0,
|
||
(SCM obj, SCM alist),
|
||
"Set @var{obj}'s property list to @var{alist}.")
|
||
#define FUNC_NAME s_scm_set_object_properties_x
|
||
{
|
||
SCM handle = scm_hashq_create_handle_x (object_whash, obj, alist);
|
||
SCM_SETCDR (handle, alist);
|
||
return alist;
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
SCM_DEFINE (scm_object_property, "object-property", 2, 0, 0,
|
||
(SCM obj, SCM key),
|
||
"Return the property of @var{obj} with name @var{key}.")
|
||
#define FUNC_NAME s_scm_object_property
|
||
{
|
||
SCM assoc;
|
||
assoc = scm_assq (key, scm_object_properties (obj));
|
||
return (SCM_NIMP (assoc) ? SCM_CDR (assoc) : SCM_BOOL_F);
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
SCM_DEFINE (scm_set_object_property_x, "set-object-property!", 3, 0, 0,
|
||
(SCM obj, SCM key, SCM value),
|
||
"In @var{obj}'s property list, set the property named @var{key}\n"
|
||
"to @var{value}.")
|
||
#define FUNC_NAME s_scm_set_object_property_x
|
||
{
|
||
SCM h;
|
||
SCM assoc;
|
||
h = scm_hashq_create_handle_x (object_whash, obj, SCM_EOL);
|
||
SCM_CRITICAL_SECTION_START;
|
||
assoc = scm_assq (key, SCM_CDR (h));
|
||
if (SCM_NIMP (assoc))
|
||
SCM_SETCDR (assoc, value);
|
||
else
|
||
{
|
||
assoc = scm_acons (key, value, SCM_CDR (h));
|
||
SCM_SETCDR (h, assoc);
|
||
}
|
||
SCM_CRITICAL_SECTION_END;
|
||
return value;
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
|
||
void
|
||
scm_init_objprop ()
|
||
{
|
||
object_whash = scm_make_weak_key_hash_table (SCM_UNDEFINED);
|
||
#include "libguile/objprop.x"
|
||
}
|
||
|
||
|
||
/*
|
||
Local Variables:
|
||
c-file-style: "gnu"
|
||
End:
|
||
*/
|