2018-06-20 19:17:06 +02:00
|
|
|
|
/* Copyright 1995-1998,2000-2001,2003-2004,2006,2009,2011,2013,2015,2018
|
2018-06-20 20:01:49 +02:00
|
|
|
|
Free Software Foundation, Inc.
|
|
|
|
|
|
|
|
|
|
|
|
This file is part of Guile.
|
|
|
|
|
|
|
|
|
|
|
|
Guile 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.
|
|
|
|
|
|
|
|
|
|
|
|
Guile 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 Guile. If not, see
|
|
|
|
|
|
<https://www.gnu.org/licenses/>. */
|
1999-12-12 02:36:16 +00:00
|
|
|
|
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2008-09-13 15:35:27 +02:00
|
|
|
|
#ifdef HAVE_CONFIG_H
|
2003-03-26 00:00:52 +00:00
|
|
|
|
# include <config.h>
|
|
|
|
|
|
#endif
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2018-06-20 18:31:24 +02:00
|
|
|
|
#include <string.h>
|
2011-10-25 17:32:50 +02:00
|
|
|
|
#include <unistr.h>
|
|
|
|
|
|
|
2018-06-20 18:31:24 +02:00
|
|
|
|
#include "alist.h"
|
2018-06-20 17:19:31 +02:00
|
|
|
|
#include "boolean.h"
|
|
|
|
|
|
#include "chars.h"
|
|
|
|
|
|
#include "eval.h"
|
2018-06-20 18:31:24 +02:00
|
|
|
|
#include "fluids.h"
|
|
|
|
|
|
#include "gsubr.h"
|
2018-06-20 17:19:31 +02:00
|
|
|
|
#include "hash.h"
|
|
|
|
|
|
#include "list.h"
|
2018-06-20 18:31:24 +02:00
|
|
|
|
#include "modules.h"
|
|
|
|
|
|
#include "numbers.h"
|
|
|
|
|
|
#include "pairs.h"
|
|
|
|
|
|
#include "private-options.h"
|
|
|
|
|
|
#include "read.h"
|
2018-06-20 17:19:31 +02:00
|
|
|
|
#include "smob.h"
|
2018-06-20 18:31:24 +02:00
|
|
|
|
#include "srfi-13.h"
|
|
|
|
|
|
#include "strings.h"
|
2018-06-20 17:19:31 +02:00
|
|
|
|
#include "strorder.h"
|
2018-06-26 11:40:22 +02:00
|
|
|
|
#include "threads.h"
|
2018-06-20 17:19:31 +02:00
|
|
|
|
#include "variable.h"
|
|
|
|
|
|
#include "vectors.h"
|
|
|
|
|
|
#include "weak-set.h"
|
|
|
|
|
|
|
|
|
|
|
|
#include "symbols.h"
|
|
|
|
|
|
|
1996-08-07 09:46:41 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
2000-12-13 11:38:30 +00:00
|
|
|
|
static SCM symbols;
|
|
|
|
|
|
|
2001-03-08 02:46:38 +00:00
|
|
|
|
#ifdef GUILE_DEBUG
|
|
|
|
|
|
SCM_DEFINE (scm_sys_symbols, "%symbols", 0, 0, 0,
|
|
|
|
|
|
(),
|
|
|
|
|
|
"Return the system symbol obarray.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_sys_symbols
|
|
|
|
|
|
{
|
|
|
|
|
|
return symbols;
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2000-12-13 11:38:30 +00:00
|
|
|
|
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
/* {Symbols}
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
* hooks.c (scm_c_hook_add): Fixed bug in append mode.
* environments.c (obarray_enter, obarray_retrieve, obarray_remove,
leaf_environment_fold, obarray_remove_all): Use hashtable
accessors.
* gc.c (scm_init_storage): Moved hook initialization to
scm_storage_prehistory.
(scm_storage_prehistory): New function.
(scm_igc): Added commentary about placement of
scm_after_sweep_c_hook.
* gc-mark.c (scm_mark_all): Use hashtable accessors.
(scm_gc_mark_dependencies): Use SCM_WVECT_WEAK_KEY_P and
SCM_WVECT_WEAK_VALUE_P.
* hashtab.c, hashtab.h (scm_hash_for_each, scm_hash_map): New
functions.
(scm_vector_to_hash_table, scm_c_make_resizing_hash_table):
Removed.
(scm_make_weak_key_hash_table, scm_make_weak_value_hash_table,
scm_make_doubly_weak_hash_table): Moved here from weaks.c.
* init.c (scm_init_guile_1): Removed call to scm_init_weaks; Added
calls to scm_storage_prehistory and scm_hashtab_prehistory.
* modules.c (module-reverse-lookup): Use hashtable accessors.
* symbols.c, symbols.h (scm_i_hash_symbol): New function.
* weaks.c, weaks.h (scm_make_weak_key_alist_vector,
scm_make_weak_value_alist_vector,
scm_make_doubly_weak_alist_vector): New functions.
* weaks.c (scm_init_weaks_builtins): New function.
* weaks.h (SCM_WVECTF_WEAK_KEY, SCM_WVECTF_WEAK_VALUE,
SCM_WVECTF_NOSCAN, SCM_WVECT_WEAK_KEY_P, SCM_WVECT_WEAK_VALUE_P,
SCM_WVECT_NOSCAN_P): New macros.
* weaks.c (scm_scan_weak_vectors): Use SCM_WVECT_WEAK_KEY_P
and SCM_WVECT_WEAK_VALUE_P.
* weaks.c, weaks.h (scm_i_allocate_weak_vector): Renamed from
allocate_weak_vector and exported.
* Makefile.am (ice9_sources): Added weak-vector.scm.
* weak-vector.scm: New file.
* boot-9.scm (module-clear!): Use hash-clear!.
(module-for-each): Use hash-for-each.
(module-map): Use hash-map.
2003-02-19 15:04:51 +00:00
|
|
|
|
unsigned long
|
|
|
|
|
|
scm_i_hash_symbol (SCM obj, unsigned long n, void *closure)
|
|
|
|
|
|
{
|
* strings.h, strings.c: (scm_i_string_chars, scm_i_string_length,
scm_i_string_writable_chars, scm_i_string_stop_writing): New, to
replace SCM_I_STRING_CHARS and SCM_I_STRING_LENGTH. Updated all
uses.
(scm_i_make_string, scm_c_make_string): New, to replace
scm_allocate_string. Updated all uses.
(SCM_STRINGP, SCM_STRING_CHARS, SCM_STRING_UCHARS,
SCM_STRING_LENGTH): Deprecated.
(scm_allocate_string, scm_take_str, scm_take0str, scm_mem2string,
scm_str2string, scm_makfrom0str, scm_makfrom0str_opt):
Discouraged. Replaced all uses with scm_from_locale_string or
similar, as appropriate.
(scm_c_string_length, scm_c_string_ref, scm_c_string_set_x,
scm_c_substring, scm_c_substring_shared, scm_c_substring_copy,
scm_substring_shared, scm_substring_copy): New.
* symbols.c, symbols.h (SCM_SYMBOLP, SCM_SYMBOL_FUNC,
SCM_SET_SYMBOL_FUNC, SCM_SYMBOL_PROPS, SCM_SET_SYMBOL_PROPS,
SCM_SYMBOL_HASH, SCM_SYMBOL_INTERNED_P, scm_mem2symbol,
scm_str2symbol, scm_mem2uninterned_symbol): Discouraged.
(SCM_SYMBOL_LENGTH, SCM_SYMBOL_CHARS, scm_c_symbol2str):
Deprecated.
(SCM_MAKE_SYMBOL_TAG, SCM_SET_SYMBOL_LENGTH, SCM_SET_SYMBOL_CHARS,
SCM_PROP_SLOTS, SCM_SET_PROP_SLOTS): Removed.
(scm_is_symbol, scm_from_locale_symbol, scm_from_locale_symboln):
New, to replace scm_str2symbol and scm_mem2symbol, respectively.
Updated all uses.
(scm_gensym): Generate only the number suffix in the buffer, just
string-append the prefix.
2004-08-19 16:49:42 +00:00
|
|
|
|
return scm_i_symbol_hash (obj) % n;
|
* hooks.c (scm_c_hook_add): Fixed bug in append mode.
* environments.c (obarray_enter, obarray_retrieve, obarray_remove,
leaf_environment_fold, obarray_remove_all): Use hashtable
accessors.
* gc.c (scm_init_storage): Moved hook initialization to
scm_storage_prehistory.
(scm_storage_prehistory): New function.
(scm_igc): Added commentary about placement of
scm_after_sweep_c_hook.
* gc-mark.c (scm_mark_all): Use hashtable accessors.
(scm_gc_mark_dependencies): Use SCM_WVECT_WEAK_KEY_P and
SCM_WVECT_WEAK_VALUE_P.
* hashtab.c, hashtab.h (scm_hash_for_each, scm_hash_map): New
functions.
(scm_vector_to_hash_table, scm_c_make_resizing_hash_table):
Removed.
(scm_make_weak_key_hash_table, scm_make_weak_value_hash_table,
scm_make_doubly_weak_hash_table): Moved here from weaks.c.
* init.c (scm_init_guile_1): Removed call to scm_init_weaks; Added
calls to scm_storage_prehistory and scm_hashtab_prehistory.
* modules.c (module-reverse-lookup): Use hashtable accessors.
* symbols.c, symbols.h (scm_i_hash_symbol): New function.
* weaks.c, weaks.h (scm_make_weak_key_alist_vector,
scm_make_weak_value_alist_vector,
scm_make_doubly_weak_alist_vector): New functions.
* weaks.c (scm_init_weaks_builtins): New function.
* weaks.h (SCM_WVECTF_WEAK_KEY, SCM_WVECTF_WEAK_VALUE,
SCM_WVECTF_NOSCAN, SCM_WVECT_WEAK_KEY_P, SCM_WVECT_WEAK_VALUE_P,
SCM_WVECT_NOSCAN_P): New macros.
* weaks.c (scm_scan_weak_vectors): Use SCM_WVECT_WEAK_KEY_P
and SCM_WVECT_WEAK_VALUE_P.
* weaks.c, weaks.h (scm_i_allocate_weak_vector): Renamed from
allocate_weak_vector and exported.
* Makefile.am (ice9_sources): Added weak-vector.scm.
* weak-vector.scm: New file.
* boot-9.scm (module-clear!): Use hash-clear!.
(module-for-each): Use hash-for-each.
(module-map): Use hash-map.
2003-02-19 15:04:51 +00:00
|
|
|
|
}
|
* __scm.h, alist.c, alist.h, append.c, append.h, appinit.c,
arbiters.c, arbiters.h, async.c, async.h, boolean.c, boolean.h,
chars.c, chars.h, continuations.c, continuations.h, debug.c,
debug.h, dynwind.c, dynwind.h, eq.c, eq.h, error.c, eval.c,
eval.h, extchrs.c, extchrs.h, fdsocket.c, fdsocket.h, filesys.c,
filesys.h, fports.c, fports.h, gc.c, gdb_interface.h, gdbint.c,
gdbint.h, genio.c, genio.h, gscm.c, gscm.h, gsubr.c, gsubr.h,
hash.c, hash.h, hashtab.c, hashtab.h, init.c, ioext.c, ioext.h,
kw.c, kw.h, libguile.h, mallocs.c, mallocs.h, markers.c,
markers.h, mbstrings.c, mbstrings.h, numbers.c, numbers.h,
objprop.c, objprop.h, options.c, options.h, pairs.c, pairs.h,
ports.c, ports.h, posix.c, posix.h, print.c, print.h, procprop.c,
procprop.h, procs.c, procs.h, ramap.c, ramap.h, read.c, read.h,
root.c, scmsigs.c, scmsigs.h, sequences.c, sequences.h, simpos.c,
simpos.h, smob.c, socket.c, socket.h, srcprop.c, srcprop.h,
stackchk.c, stackchk.h, stime.c, stime.h, strings.c, strings.h,
strop.c, strop.h, strorder.c, strorder.h, strports.c, strports.h,
struct.c, struct.h, symbols.c, symbols.h, tag.c, tag.h, unif.c,
unif.h, variable.c, variable.h, vectors.c, vectors.h, version.c,
version.h, vports.c, vports.h, weaks.c, weaks.h: Use SCM_P to
declare functions with prototypes. (Patch thanks to Marius
Vollmer.)
1996-10-14 01:33:50 +00:00
|
|
|
|
|
2011-01-05 20:15:11 -08:00
|
|
|
|
struct string_lookup_data
|
|
|
|
|
|
{
|
2011-01-07 08:42:15 -08:00
|
|
|
|
SCM string;
|
2011-01-05 20:15:11 -08:00
|
|
|
|
unsigned long string_hash;
|
|
|
|
|
|
};
|
|
|
|
|
|
|
2011-01-07 08:42:15 -08:00
|
|
|
|
static int
|
|
|
|
|
|
string_lookup_predicate_fn (SCM sym, void *closure)
|
2011-01-05 20:15:11 -08:00
|
|
|
|
{
|
|
|
|
|
|
struct string_lookup_data *data = closure;
|
|
|
|
|
|
|
2011-01-07 08:42:15 -08:00
|
|
|
|
if (scm_i_symbol_hash (sym) == data->string_hash
|
|
|
|
|
|
&& scm_i_symbol_length (sym) == scm_i_string_length (data->string))
|
2006-01-24 20:30:09 +00:00
|
|
|
|
{
|
2011-01-07 08:42:15 -08:00
|
|
|
|
size_t n = scm_i_symbol_length (sym);
|
|
|
|
|
|
while (n--)
|
|
|
|
|
|
if (scm_i_symbol_ref (sym, n) != scm_i_string_ref (data->string, n))
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
return 1;
|
2006-01-24 20:30:09 +00:00
|
|
|
|
}
|
2011-01-07 08:42:15 -08:00
|
|
|
|
else
|
|
|
|
|
|
return 0;
|
2011-01-05 20:15:11 -08:00
|
|
|
|
}
|
2006-06-25 22:43:47 +00:00
|
|
|
|
|
2011-01-05 20:15:11 -08:00
|
|
|
|
static SCM
|
|
|
|
|
|
lookup_interned_symbol (SCM name, unsigned long raw_hash)
|
|
|
|
|
|
{
|
|
|
|
|
|
struct string_lookup_data data;
|
|
|
|
|
|
|
2011-01-07 08:42:15 -08:00
|
|
|
|
data.string = name;
|
2011-01-05 20:15:11 -08:00
|
|
|
|
data.string_hash = raw_hash;
|
|
|
|
|
|
|
2011-10-23 20:46:48 +02:00
|
|
|
|
return scm_c_weak_set_lookup (symbols, raw_hash,
|
|
|
|
|
|
string_lookup_predicate_fn,
|
|
|
|
|
|
&data, SCM_BOOL_F);
|
2006-01-24 20:30:09 +00:00
|
|
|
|
}
|
* strings.h, strings.c: (scm_i_string_chars, scm_i_string_length,
scm_i_string_writable_chars, scm_i_string_stop_writing): New, to
replace SCM_I_STRING_CHARS and SCM_I_STRING_LENGTH. Updated all
uses.
(scm_i_make_string, scm_c_make_string): New, to replace
scm_allocate_string. Updated all uses.
(SCM_STRINGP, SCM_STRING_CHARS, SCM_STRING_UCHARS,
SCM_STRING_LENGTH): Deprecated.
(scm_allocate_string, scm_take_str, scm_take0str, scm_mem2string,
scm_str2string, scm_makfrom0str, scm_makfrom0str_opt):
Discouraged. Replaced all uses with scm_from_locale_string or
similar, as appropriate.
(scm_c_string_length, scm_c_string_ref, scm_c_string_set_x,
scm_c_substring, scm_c_substring_shared, scm_c_substring_copy,
scm_substring_shared, scm_substring_copy): New.
* symbols.c, symbols.h (SCM_SYMBOLP, SCM_SYMBOL_FUNC,
SCM_SET_SYMBOL_FUNC, SCM_SYMBOL_PROPS, SCM_SET_SYMBOL_PROPS,
SCM_SYMBOL_HASH, SCM_SYMBOL_INTERNED_P, scm_mem2symbol,
scm_str2symbol, scm_mem2uninterned_symbol): Discouraged.
(SCM_SYMBOL_LENGTH, SCM_SYMBOL_CHARS, scm_c_symbol2str):
Deprecated.
(SCM_MAKE_SYMBOL_TAG, SCM_SET_SYMBOL_LENGTH, SCM_SET_SYMBOL_CHARS,
SCM_PROP_SLOTS, SCM_SET_PROP_SLOTS): Removed.
(scm_is_symbol, scm_from_locale_symbol, scm_from_locale_symboln):
New, to replace scm_str2symbol and scm_mem2symbol, respectively.
Updated all uses.
(scm_gensym): Generate only the number suffix in the buffer, just
string-append the prefix.
2004-08-19 16:49:42 +00:00
|
|
|
|
|
2011-01-07 09:03:12 -08:00
|
|
|
|
struct latin1_lookup_data
|
|
|
|
|
|
{
|
|
|
|
|
|
const char *str;
|
|
|
|
|
|
size_t len;
|
|
|
|
|
|
unsigned long string_hash;
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
|
latin1_lookup_predicate_fn (SCM sym, void *closure)
|
|
|
|
|
|
{
|
|
|
|
|
|
struct latin1_lookup_data *data = closure;
|
|
|
|
|
|
|
|
|
|
|
|
return scm_i_symbol_hash (sym) == data->string_hash
|
|
|
|
|
|
&& scm_i_is_narrow_symbol (sym)
|
|
|
|
|
|
&& scm_i_symbol_length (sym) == data->len
|
|
|
|
|
|
&& strncmp (scm_i_symbol_chars (sym), data->str, data->len) == 0;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
|
|
|
|
|
lookup_interned_latin1_symbol (const char *str, size_t len,
|
|
|
|
|
|
unsigned long raw_hash)
|
|
|
|
|
|
{
|
|
|
|
|
|
struct latin1_lookup_data data;
|
|
|
|
|
|
|
|
|
|
|
|
data.str = str;
|
|
|
|
|
|
data.len = len;
|
|
|
|
|
|
data.string_hash = raw_hash;
|
|
|
|
|
|
|
2011-10-23 20:46:48 +02:00
|
|
|
|
return scm_c_weak_set_lookup (symbols, raw_hash,
|
|
|
|
|
|
latin1_lookup_predicate_fn,
|
|
|
|
|
|
&data, SCM_BOOL_F);
|
2011-01-07 09:03:12 -08:00
|
|
|
|
}
|
|
|
|
|
|
|
2011-10-25 17:32:50 +02:00
|
|
|
|
struct utf8_lookup_data
|
|
|
|
|
|
{
|
|
|
|
|
|
const char *str;
|
|
|
|
|
|
size_t len;
|
|
|
|
|
|
unsigned long string_hash;
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
2018-06-21 08:39:03 +02:00
|
|
|
|
utf8_string_equals_wide_string (const uint8_t *narrow, size_t nlen,
|
2011-10-25 17:32:50 +02:00
|
|
|
|
const scm_t_wchar *wide, size_t wlen)
|
|
|
|
|
|
{
|
|
|
|
|
|
size_t byte_idx = 0, char_idx = 0;
|
|
|
|
|
|
|
|
|
|
|
|
while (byte_idx < nlen && char_idx < wlen)
|
|
|
|
|
|
{
|
|
|
|
|
|
ucs4_t c;
|
|
|
|
|
|
int nbytes;
|
|
|
|
|
|
|
2015-08-13 01:31:36 -04:00
|
|
|
|
nbytes = u8_mbtoucr (&c, narrow + byte_idx, nlen - byte_idx);
|
2011-10-25 17:32:50 +02:00
|
|
|
|
if (nbytes == 0)
|
|
|
|
|
|
break;
|
2015-08-13 01:31:36 -04:00
|
|
|
|
else if (nbytes < 0)
|
2011-10-25 17:32:50 +02:00
|
|
|
|
/* Bad UTF-8. */
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
else if (c != wide[char_idx])
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
|
|
byte_idx += nbytes;
|
|
|
|
|
|
char_idx++;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return byte_idx == nlen && char_idx == wlen;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
|
utf8_lookup_predicate_fn (SCM sym, void *closure)
|
|
|
|
|
|
{
|
|
|
|
|
|
struct utf8_lookup_data *data = closure;
|
|
|
|
|
|
|
|
|
|
|
|
if (scm_i_symbol_hash (sym) != data->string_hash)
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
|
|
if (scm_i_is_narrow_symbol (sym))
|
|
|
|
|
|
return (scm_i_symbol_length (sym) == data->len
|
|
|
|
|
|
&& strncmp (scm_i_symbol_chars (sym), data->str, data->len) == 0);
|
|
|
|
|
|
else
|
2018-06-21 08:39:03 +02:00
|
|
|
|
return utf8_string_equals_wide_string ((const uint8_t *) data->str,
|
2011-10-25 17:32:50 +02:00
|
|
|
|
data->len,
|
|
|
|
|
|
scm_i_symbol_wide_chars (sym),
|
|
|
|
|
|
scm_i_symbol_length (sym));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
|
|
|
|
|
lookup_interned_utf8_symbol (const char *str, size_t len,
|
|
|
|
|
|
unsigned long raw_hash)
|
|
|
|
|
|
{
|
|
|
|
|
|
struct utf8_lookup_data data;
|
|
|
|
|
|
|
|
|
|
|
|
data.str = str;
|
|
|
|
|
|
data.len = len;
|
|
|
|
|
|
data.string_hash = raw_hash;
|
|
|
|
|
|
|
|
|
|
|
|
return scm_c_weak_set_lookup (symbols, raw_hash,
|
|
|
|
|
|
utf8_lookup_predicate_fn,
|
|
|
|
|
|
&data, SCM_BOOL_F);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2011-10-23 20:46:48 +02:00
|
|
|
|
static int
|
|
|
|
|
|
symbol_lookup_predicate_fn (SCM sym, void *closure)
|
2011-01-05 20:15:11 -08:00
|
|
|
|
{
|
2011-10-24 17:58:22 +02:00
|
|
|
|
SCM other = SCM_PACK_POINTER (closure);
|
2011-01-05 20:15:11 -08:00
|
|
|
|
|
2011-10-23 20:46:48 +02:00
|
|
|
|
if (scm_i_symbol_hash (sym) == scm_i_symbol_hash (other)
|
|
|
|
|
|
&& scm_i_symbol_length (sym) == scm_i_symbol_length (other))
|
2011-01-05 20:15:11 -08:00
|
|
|
|
{
|
2011-10-23 20:46:48 +02:00
|
|
|
|
if (scm_i_is_narrow_symbol (sym))
|
|
|
|
|
|
return scm_i_is_narrow_symbol (other)
|
|
|
|
|
|
&& (strncmp (scm_i_symbol_chars (sym),
|
|
|
|
|
|
scm_i_symbol_chars (other),
|
|
|
|
|
|
scm_i_symbol_length (other)) == 0);
|
|
|
|
|
|
else
|
|
|
|
|
|
return scm_is_true
|
|
|
|
|
|
(scm_string_equal_p (scm_symbol_to_string (sym),
|
|
|
|
|
|
scm_symbol_to_string (other)));
|
2011-01-05 20:15:11 -08:00
|
|
|
|
}
|
2011-10-23 20:46:48 +02:00
|
|
|
|
return 0;
|
2011-01-05 20:15:11 -08:00
|
|
|
|
}
|
2011-10-23 20:46:48 +02:00
|
|
|
|
|
2006-01-24 20:30:09 +00:00
|
|
|
|
static SCM
|
2009-08-21 08:57:35 -07:00
|
|
|
|
scm_i_str2symbol (SCM str)
|
2006-01-24 20:30:09 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM symbol;
|
2009-08-21 08:57:35 -07:00
|
|
|
|
size_t raw_hash = scm_i_string_hash (str);
|
2000-12-12 18:36:35 +00:00
|
|
|
|
|
2009-08-21 08:57:35 -07:00
|
|
|
|
symbol = lookup_interned_symbol (str, raw_hash);
|
2011-01-05 20:15:11 -08:00
|
|
|
|
if (scm_is_true (symbol))
|
|
|
|
|
|
return symbol;
|
|
|
|
|
|
else
|
2009-03-18 22:28:37 +01:00
|
|
|
|
{
|
|
|
|
|
|
/* The symbol was not found, create it. */
|
|
|
|
|
|
symbol = scm_i_make_symbol (str, 0, raw_hash,
|
|
|
|
|
|
scm_cons (SCM_BOOL_F, SCM_EOL));
|
2011-10-23 20:46:48 +02:00
|
|
|
|
|
|
|
|
|
|
/* Might return a different symbol, if another one was interned at
|
|
|
|
|
|
the same time. */
|
|
|
|
|
|
return scm_c_weak_set_add_x (symbols, raw_hash,
|
|
|
|
|
|
symbol_lookup_predicate_fn,
|
2011-10-24 17:58:22 +02:00
|
|
|
|
SCM_UNPACK_POINTER (symbol), symbol);
|
2009-03-18 22:28:37 +01:00
|
|
|
|
}
|
2000-12-12 18:36:35 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
2006-01-24 20:30:09 +00:00
|
|
|
|
|
* strings.h, strings.c: (scm_i_string_chars, scm_i_string_length,
scm_i_string_writable_chars, scm_i_string_stop_writing): New, to
replace SCM_I_STRING_CHARS and SCM_I_STRING_LENGTH. Updated all
uses.
(scm_i_make_string, scm_c_make_string): New, to replace
scm_allocate_string. Updated all uses.
(SCM_STRINGP, SCM_STRING_CHARS, SCM_STRING_UCHARS,
SCM_STRING_LENGTH): Deprecated.
(scm_allocate_string, scm_take_str, scm_take0str, scm_mem2string,
scm_str2string, scm_makfrom0str, scm_makfrom0str_opt):
Discouraged. Replaced all uses with scm_from_locale_string or
similar, as appropriate.
(scm_c_string_length, scm_c_string_ref, scm_c_string_set_x,
scm_c_substring, scm_c_substring_shared, scm_c_substring_copy,
scm_substring_shared, scm_substring_copy): New.
* symbols.c, symbols.h (SCM_SYMBOLP, SCM_SYMBOL_FUNC,
SCM_SET_SYMBOL_FUNC, SCM_SYMBOL_PROPS, SCM_SET_SYMBOL_PROPS,
SCM_SYMBOL_HASH, SCM_SYMBOL_INTERNED_P, scm_mem2symbol,
scm_str2symbol, scm_mem2uninterned_symbol): Discouraged.
(SCM_SYMBOL_LENGTH, SCM_SYMBOL_CHARS, scm_c_symbol2str):
Deprecated.
(SCM_MAKE_SYMBOL_TAG, SCM_SET_SYMBOL_LENGTH, SCM_SET_SYMBOL_CHARS,
SCM_PROP_SLOTS, SCM_SET_PROP_SLOTS): Removed.
(scm_is_symbol, scm_from_locale_symbol, scm_from_locale_symboln):
New, to replace scm_str2symbol and scm_mem2symbol, respectively.
Updated all uses.
(scm_gensym): Generate only the number suffix in the buffer, just
string-append the prefix.
2004-08-19 16:49:42 +00:00
|
|
|
|
static SCM
|
2009-08-21 08:57:35 -07:00
|
|
|
|
scm_i_str2uninterned_symbol (SCM str)
|
2002-02-03 22:49:06 +00:00
|
|
|
|
{
|
2009-08-21 08:57:35 -07:00
|
|
|
|
size_t raw_hash = scm_i_string_hash (str);
|
* strings.h, strings.c: (scm_i_string_chars, scm_i_string_length,
scm_i_string_writable_chars, scm_i_string_stop_writing): New, to
replace SCM_I_STRING_CHARS and SCM_I_STRING_LENGTH. Updated all
uses.
(scm_i_make_string, scm_c_make_string): New, to replace
scm_allocate_string. Updated all uses.
(SCM_STRINGP, SCM_STRING_CHARS, SCM_STRING_UCHARS,
SCM_STRING_LENGTH): Deprecated.
(scm_allocate_string, scm_take_str, scm_take0str, scm_mem2string,
scm_str2string, scm_makfrom0str, scm_makfrom0str_opt):
Discouraged. Replaced all uses with scm_from_locale_string or
similar, as appropriate.
(scm_c_string_length, scm_c_string_ref, scm_c_string_set_x,
scm_c_substring, scm_c_substring_shared, scm_c_substring_copy,
scm_substring_shared, scm_substring_copy): New.
* symbols.c, symbols.h (SCM_SYMBOLP, SCM_SYMBOL_FUNC,
SCM_SET_SYMBOL_FUNC, SCM_SYMBOL_PROPS, SCM_SET_SYMBOL_PROPS,
SCM_SYMBOL_HASH, SCM_SYMBOL_INTERNED_P, scm_mem2symbol,
scm_str2symbol, scm_mem2uninterned_symbol): Discouraged.
(SCM_SYMBOL_LENGTH, SCM_SYMBOL_CHARS, scm_c_symbol2str):
Deprecated.
(SCM_MAKE_SYMBOL_TAG, SCM_SET_SYMBOL_LENGTH, SCM_SET_SYMBOL_CHARS,
SCM_PROP_SLOTS, SCM_SET_PROP_SLOTS): Removed.
(scm_is_symbol, scm_from_locale_symbol, scm_from_locale_symboln):
New, to replace scm_str2symbol and scm_mem2symbol, respectively.
Updated all uses.
(scm_gensym): Generate only the number suffix in the buffer, just
string-append the prefix.
2004-08-19 16:49:42 +00:00
|
|
|
|
|
2004-08-26 15:40:13 +00:00
|
|
|
|
return scm_i_make_symbol (str, SCM_I_F_SYMBOL_UNINTERNED,
|
|
|
|
|
|
raw_hash, scm_cons (SCM_BOOL_F, SCM_EOL));
|
2000-12-12 18:36:35 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_DEFINE (scm_symbol_p, "symbol?", 1, 0, 0,
|
2000-09-12 12:50:13 +00:00
|
|
|
|
(SCM obj),
|
2001-04-03 13:19:05 +00:00
|
|
|
|
"Return @code{#t} if @var{obj} is a symbol, otherwise return\n"
|
|
|
|
|
|
"@code{#f}.")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_symbol_p
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
* strings.h, strings.c: (scm_i_string_chars, scm_i_string_length,
scm_i_string_writable_chars, scm_i_string_stop_writing): New, to
replace SCM_I_STRING_CHARS and SCM_I_STRING_LENGTH. Updated all
uses.
(scm_i_make_string, scm_c_make_string): New, to replace
scm_allocate_string. Updated all uses.
(SCM_STRINGP, SCM_STRING_CHARS, SCM_STRING_UCHARS,
SCM_STRING_LENGTH): Deprecated.
(scm_allocate_string, scm_take_str, scm_take0str, scm_mem2string,
scm_str2string, scm_makfrom0str, scm_makfrom0str_opt):
Discouraged. Replaced all uses with scm_from_locale_string or
similar, as appropriate.
(scm_c_string_length, scm_c_string_ref, scm_c_string_set_x,
scm_c_substring, scm_c_substring_shared, scm_c_substring_copy,
scm_substring_shared, scm_substring_copy): New.
* symbols.c, symbols.h (SCM_SYMBOLP, SCM_SYMBOL_FUNC,
SCM_SET_SYMBOL_FUNC, SCM_SYMBOL_PROPS, SCM_SET_SYMBOL_PROPS,
SCM_SYMBOL_HASH, SCM_SYMBOL_INTERNED_P, scm_mem2symbol,
scm_str2symbol, scm_mem2uninterned_symbol): Discouraged.
(SCM_SYMBOL_LENGTH, SCM_SYMBOL_CHARS, scm_c_symbol2str):
Deprecated.
(SCM_MAKE_SYMBOL_TAG, SCM_SET_SYMBOL_LENGTH, SCM_SET_SYMBOL_CHARS,
SCM_PROP_SLOTS, SCM_SET_PROP_SLOTS): Removed.
(scm_is_symbol, scm_from_locale_symbol, scm_from_locale_symboln):
New, to replace scm_str2symbol and scm_mem2symbol, respectively.
Updated all uses.
(scm_gensym): Generate only the number suffix in the buffer, just
string-append the prefix.
2004-08-19 16:49:42 +00:00
|
|
|
|
return scm_from_bool (scm_is_symbol (obj));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2002-02-03 22:49:06 +00:00
|
|
|
|
SCM_DEFINE (scm_symbol_interned_p, "symbol-interned?", 1, 0, 0,
|
|
|
|
|
|
(SCM symbol),
|
|
|
|
|
|
"Return @code{#t} if @var{symbol} is interned, otherwise return\n"
|
|
|
|
|
|
"@code{#f}.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_symbol_interned_p
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM_VALIDATE_SYMBOL (1, symbol);
|
* strings.h, strings.c: (scm_i_string_chars, scm_i_string_length,
scm_i_string_writable_chars, scm_i_string_stop_writing): New, to
replace SCM_I_STRING_CHARS and SCM_I_STRING_LENGTH. Updated all
uses.
(scm_i_make_string, scm_c_make_string): New, to replace
scm_allocate_string. Updated all uses.
(SCM_STRINGP, SCM_STRING_CHARS, SCM_STRING_UCHARS,
SCM_STRING_LENGTH): Deprecated.
(scm_allocate_string, scm_take_str, scm_take0str, scm_mem2string,
scm_str2string, scm_makfrom0str, scm_makfrom0str_opt):
Discouraged. Replaced all uses with scm_from_locale_string or
similar, as appropriate.
(scm_c_string_length, scm_c_string_ref, scm_c_string_set_x,
scm_c_substring, scm_c_substring_shared, scm_c_substring_copy,
scm_substring_shared, scm_substring_copy): New.
* symbols.c, symbols.h (SCM_SYMBOLP, SCM_SYMBOL_FUNC,
SCM_SET_SYMBOL_FUNC, SCM_SYMBOL_PROPS, SCM_SET_SYMBOL_PROPS,
SCM_SYMBOL_HASH, SCM_SYMBOL_INTERNED_P, scm_mem2symbol,
scm_str2symbol, scm_mem2uninterned_symbol): Discouraged.
(SCM_SYMBOL_LENGTH, SCM_SYMBOL_CHARS, scm_c_symbol2str):
Deprecated.
(SCM_MAKE_SYMBOL_TAG, SCM_SET_SYMBOL_LENGTH, SCM_SET_SYMBOL_CHARS,
SCM_PROP_SLOTS, SCM_SET_PROP_SLOTS): Removed.
(scm_is_symbol, scm_from_locale_symbol, scm_from_locale_symboln):
New, to replace scm_str2symbol and scm_mem2symbol, respectively.
Updated all uses.
(scm_gensym): Generate only the number suffix in the buffer, just
string-append the prefix.
2004-08-19 16:49:42 +00:00
|
|
|
|
return scm_from_bool (scm_i_symbol_is_interned (symbol));
|
2002-02-03 22:49:06 +00:00
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
|
|
|
|
|
SCM_DEFINE (scm_make_symbol, "make-symbol", 1, 0, 0,
|
|
|
|
|
|
(SCM name),
|
|
|
|
|
|
"Return a new uninterned symbol with the name @var{name}. "
|
|
|
|
|
|
"The returned symbol is guaranteed to be unique and future "
|
2002-02-04 16:47:35 +00:00
|
|
|
|
"calls to @code{string->symbol} will not return it.")
|
2002-02-03 22:49:06 +00:00
|
|
|
|
#define FUNC_NAME s_scm_make_symbol
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM_VALIDATE_STRING (1, name);
|
2009-08-21 08:57:35 -07:00
|
|
|
|
return scm_i_str2uninterned_symbol (name);
|
2002-02-03 22:49:06 +00:00
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_DEFINE (scm_symbol_to_string, "symbol->string", 1, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM s),
|
2001-04-03 13:19:05 +00:00
|
|
|
|
"Return the name of @var{symbol} as a string. If the symbol was\n"
|
|
|
|
|
|
"part of an object returned as the value of a literal expression\n"
|
* eval.c (scm_promise_p), list.c (scm_append_x, scm_reverse_x),
symbols.c (scm_symbol_to_string), vports.c (scm_make_soft_port):
Change R4RS references to R5RS.
* guile-snarf.awk.in: Fixes so that (i) blank lines in the
docstring source are correctly reproduced in the output (ii)
we don't anymore get occasional trailing quotes. Also reorganized
and commented the code a little.
* scmsigs.c (scm_raise), throw.c (scm_throw): Docstring format
fixes.
* new-docstrings.texi, posix.texi, scheme-control.texi,
scheme-data.texi, scheme-debug.texi, scheme-evaluation.texi,
scheme-io.texi, scheme-memory.texi, scheme-procedures.texi:
Automatic docstring updates (mostly argument name updates and
blank lines).
* scheme-modules.texi: Change double hyphens to single.
* scheme-control.texi (Lazy Catch): Completed.
* posix.texi (Network Databases and Address Conversion): New
subsubsection `IPv6 Address Conversion'.
2001-05-04 21:54:00 +00:00
|
|
|
|
"(section @pxref{Literal expressions,,,r5rs, The Revised^5\n"
|
2001-04-03 13:19:05 +00:00
|
|
|
|
"Report on Scheme}) or by a call to the @code{read} procedure,\n"
|
|
|
|
|
|
"and its name contains alphabetic characters, then the string\n"
|
|
|
|
|
|
"returned will contain characters in the implementation's\n"
|
|
|
|
|
|
"preferred standard case---some implementations will prefer\n"
|
|
|
|
|
|
"upper case, others lower case. If the symbol was returned by\n"
|
|
|
|
|
|
"@code{string->symbol}, the case of characters in the string\n"
|
|
|
|
|
|
"returned will be the same as the case in the string that was\n"
|
|
|
|
|
|
"passed to @code{string->symbol}. It is an error to apply\n"
|
|
|
|
|
|
"mutation procedures like @code{string-set!} to strings returned\n"
|
|
|
|
|
|
"by this procedure.\n"
|
|
|
|
|
|
"\n"
|
* vectors.c (s_scm_vector_p, list->vector, scm_vector)
(scm_vector_ref, scm_vector_set_x, scm_vector_to_list)
(scm_vector_fill_x), strorder.c (scm_string_equal_p)
(scm_string_ci_equal_p, scm_string_less_p, scm_string_leq_p)
(scm_string_gr_p, scm_string_geq_p, scm_string_ci_less_p)
(scm_string_ci_geq_p), symbols.c (scm_symbol_p)
(scm_symbol_to_string, scm_string_to_symbol): Changed use of @t{}
to @code{} as the texinfo manual recommends, converted the
examples to use a @lisp{}-environment.
* strports.c (scm_eval_string): Cleaned up the docstring.
* struct.c (scm_struct_p, scm_struct_vtable_p): Added texinfo
markup.
* numbers.c (scm_exact_p, scm_odd_p, scm_even_p)
(scm_number_to_string, scm_string_to_number, scm_number_p)
(scm_real_p, scm_integer_p, scm_inexact_p, scm_make_rectangular)
(scm_make_polar, scm_inexact_to_exact): Added texinfo markup.
(scm_ash): Added texinfo markup and removed obsolete @refill.
(scm_gr_p): Corrected comment.
(scm_gr_p, scm_leq_p, scm_geq_p): Added texinfo markup to (future
docstring) comments.
(scm_positive_p, scm_less_p, scm_num_eq_p, scm_real_p)
(scm_number_p, scm_negative_p, scm_max, scm_min, scm_sum)
(scm_difference, scm_product, scm_divide, scm_asinh, scm_acosh)
(scm_atanh, scm_truncate, scm_round, scm_exact_to_inexact)
(floor, ceiling, $sqrt, $abs, $exp, $log, $sin, $cos, $tan, $asin)
($acos, $atan, $sinh, $cosh, $tanh, scm_real_part, scm_imag_part)
(scm_magnitude, scm_angle, scm_abs, scm_quotient, scm_remainder)
(scm_modulo, scm_gcd, scm_lcm): Added (future docstring) comments.
2001-03-02 09:07:22 +00:00
|
|
|
|
"The following examples assume that the implementation's\n"
|
2001-04-03 13:19:05 +00:00
|
|
|
|
"standard case is lower case:\n"
|
|
|
|
|
|
"\n"
|
* vectors.c (s_scm_vector_p, list->vector, scm_vector)
(scm_vector_ref, scm_vector_set_x, scm_vector_to_list)
(scm_vector_fill_x), strorder.c (scm_string_equal_p)
(scm_string_ci_equal_p, scm_string_less_p, scm_string_leq_p)
(scm_string_gr_p, scm_string_geq_p, scm_string_ci_less_p)
(scm_string_ci_geq_p), symbols.c (scm_symbol_p)
(scm_symbol_to_string, scm_string_to_symbol): Changed use of @t{}
to @code{} as the texinfo manual recommends, converted the
examples to use a @lisp{}-environment.
* strports.c (scm_eval_string): Cleaned up the docstring.
* struct.c (scm_struct_p, scm_struct_vtable_p): Added texinfo
markup.
* numbers.c (scm_exact_p, scm_odd_p, scm_even_p)
(scm_number_to_string, scm_string_to_number, scm_number_p)
(scm_real_p, scm_integer_p, scm_inexact_p, scm_make_rectangular)
(scm_make_polar, scm_inexact_to_exact): Added texinfo markup.
(scm_ash): Added texinfo markup and removed obsolete @refill.
(scm_gr_p): Corrected comment.
(scm_gr_p, scm_leq_p, scm_geq_p): Added texinfo markup to (future
docstring) comments.
(scm_positive_p, scm_less_p, scm_num_eq_p, scm_real_p)
(scm_number_p, scm_negative_p, scm_max, scm_min, scm_sum)
(scm_difference, scm_product, scm_divide, scm_asinh, scm_acosh)
(scm_atanh, scm_truncate, scm_round, scm_exact_to_inexact)
(floor, ceiling, $sqrt, $abs, $exp, $log, $sin, $cos, $tan, $asin)
($acos, $atan, $sinh, $cosh, $tanh, scm_real_part, scm_imag_part)
(scm_magnitude, scm_angle, scm_abs, scm_quotient, scm_remainder)
(scm_modulo, scm_gcd, scm_lcm): Added (future docstring) comments.
2001-03-02 09:07:22 +00:00
|
|
|
|
"@lisp\n"
|
2001-04-03 13:19:05 +00:00
|
|
|
|
"(symbol->string 'flying-fish) @result{} \"flying-fish\"\n"
|
|
|
|
|
|
"(symbol->string 'Martin) @result{} \"martin\"\n"
|
2000-01-27 18:15:56 +00:00
|
|
|
|
"(symbol->string\n"
|
* vectors.c (s_scm_vector_p, list->vector, scm_vector)
(scm_vector_ref, scm_vector_set_x, scm_vector_to_list)
(scm_vector_fill_x), strorder.c (scm_string_equal_p)
(scm_string_ci_equal_p, scm_string_less_p, scm_string_leq_p)
(scm_string_gr_p, scm_string_geq_p, scm_string_ci_less_p)
(scm_string_ci_geq_p), symbols.c (scm_symbol_p)
(scm_symbol_to_string, scm_string_to_symbol): Changed use of @t{}
to @code{} as the texinfo manual recommends, converted the
examples to use a @lisp{}-environment.
* strports.c (scm_eval_string): Cleaned up the docstring.
* struct.c (scm_struct_p, scm_struct_vtable_p): Added texinfo
markup.
* numbers.c (scm_exact_p, scm_odd_p, scm_even_p)
(scm_number_to_string, scm_string_to_number, scm_number_p)
(scm_real_p, scm_integer_p, scm_inexact_p, scm_make_rectangular)
(scm_make_polar, scm_inexact_to_exact): Added texinfo markup.
(scm_ash): Added texinfo markup and removed obsolete @refill.
(scm_gr_p): Corrected comment.
(scm_gr_p, scm_leq_p, scm_geq_p): Added texinfo markup to (future
docstring) comments.
(scm_positive_p, scm_less_p, scm_num_eq_p, scm_real_p)
(scm_number_p, scm_negative_p, scm_max, scm_min, scm_sum)
(scm_difference, scm_product, scm_divide, scm_asinh, scm_acosh)
(scm_atanh, scm_truncate, scm_round, scm_exact_to_inexact)
(floor, ceiling, $sqrt, $abs, $exp, $log, $sin, $cos, $tan, $asin)
($acos, $atan, $sinh, $cosh, $tanh, scm_real_part, scm_imag_part)
(scm_magnitude, scm_angle, scm_abs, scm_quotient, scm_remainder)
(scm_modulo, scm_gcd, scm_lcm): Added (future docstring) comments.
2001-03-02 09:07:22 +00:00
|
|
|
|
" (string->symbol \"Malvina\")) @result{} \"Malvina\"\n"
|
|
|
|
|
|
"@end lisp")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_symbol_to_string
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2000-09-12 12:30:36 +00:00
|
|
|
|
SCM_VALIDATE_SYMBOL (1, s);
|
* strings.h, strings.c: (scm_i_string_chars, scm_i_string_length,
scm_i_string_writable_chars, scm_i_string_stop_writing): New, to
replace SCM_I_STRING_CHARS and SCM_I_STRING_LENGTH. Updated all
uses.
(scm_i_make_string, scm_c_make_string): New, to replace
scm_allocate_string. Updated all uses.
(SCM_STRINGP, SCM_STRING_CHARS, SCM_STRING_UCHARS,
SCM_STRING_LENGTH): Deprecated.
(scm_allocate_string, scm_take_str, scm_take0str, scm_mem2string,
scm_str2string, scm_makfrom0str, scm_makfrom0str_opt):
Discouraged. Replaced all uses with scm_from_locale_string or
similar, as appropriate.
(scm_c_string_length, scm_c_string_ref, scm_c_string_set_x,
scm_c_substring, scm_c_substring_shared, scm_c_substring_copy,
scm_substring_shared, scm_substring_copy): New.
* symbols.c, symbols.h (SCM_SYMBOLP, SCM_SYMBOL_FUNC,
SCM_SET_SYMBOL_FUNC, SCM_SYMBOL_PROPS, SCM_SET_SYMBOL_PROPS,
SCM_SYMBOL_HASH, SCM_SYMBOL_INTERNED_P, scm_mem2symbol,
scm_str2symbol, scm_mem2uninterned_symbol): Discouraged.
(SCM_SYMBOL_LENGTH, SCM_SYMBOL_CHARS, scm_c_symbol2str):
Deprecated.
(SCM_MAKE_SYMBOL_TAG, SCM_SET_SYMBOL_LENGTH, SCM_SET_SYMBOL_CHARS,
SCM_PROP_SLOTS, SCM_SET_PROP_SLOTS): Removed.
(scm_is_symbol, scm_from_locale_symbol, scm_from_locale_symboln):
New, to replace scm_str2symbol and scm_mem2symbol, respectively.
Updated all uses.
(scm_gensym): Generate only the number suffix in the buffer, just
string-append the prefix.
2004-08-19 16:49:42 +00:00
|
|
|
|
return scm_i_symbol_substring (s, 0, scm_i_symbol_length (s));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_DEFINE (scm_string_to_symbol, "string->symbol", 1, 0, 0,
|
2001-04-03 13:19:05 +00:00
|
|
|
|
(SCM string),
|
|
|
|
|
|
"Return the symbol whose name is @var{string}. This procedure\n"
|
* vectors.c (s_scm_vector_p, list->vector, scm_vector)
(scm_vector_ref, scm_vector_set_x, scm_vector_to_list)
(scm_vector_fill_x), strorder.c (scm_string_equal_p)
(scm_string_ci_equal_p, scm_string_less_p, scm_string_leq_p)
(scm_string_gr_p, scm_string_geq_p, scm_string_ci_less_p)
(scm_string_ci_geq_p), symbols.c (scm_symbol_p)
(scm_symbol_to_string, scm_string_to_symbol): Changed use of @t{}
to @code{} as the texinfo manual recommends, converted the
examples to use a @lisp{}-environment.
* strports.c (scm_eval_string): Cleaned up the docstring.
* struct.c (scm_struct_p, scm_struct_vtable_p): Added texinfo
markup.
* numbers.c (scm_exact_p, scm_odd_p, scm_even_p)
(scm_number_to_string, scm_string_to_number, scm_number_p)
(scm_real_p, scm_integer_p, scm_inexact_p, scm_make_rectangular)
(scm_make_polar, scm_inexact_to_exact): Added texinfo markup.
(scm_ash): Added texinfo markup and removed obsolete @refill.
(scm_gr_p): Corrected comment.
(scm_gr_p, scm_leq_p, scm_geq_p): Added texinfo markup to (future
docstring) comments.
(scm_positive_p, scm_less_p, scm_num_eq_p, scm_real_p)
(scm_number_p, scm_negative_p, scm_max, scm_min, scm_sum)
(scm_difference, scm_product, scm_divide, scm_asinh, scm_acosh)
(scm_atanh, scm_truncate, scm_round, scm_exact_to_inexact)
(floor, ceiling, $sqrt, $abs, $exp, $log, $sin, $cos, $tan, $asin)
($acos, $atan, $sinh, $cosh, $tanh, scm_real_part, scm_imag_part)
(scm_magnitude, scm_angle, scm_abs, scm_quotient, scm_remainder)
(scm_modulo, scm_gcd, scm_lcm): Added (future docstring) comments.
2001-03-02 09:07:22 +00:00
|
|
|
|
"can create symbols with names containing special characters or\n"
|
|
|
|
|
|
"letters in the non-standard case, but it is usually a bad idea\n"
|
2001-04-03 13:19:05 +00:00
|
|
|
|
"to create such symbols because in some implementations of\n"
|
|
|
|
|
|
"Scheme they cannot be read as themselves. See\n"
|
|
|
|
|
|
"@code{symbol->string}.\n"
|
|
|
|
|
|
"\n"
|
* vectors.c (s_scm_vector_p, list->vector, scm_vector)
(scm_vector_ref, scm_vector_set_x, scm_vector_to_list)
(scm_vector_fill_x), strorder.c (scm_string_equal_p)
(scm_string_ci_equal_p, scm_string_less_p, scm_string_leq_p)
(scm_string_gr_p, scm_string_geq_p, scm_string_ci_less_p)
(scm_string_ci_geq_p), symbols.c (scm_symbol_p)
(scm_symbol_to_string, scm_string_to_symbol): Changed use of @t{}
to @code{} as the texinfo manual recommends, converted the
examples to use a @lisp{}-environment.
* strports.c (scm_eval_string): Cleaned up the docstring.
* struct.c (scm_struct_p, scm_struct_vtable_p): Added texinfo
markup.
* numbers.c (scm_exact_p, scm_odd_p, scm_even_p)
(scm_number_to_string, scm_string_to_number, scm_number_p)
(scm_real_p, scm_integer_p, scm_inexact_p, scm_make_rectangular)
(scm_make_polar, scm_inexact_to_exact): Added texinfo markup.
(scm_ash): Added texinfo markup and removed obsolete @refill.
(scm_gr_p): Corrected comment.
(scm_gr_p, scm_leq_p, scm_geq_p): Added texinfo markup to (future
docstring) comments.
(scm_positive_p, scm_less_p, scm_num_eq_p, scm_real_p)
(scm_number_p, scm_negative_p, scm_max, scm_min, scm_sum)
(scm_difference, scm_product, scm_divide, scm_asinh, scm_acosh)
(scm_atanh, scm_truncate, scm_round, scm_exact_to_inexact)
(floor, ceiling, $sqrt, $abs, $exp, $log, $sin, $cos, $tan, $asin)
($acos, $atan, $sinh, $cosh, $tanh, scm_real_part, scm_imag_part)
(scm_magnitude, scm_angle, scm_abs, scm_quotient, scm_remainder)
(scm_modulo, scm_gcd, scm_lcm): Added (future docstring) comments.
2001-03-02 09:07:22 +00:00
|
|
|
|
"The following examples assume that the implementation's\n"
|
2001-04-03 13:19:05 +00:00
|
|
|
|
"standard case is lower case:\n"
|
|
|
|
|
|
"\n"
|
* vectors.c (s_scm_vector_p, list->vector, scm_vector)
(scm_vector_ref, scm_vector_set_x, scm_vector_to_list)
(scm_vector_fill_x), strorder.c (scm_string_equal_p)
(scm_string_ci_equal_p, scm_string_less_p, scm_string_leq_p)
(scm_string_gr_p, scm_string_geq_p, scm_string_ci_less_p)
(scm_string_ci_geq_p), symbols.c (scm_symbol_p)
(scm_symbol_to_string, scm_string_to_symbol): Changed use of @t{}
to @code{} as the texinfo manual recommends, converted the
examples to use a @lisp{}-environment.
* strports.c (scm_eval_string): Cleaned up the docstring.
* struct.c (scm_struct_p, scm_struct_vtable_p): Added texinfo
markup.
* numbers.c (scm_exact_p, scm_odd_p, scm_even_p)
(scm_number_to_string, scm_string_to_number, scm_number_p)
(scm_real_p, scm_integer_p, scm_inexact_p, scm_make_rectangular)
(scm_make_polar, scm_inexact_to_exact): Added texinfo markup.
(scm_ash): Added texinfo markup and removed obsolete @refill.
(scm_gr_p): Corrected comment.
(scm_gr_p, scm_leq_p, scm_geq_p): Added texinfo markup to (future
docstring) comments.
(scm_positive_p, scm_less_p, scm_num_eq_p, scm_real_p)
(scm_number_p, scm_negative_p, scm_max, scm_min, scm_sum)
(scm_difference, scm_product, scm_divide, scm_asinh, scm_acosh)
(scm_atanh, scm_truncate, scm_round, scm_exact_to_inexact)
(floor, ceiling, $sqrt, $abs, $exp, $log, $sin, $cos, $tan, $asin)
($acos, $atan, $sinh, $cosh, $tanh, scm_real_part, scm_imag_part)
(scm_magnitude, scm_angle, scm_abs, scm_quotient, scm_remainder)
(scm_modulo, scm_gcd, scm_lcm): Added (future docstring) comments.
2001-03-02 09:07:22 +00:00
|
|
|
|
"@lisp\n"
|
|
|
|
|
|
"(eq? 'mISSISSIppi 'mississippi) @result{} #t\n"
|
|
|
|
|
|
"(string->symbol \"mISSISSIppi\") @result{} @r{the symbol with name \"mISSISSIppi\"}\n"
|
|
|
|
|
|
"(eq? 'bitBlt (string->symbol \"bitBlt\")) @result{} #f\n"
|
|
|
|
|
|
"(eq? 'JollyWog\n"
|
|
|
|
|
|
" (string->symbol (symbol->string 'JollyWog))) @result{} #t\n"
|
|
|
|
|
|
"(string=? \"K. Harper, M.D.\"\n"
|
|
|
|
|
|
" (symbol->string\n"
|
|
|
|
|
|
" (string->symbol \"K. Harper, M.D.\"))) @result{}#t\n"
|
|
|
|
|
|
"@end lisp")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_string_to_symbol
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2001-04-03 13:19:05 +00:00
|
|
|
|
SCM_VALIDATE_STRING (1, string);
|
2009-08-21 08:57:35 -07:00
|
|
|
|
return scm_i_str2symbol (string);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2004-08-24 22:13:27 +00:00
|
|
|
|
SCM_DEFINE (scm_string_ci_to_symbol, "string-ci->symbol", 1, 0, 0,
|
|
|
|
|
|
(SCM str),
|
|
|
|
|
|
"Return the symbol whose name is @var{str}. @var{str} is\n"
|
|
|
|
|
|
"converted to lowercase before the conversion is done, if Guile\n"
|
|
|
|
|
|
"is currently reading symbols case-insensitively.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_string_ci_to_symbol
|
|
|
|
|
|
{
|
|
|
|
|
|
return scm_string_to_symbol (SCM_CASE_INSENSITIVE_P
|
|
|
|
|
|
? scm_string_downcase(str)
|
|
|
|
|
|
: str);
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
2011-03-06 21:47:48 +01:00
|
|
|
|
/* The default prefix for `gensym'd symbols. */
|
|
|
|
|
|
static SCM default_gensym_prefix;
|
|
|
|
|
|
|
2012-01-26 11:00:55 +01:00
|
|
|
|
#define MAX_PREFIX_LENGTH 30
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2001-05-15 14:57:22 +00:00
|
|
|
|
SCM_DEFINE (scm_gensym, "gensym", 0, 1, 0,
|
|
|
|
|
|
(SCM prefix),
|
|
|
|
|
|
"Create a new symbol with a name constructed from a prefix and\n"
|
|
|
|
|
|
"a counter value. The string @var{prefix} can be specified as\n"
|
2002-01-31 19:59:26 +00:00
|
|
|
|
"an optional argument. Default prefix is @code{ g}. The counter\n"
|
2001-05-15 14:57:22 +00:00
|
|
|
|
"is increased by 1 at each call. There is no provision for\n"
|
|
|
|
|
|
"resetting the counter.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_gensym
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2012-01-26 11:00:55 +01:00
|
|
|
|
static int gensym_counter = 0;
|
|
|
|
|
|
|
* strings.h, strings.c: (scm_i_string_chars, scm_i_string_length,
scm_i_string_writable_chars, scm_i_string_stop_writing): New, to
replace SCM_I_STRING_CHARS and SCM_I_STRING_LENGTH. Updated all
uses.
(scm_i_make_string, scm_c_make_string): New, to replace
scm_allocate_string. Updated all uses.
(SCM_STRINGP, SCM_STRING_CHARS, SCM_STRING_UCHARS,
SCM_STRING_LENGTH): Deprecated.
(scm_allocate_string, scm_take_str, scm_take0str, scm_mem2string,
scm_str2string, scm_makfrom0str, scm_makfrom0str_opt):
Discouraged. Replaced all uses with scm_from_locale_string or
similar, as appropriate.
(scm_c_string_length, scm_c_string_ref, scm_c_string_set_x,
scm_c_substring, scm_c_substring_shared, scm_c_substring_copy,
scm_substring_shared, scm_substring_copy): New.
* symbols.c, symbols.h (SCM_SYMBOLP, SCM_SYMBOL_FUNC,
SCM_SET_SYMBOL_FUNC, SCM_SYMBOL_PROPS, SCM_SET_SYMBOL_PROPS,
SCM_SYMBOL_HASH, SCM_SYMBOL_INTERNED_P, scm_mem2symbol,
scm_str2symbol, scm_mem2uninterned_symbol): Discouraged.
(SCM_SYMBOL_LENGTH, SCM_SYMBOL_CHARS, scm_c_symbol2str):
Deprecated.
(SCM_MAKE_SYMBOL_TAG, SCM_SET_SYMBOL_LENGTH, SCM_SET_SYMBOL_CHARS,
SCM_PROP_SLOTS, SCM_SET_PROP_SLOTS): Removed.
(scm_is_symbol, scm_from_locale_symbol, scm_from_locale_symboln):
New, to replace scm_str2symbol and scm_mem2symbol, respectively.
Updated all uses.
(scm_gensym): Generate only the number suffix in the buffer, just
string-append the prefix.
2004-08-19 16:49:42 +00:00
|
|
|
|
SCM suffix, name;
|
2012-01-26 11:00:55 +01:00
|
|
|
|
int n, n_digits;
|
|
|
|
|
|
char buf[SCM_INTBUFLEN];
|
2004-07-31 01:08:20 +00:00
|
|
|
|
|
2001-05-15 14:57:22 +00:00
|
|
|
|
if (SCM_UNBNDP (prefix))
|
2011-03-06 21:47:48 +01:00
|
|
|
|
prefix = default_gensym_prefix;
|
|
|
|
|
|
|
2012-01-26 11:00:55 +01:00
|
|
|
|
/* mutex in case another thread looks and incs at the exact same moment */
|
|
|
|
|
|
scm_i_scm_pthread_mutex_lock (&scm_i_misc_mutex);
|
|
|
|
|
|
n = gensym_counter++;
|
|
|
|
|
|
scm_i_pthread_mutex_unlock (&scm_i_misc_mutex);
|
* strings.h, strings.c: (scm_i_string_chars, scm_i_string_length,
scm_i_string_writable_chars, scm_i_string_stop_writing): New, to
replace SCM_I_STRING_CHARS and SCM_I_STRING_LENGTH. Updated all
uses.
(scm_i_make_string, scm_c_make_string): New, to replace
scm_allocate_string. Updated all uses.
(SCM_STRINGP, SCM_STRING_CHARS, SCM_STRING_UCHARS,
SCM_STRING_LENGTH): Deprecated.
(scm_allocate_string, scm_take_str, scm_take0str, scm_mem2string,
scm_str2string, scm_makfrom0str, scm_makfrom0str_opt):
Discouraged. Replaced all uses with scm_from_locale_string or
similar, as appropriate.
(scm_c_string_length, scm_c_string_ref, scm_c_string_set_x,
scm_c_substring, scm_c_substring_shared, scm_c_substring_copy,
scm_substring_shared, scm_substring_copy): New.
* symbols.c, symbols.h (SCM_SYMBOLP, SCM_SYMBOL_FUNC,
SCM_SET_SYMBOL_FUNC, SCM_SYMBOL_PROPS, SCM_SET_SYMBOL_PROPS,
SCM_SYMBOL_HASH, SCM_SYMBOL_INTERNED_P, scm_mem2symbol,
scm_str2symbol, scm_mem2uninterned_symbol): Discouraged.
(SCM_SYMBOL_LENGTH, SCM_SYMBOL_CHARS, scm_c_symbol2str):
Deprecated.
(SCM_MAKE_SYMBOL_TAG, SCM_SET_SYMBOL_LENGTH, SCM_SET_SYMBOL_CHARS,
SCM_PROP_SLOTS, SCM_SET_PROP_SLOTS): Removed.
(scm_is_symbol, scm_from_locale_symbol, scm_from_locale_symboln):
New, to replace scm_str2symbol and scm_mem2symbol, respectively.
Updated all uses.
(scm_gensym): Generate only the number suffix in the buffer, just
string-append the prefix.
2004-08-19 16:49:42 +00:00
|
|
|
|
|
2012-01-26 11:00:55 +01:00
|
|
|
|
n_digits = scm_iint2str (n, 10, buf);
|
|
|
|
|
|
suffix = scm_from_latin1_stringn (buf, n_digits);
|
* strings.h, strings.c: (scm_i_string_chars, scm_i_string_length,
scm_i_string_writable_chars, scm_i_string_stop_writing): New, to
replace SCM_I_STRING_CHARS and SCM_I_STRING_LENGTH. Updated all
uses.
(scm_i_make_string, scm_c_make_string): New, to replace
scm_allocate_string. Updated all uses.
(SCM_STRINGP, SCM_STRING_CHARS, SCM_STRING_UCHARS,
SCM_STRING_LENGTH): Deprecated.
(scm_allocate_string, scm_take_str, scm_take0str, scm_mem2string,
scm_str2string, scm_makfrom0str, scm_makfrom0str_opt):
Discouraged. Replaced all uses with scm_from_locale_string or
similar, as appropriate.
(scm_c_string_length, scm_c_string_ref, scm_c_string_set_x,
scm_c_substring, scm_c_substring_shared, scm_c_substring_copy,
scm_substring_shared, scm_substring_copy): New.
* symbols.c, symbols.h (SCM_SYMBOLP, SCM_SYMBOL_FUNC,
SCM_SET_SYMBOL_FUNC, SCM_SYMBOL_PROPS, SCM_SET_SYMBOL_PROPS,
SCM_SYMBOL_HASH, SCM_SYMBOL_INTERNED_P, scm_mem2symbol,
scm_str2symbol, scm_mem2uninterned_symbol): Discouraged.
(SCM_SYMBOL_LENGTH, SCM_SYMBOL_CHARS, scm_c_symbol2str):
Deprecated.
(SCM_MAKE_SYMBOL_TAG, SCM_SET_SYMBOL_LENGTH, SCM_SET_SYMBOL_CHARS,
SCM_PROP_SLOTS, SCM_SET_PROP_SLOTS): Removed.
(scm_is_symbol, scm_from_locale_symbol, scm_from_locale_symboln):
New, to replace scm_str2symbol and scm_mem2symbol, respectively.
Updated all uses.
(scm_gensym): Generate only the number suffix in the buffer, just
string-append the prefix.
2004-08-19 16:49:42 +00:00
|
|
|
|
name = scm_string_append (scm_list_2 (prefix, suffix));
|
|
|
|
|
|
return scm_string_to_symbol (name);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2001-05-15 14:57:22 +00:00
|
|
|
|
SCM_DEFINE (scm_symbol_hash, "symbol-hash", 1, 0, 0,
|
|
|
|
|
|
(SCM symbol),
|
|
|
|
|
|
"Return a hash value for @var{symbol}.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_symbol_hash
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2001-05-15 14:57:22 +00:00
|
|
|
|
SCM_VALIDATE_SYMBOL (1, symbol);
|
* strings.h, strings.c: (scm_i_string_chars, scm_i_string_length,
scm_i_string_writable_chars, scm_i_string_stop_writing): New, to
replace SCM_I_STRING_CHARS and SCM_I_STRING_LENGTH. Updated all
uses.
(scm_i_make_string, scm_c_make_string): New, to replace
scm_allocate_string. Updated all uses.
(SCM_STRINGP, SCM_STRING_CHARS, SCM_STRING_UCHARS,
SCM_STRING_LENGTH): Deprecated.
(scm_allocate_string, scm_take_str, scm_take0str, scm_mem2string,
scm_str2string, scm_makfrom0str, scm_makfrom0str_opt):
Discouraged. Replaced all uses with scm_from_locale_string or
similar, as appropriate.
(scm_c_string_length, scm_c_string_ref, scm_c_string_set_x,
scm_c_substring, scm_c_substring_shared, scm_c_substring_copy,
scm_substring_shared, scm_substring_copy): New.
* symbols.c, symbols.h (SCM_SYMBOLP, SCM_SYMBOL_FUNC,
SCM_SET_SYMBOL_FUNC, SCM_SYMBOL_PROPS, SCM_SET_SYMBOL_PROPS,
SCM_SYMBOL_HASH, SCM_SYMBOL_INTERNED_P, scm_mem2symbol,
scm_str2symbol, scm_mem2uninterned_symbol): Discouraged.
(SCM_SYMBOL_LENGTH, SCM_SYMBOL_CHARS, scm_c_symbol2str):
Deprecated.
(SCM_MAKE_SYMBOL_TAG, SCM_SET_SYMBOL_LENGTH, SCM_SET_SYMBOL_CHARS,
SCM_PROP_SLOTS, SCM_SET_PROP_SLOTS): Removed.
(scm_is_symbol, scm_from_locale_symbol, scm_from_locale_symboln):
New, to replace scm_str2symbol and scm_mem2symbol, respectively.
Updated all uses.
(scm_gensym): Generate only the number suffix in the buffer, just
string-append the prefix.
2004-08-19 16:49:42 +00:00
|
|
|
|
return scm_from_ulong (scm_i_symbol_hash (symbol));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_DEFINE (scm_symbol_fref, "symbol-fref", 1, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM s),
|
2012-01-11 23:33:01 -05:00
|
|
|
|
"Return the contents of the symbol @var{s}'s @dfn{function slot}.")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_symbol_fref
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2002-07-20 14:08:34 +00:00
|
|
|
|
SCM_VALIDATE_SYMBOL (1, s);
|
* strings.h, strings.c: (scm_i_string_chars, scm_i_string_length,
scm_i_string_writable_chars, scm_i_string_stop_writing): New, to
replace SCM_I_STRING_CHARS and SCM_I_STRING_LENGTH. Updated all
uses.
(scm_i_make_string, scm_c_make_string): New, to replace
scm_allocate_string. Updated all uses.
(SCM_STRINGP, SCM_STRING_CHARS, SCM_STRING_UCHARS,
SCM_STRING_LENGTH): Deprecated.
(scm_allocate_string, scm_take_str, scm_take0str, scm_mem2string,
scm_str2string, scm_makfrom0str, scm_makfrom0str_opt):
Discouraged. Replaced all uses with scm_from_locale_string or
similar, as appropriate.
(scm_c_string_length, scm_c_string_ref, scm_c_string_set_x,
scm_c_substring, scm_c_substring_shared, scm_c_substring_copy,
scm_substring_shared, scm_substring_copy): New.
* symbols.c, symbols.h (SCM_SYMBOLP, SCM_SYMBOL_FUNC,
SCM_SET_SYMBOL_FUNC, SCM_SYMBOL_PROPS, SCM_SET_SYMBOL_PROPS,
SCM_SYMBOL_HASH, SCM_SYMBOL_INTERNED_P, scm_mem2symbol,
scm_str2symbol, scm_mem2uninterned_symbol): Discouraged.
(SCM_SYMBOL_LENGTH, SCM_SYMBOL_CHARS, scm_c_symbol2str):
Deprecated.
(SCM_MAKE_SYMBOL_TAG, SCM_SET_SYMBOL_LENGTH, SCM_SET_SYMBOL_CHARS,
SCM_PROP_SLOTS, SCM_SET_PROP_SLOTS): Removed.
(scm_is_symbol, scm_from_locale_symbol, scm_from_locale_symboln):
New, to replace scm_str2symbol and scm_mem2symbol, respectively.
Updated all uses.
(scm_gensym): Generate only the number suffix in the buffer, just
string-append the prefix.
2004-08-19 16:49:42 +00:00
|
|
|
|
return SCM_CAR (SCM_CELL_OBJECT_3 (s));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_DEFINE (scm_symbol_pref, "symbol-pref", 1, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM s),
|
2012-01-11 23:33:01 -05:00
|
|
|
|
"Return the @dfn{property list} currently associated with the\n"
|
|
|
|
|
|
"symbol @var{s}.")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_symbol_pref
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2002-07-20 14:08:34 +00:00
|
|
|
|
SCM_VALIDATE_SYMBOL (1, s);
|
* strings.h, strings.c: (scm_i_string_chars, scm_i_string_length,
scm_i_string_writable_chars, scm_i_string_stop_writing): New, to
replace SCM_I_STRING_CHARS and SCM_I_STRING_LENGTH. Updated all
uses.
(scm_i_make_string, scm_c_make_string): New, to replace
scm_allocate_string. Updated all uses.
(SCM_STRINGP, SCM_STRING_CHARS, SCM_STRING_UCHARS,
SCM_STRING_LENGTH): Deprecated.
(scm_allocate_string, scm_take_str, scm_take0str, scm_mem2string,
scm_str2string, scm_makfrom0str, scm_makfrom0str_opt):
Discouraged. Replaced all uses with scm_from_locale_string or
similar, as appropriate.
(scm_c_string_length, scm_c_string_ref, scm_c_string_set_x,
scm_c_substring, scm_c_substring_shared, scm_c_substring_copy,
scm_substring_shared, scm_substring_copy): New.
* symbols.c, symbols.h (SCM_SYMBOLP, SCM_SYMBOL_FUNC,
SCM_SET_SYMBOL_FUNC, SCM_SYMBOL_PROPS, SCM_SET_SYMBOL_PROPS,
SCM_SYMBOL_HASH, SCM_SYMBOL_INTERNED_P, scm_mem2symbol,
scm_str2symbol, scm_mem2uninterned_symbol): Discouraged.
(SCM_SYMBOL_LENGTH, SCM_SYMBOL_CHARS, scm_c_symbol2str):
Deprecated.
(SCM_MAKE_SYMBOL_TAG, SCM_SET_SYMBOL_LENGTH, SCM_SET_SYMBOL_CHARS,
SCM_PROP_SLOTS, SCM_SET_PROP_SLOTS): Removed.
(scm_is_symbol, scm_from_locale_symbol, scm_from_locale_symboln):
New, to replace scm_str2symbol and scm_mem2symbol, respectively.
Updated all uses.
(scm_gensym): Generate only the number suffix in the buffer, just
string-append the prefix.
2004-08-19 16:49:42 +00:00
|
|
|
|
return SCM_CDR (SCM_CELL_OBJECT_3 (s));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_DEFINE (scm_symbol_fset_x, "symbol-fset!", 2, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM s, SCM val),
|
2012-01-11 23:33:01 -05:00
|
|
|
|
"Change the binding of the symbol @var{s}'s function slot.")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_symbol_fset_x
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2002-07-20 14:08:34 +00:00
|
|
|
|
SCM_VALIDATE_SYMBOL (1, s);
|
Attempt to mutate residualized literal pair throws exception
* libguile/validate.h (SCM_VALIDATE_MUTABLE_PAIR):
* libguile/pairs.h (scm_is_mutable_pair): New internal definitions.
* libguile/pairs.c (scm_set_car_x, scm_set_cdr_x): Validate mutable
pairs.
* libguile/alist.c (scm_assq_set_x, scm_assv_set_x, scm_assoc_set_x):
* libguile/list.c (scm_reverse_x, scm_list_set_x, scm_list_cdr_set_x):
* libguile/srcprop.c (scm_make_srcprops):
* libguile/srfi-1.c (scm_srfi1_append_reverse_x)
(scm_srfi1_delete_duplicates_x):
* libguile/symbols.c (scm_symbol_fset_x, scm_symbol_pset_x):
* libguile/sort.c (scm_merge_list_x): Use scm_set_car_x / scm_set_cdr_x
instead of the macros, so as to check for mutable pairs.
(SCM_VALIDATE_MUTABLE_LIST): New internal helper macro.
(scm_sort_x, scm_stable_sort_x, scm_sort_list_x): Use
SCM_VALIDATE_MUTABLE_LIST.
* libguile/vm-engine.c (VM_VALIDATE_MUTABLE_PAIR): New definition.
(set-car!, set-cdr!): Use VM_VALIDATE_MUTABLE_PAIR. Fix error message
for set-cdr!.
2017-04-17 11:26:17 +02:00
|
|
|
|
scm_set_car_x (SCM_CELL_OBJECT_3 (s), val);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return SCM_UNSPECIFIED;
|
|
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_DEFINE (scm_symbol_pset_x, "symbol-pset!", 2, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM s, SCM val),
|
2012-01-11 23:33:01 -05:00
|
|
|
|
"Change the binding of the symbol @var{s}'s property slot.")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_symbol_pset_x
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2002-07-20 14:08:34 +00:00
|
|
|
|
SCM_VALIDATE_SYMBOL (1, s);
|
Attempt to mutate residualized literal pair throws exception
* libguile/validate.h (SCM_VALIDATE_MUTABLE_PAIR):
* libguile/pairs.h (scm_is_mutable_pair): New internal definitions.
* libguile/pairs.c (scm_set_car_x, scm_set_cdr_x): Validate mutable
pairs.
* libguile/alist.c (scm_assq_set_x, scm_assv_set_x, scm_assoc_set_x):
* libguile/list.c (scm_reverse_x, scm_list_set_x, scm_list_cdr_set_x):
* libguile/srcprop.c (scm_make_srcprops):
* libguile/srfi-1.c (scm_srfi1_append_reverse_x)
(scm_srfi1_delete_duplicates_x):
* libguile/symbols.c (scm_symbol_fset_x, scm_symbol_pset_x):
* libguile/sort.c (scm_merge_list_x): Use scm_set_car_x / scm_set_cdr_x
instead of the macros, so as to check for mutable pairs.
(SCM_VALIDATE_MUTABLE_LIST): New internal helper macro.
(scm_sort_x, scm_stable_sort_x, scm_sort_list_x): Use
SCM_VALIDATE_MUTABLE_LIST.
* libguile/vm-engine.c (VM_VALIDATE_MUTABLE_PAIR): New definition.
(set-car!, set-cdr!): Use VM_VALIDATE_MUTABLE_PAIR. Fix error message
for set-cdr!.
2017-04-17 11:26:17 +02:00
|
|
|
|
scm_set_cdr_x (SCM_CELL_OBJECT_3 (s), val);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return SCM_UNSPECIFIED;
|
|
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
* strings.h, strings.c: (scm_i_string_chars, scm_i_string_length,
scm_i_string_writable_chars, scm_i_string_stop_writing): New, to
replace SCM_I_STRING_CHARS and SCM_I_STRING_LENGTH. Updated all
uses.
(scm_i_make_string, scm_c_make_string): New, to replace
scm_allocate_string. Updated all uses.
(SCM_STRINGP, SCM_STRING_CHARS, SCM_STRING_UCHARS,
SCM_STRING_LENGTH): Deprecated.
(scm_allocate_string, scm_take_str, scm_take0str, scm_mem2string,
scm_str2string, scm_makfrom0str, scm_makfrom0str_opt):
Discouraged. Replaced all uses with scm_from_locale_string or
similar, as appropriate.
(scm_c_string_length, scm_c_string_ref, scm_c_string_set_x,
scm_c_substring, scm_c_substring_shared, scm_c_substring_copy,
scm_substring_shared, scm_substring_copy): New.
* symbols.c, symbols.h (SCM_SYMBOLP, SCM_SYMBOL_FUNC,
SCM_SET_SYMBOL_FUNC, SCM_SYMBOL_PROPS, SCM_SET_SYMBOL_PROPS,
SCM_SYMBOL_HASH, SCM_SYMBOL_INTERNED_P, scm_mem2symbol,
scm_str2symbol, scm_mem2uninterned_symbol): Discouraged.
(SCM_SYMBOL_LENGTH, SCM_SYMBOL_CHARS, scm_c_symbol2str):
Deprecated.
(SCM_MAKE_SYMBOL_TAG, SCM_SET_SYMBOL_LENGTH, SCM_SET_SYMBOL_CHARS,
SCM_PROP_SLOTS, SCM_SET_PROP_SLOTS): Removed.
(scm_is_symbol, scm_from_locale_symbol, scm_from_locale_symboln):
New, to replace scm_str2symbol and scm_mem2symbol, respectively.
Updated all uses.
(scm_gensym): Generate only the number suffix in the buffer, just
string-append the prefix.
2004-08-19 16:49:42 +00:00
|
|
|
|
SCM
|
|
|
|
|
|
scm_from_locale_symbol (const char *sym)
|
2002-01-28 21:15:55 +00:00
|
|
|
|
{
|
2009-08-21 08:57:35 -07:00
|
|
|
|
return scm_from_locale_symboln (sym, -1);
|
2002-01-28 21:15:55 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
* strings.h, strings.c: (scm_i_string_chars, scm_i_string_length,
scm_i_string_writable_chars, scm_i_string_stop_writing): New, to
replace SCM_I_STRING_CHARS and SCM_I_STRING_LENGTH. Updated all
uses.
(scm_i_make_string, scm_c_make_string): New, to replace
scm_allocate_string. Updated all uses.
(SCM_STRINGP, SCM_STRING_CHARS, SCM_STRING_UCHARS,
SCM_STRING_LENGTH): Deprecated.
(scm_allocate_string, scm_take_str, scm_take0str, scm_mem2string,
scm_str2string, scm_makfrom0str, scm_makfrom0str_opt):
Discouraged. Replaced all uses with scm_from_locale_string or
similar, as appropriate.
(scm_c_string_length, scm_c_string_ref, scm_c_string_set_x,
scm_c_substring, scm_c_substring_shared, scm_c_substring_copy,
scm_substring_shared, scm_substring_copy): New.
* symbols.c, symbols.h (SCM_SYMBOLP, SCM_SYMBOL_FUNC,
SCM_SET_SYMBOL_FUNC, SCM_SYMBOL_PROPS, SCM_SET_SYMBOL_PROPS,
SCM_SYMBOL_HASH, SCM_SYMBOL_INTERNED_P, scm_mem2symbol,
scm_str2symbol, scm_mem2uninterned_symbol): Discouraged.
(SCM_SYMBOL_LENGTH, SCM_SYMBOL_CHARS, scm_c_symbol2str):
Deprecated.
(SCM_MAKE_SYMBOL_TAG, SCM_SET_SYMBOL_LENGTH, SCM_SET_SYMBOL_CHARS,
SCM_PROP_SLOTS, SCM_SET_PROP_SLOTS): Removed.
(scm_is_symbol, scm_from_locale_symbol, scm_from_locale_symboln):
New, to replace scm_str2symbol and scm_mem2symbol, respectively.
Updated all uses.
(scm_gensym): Generate only the number suffix in the buffer, just
string-append the prefix.
2004-08-19 16:49:42 +00:00
|
|
|
|
SCM
|
|
|
|
|
|
scm_from_locale_symboln (const char *sym, size_t len)
|
|
|
|
|
|
{
|
2009-08-21 08:57:35 -07:00
|
|
|
|
SCM str = scm_from_locale_stringn (sym, len);
|
|
|
|
|
|
return scm_i_str2symbol (str);
|
2006-01-24 20:30:09 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
|
|
|
|
|
scm_take_locale_symboln (char *sym, size_t len)
|
|
|
|
|
|
{
|
2009-08-21 08:57:35 -07:00
|
|
|
|
SCM str;
|
2006-01-24 20:30:09 +00:00
|
|
|
|
|
2009-08-21 08:57:35 -07:00
|
|
|
|
str = scm_take_locale_stringn (sym, len);
|
|
|
|
|
|
return scm_i_str2symbol (str);
|
2006-01-24 20:30:09 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
|
|
|
|
|
scm_take_locale_symbol (char *sym)
|
|
|
|
|
|
{
|
|
|
|
|
|
return scm_take_locale_symboln (sym, (size_t)-1);
|
* strings.h, strings.c: (scm_i_string_chars, scm_i_string_length,
scm_i_string_writable_chars, scm_i_string_stop_writing): New, to
replace SCM_I_STRING_CHARS and SCM_I_STRING_LENGTH. Updated all
uses.
(scm_i_make_string, scm_c_make_string): New, to replace
scm_allocate_string. Updated all uses.
(SCM_STRINGP, SCM_STRING_CHARS, SCM_STRING_UCHARS,
SCM_STRING_LENGTH): Deprecated.
(scm_allocate_string, scm_take_str, scm_take0str, scm_mem2string,
scm_str2string, scm_makfrom0str, scm_makfrom0str_opt):
Discouraged. Replaced all uses with scm_from_locale_string or
similar, as appropriate.
(scm_c_string_length, scm_c_string_ref, scm_c_string_set_x,
scm_c_substring, scm_c_substring_shared, scm_c_substring_copy,
scm_substring_shared, scm_substring_copy): New.
* symbols.c, symbols.h (SCM_SYMBOLP, SCM_SYMBOL_FUNC,
SCM_SET_SYMBOL_FUNC, SCM_SYMBOL_PROPS, SCM_SET_SYMBOL_PROPS,
SCM_SYMBOL_HASH, SCM_SYMBOL_INTERNED_P, scm_mem2symbol,
scm_str2symbol, scm_mem2uninterned_symbol): Discouraged.
(SCM_SYMBOL_LENGTH, SCM_SYMBOL_CHARS, scm_c_symbol2str):
Deprecated.
(SCM_MAKE_SYMBOL_TAG, SCM_SET_SYMBOL_LENGTH, SCM_SET_SYMBOL_CHARS,
SCM_PROP_SLOTS, SCM_SET_PROP_SLOTS): Removed.
(scm_is_symbol, scm_from_locale_symbol, scm_from_locale_symboln):
New, to replace scm_str2symbol and scm_mem2symbol, respectively.
Updated all uses.
(scm_gensym): Generate only the number suffix in the buffer, just
string-append the prefix.
2004-08-19 16:49:42 +00:00
|
|
|
|
}
|
2002-01-28 21:15:55 +00:00
|
|
|
|
|
2011-01-05 18:24:32 -06:00
|
|
|
|
SCM
|
|
|
|
|
|
scm_from_latin1_symbol (const char *sym)
|
|
|
|
|
|
{
|
|
|
|
|
|
return scm_from_latin1_symboln (sym, -1);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
|
|
|
|
|
scm_from_latin1_symboln (const char *sym, size_t len)
|
|
|
|
|
|
{
|
2011-01-07 09:03:12 -08:00
|
|
|
|
unsigned long hash;
|
|
|
|
|
|
SCM ret;
|
|
|
|
|
|
|
|
|
|
|
|
if (len == (size_t) -1)
|
|
|
|
|
|
len = strlen (sym);
|
|
|
|
|
|
hash = scm_i_latin1_string_hash (sym, len);
|
|
|
|
|
|
|
|
|
|
|
|
ret = lookup_interned_latin1_symbol (sym, len, hash);
|
|
|
|
|
|
if (scm_is_false (ret))
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM str = scm_from_latin1_stringn (sym, len);
|
|
|
|
|
|
ret = scm_i_str2symbol (str);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return ret;
|
2011-01-05 18:24:32 -06:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
|
|
|
|
|
scm_from_utf8_symbol (const char *sym)
|
|
|
|
|
|
{
|
|
|
|
|
|
return scm_from_utf8_symboln (sym, -1);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
|
|
|
|
|
scm_from_utf8_symboln (const char *sym, size_t len)
|
|
|
|
|
|
{
|
2011-10-25 17:32:50 +02:00
|
|
|
|
unsigned long hash;
|
|
|
|
|
|
SCM ret;
|
|
|
|
|
|
|
|
|
|
|
|
if (len == (size_t) -1)
|
|
|
|
|
|
len = strlen (sym);
|
|
|
|
|
|
hash = scm_i_utf8_string_hash (sym, len);
|
|
|
|
|
|
|
|
|
|
|
|
ret = lookup_interned_utf8_symbol (sym, len, hash);
|
|
|
|
|
|
if (scm_is_false (ret))
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM str = scm_from_utf8_stringn (sym, len);
|
|
|
|
|
|
ret = scm_i_str2symbol (str);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return ret;
|
2011-01-05 18:24:32 -06:00
|
|
|
|
}
|
|
|
|
|
|
|
2000-12-13 11:38:30 +00:00
|
|
|
|
void
|
|
|
|
|
|
scm_symbols_prehistory ()
|
|
|
|
|
|
{
|
2011-10-23 20:46:48 +02:00
|
|
|
|
symbols = scm_c_make_weak_set (5000);
|
2000-12-13 11:38:30 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
void
|
|
|
|
|
|
scm_init_symbols ()
|
|
|
|
|
|
{
|
2018-06-20 17:19:31 +02:00
|
|
|
|
#include "symbols.x"
|
2011-03-06 21:47:48 +01:00
|
|
|
|
|
|
|
|
|
|
default_gensym_prefix = scm_from_latin1_string (" g");
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|