mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 20:00:19 +02:00
(SCM_NUM2{SIZE,PTRDIFF,SHORT,USHORT,BITS,UBITS,INT,UINT}[_DEF]): new macros. * unif.h: type renaming: scm_array -> scm_array_t scm_array_dim -> scm_array_dim_t the old names are deprecated, all in-Guile uses changed. * tags.h (scm_ubits_t): new typedef, representing unsigned scm_bits_t. * stacks.h: type renaming: scm_info_frame -> scm_info_frame_t scm_stack -> scm_stack_t the old names are deprecated, all in-Guile uses changed. * srcprop.h: type renaming: scm_srcprops -> scm_srcprops_t scm_srcprops_chunk -> scm_srcprops_chunk_t the old names are deprecated, all in-Guile uses changed. * gsubr.c, procs.c, print.c, ports.c, read.c, rdelim.c, ramap.c, rw.c, smob.c, sort.c, srcprop.c, stacks.c, strings.c, strop.c, strorder.c, strports.c, struct.c, symbols.c, unif.c, values.c, vectors.c, vports.c, weaks.c: various int/size_t -> size_t/scm_bits_t changes. * random.h: type renaming: scm_rstate -> scm_rstate_t scm_rng -> scm_rng_t scm_i_rstate -> scm_i_rstate_t the old names are deprecated, all in-Guile uses changed. * procs.h: type renaming: scm_subr_entry -> scm_subr_entry_t the old name is deprecated, all in-Guile uses changed. * options.h (scm_option_t.val): unsigned long -> scm_bits_t. type renaming: scm_option -> scm_option_t the old name is deprecated, all in-Guile uses changed. * objects.c: various long -> scm_bits_t changes. (scm_i_make_class_object): flags: unsigned long -> scm_ubits_t * numbers.h (SCM_FIXNUM_BIT): deprecated, renamed to SCM_I_FIXNUM_BIT. * num2integral.i.c: new file, multiply included by numbers.c, used to "templatize" the various integral <-> num conversion routines. * numbers.c (scm_mkbig, scm_big2num, scm_adjbig, scm_normbig, scm_copybig, scm_2ulong2big, scm_dbl2big, scm_big2dbl): deprecated. (scm_i_mkbig, scm_i_big2inum, scm_i_adjbig, scm_i_normbig, scm_i_copybig, scm_i_short2big, scm_i_ushort2big, scm_i_int2big, scm_i_uint2big, scm_i_long2big, scm_i_ulong2big, scm_i_bits2big, scm_i_ubits2big, scm_i_size2big, scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big, scm_i_dbl2big, scm_i_big2dbl, scm_short2num, scm_ushort2num, scm_int2num, scm_uint2num, scm_bits2num, scm_ubits2num, scm_size2num, scm_ptrdiff2num, scm_num2short, scm_num2ushort, scm_num2int, scm_num2uint, scm_num2bits, scm_num2ubits, scm_num2ptrdiff, scm_num2size): new functions. * modules.c (scm_module_reverse_lookup): i, n: int -> scm_bits_t.x * load.c: change int -> size_t in various places (where the variable is used to store a string length). (search-path): call scm_done_free, not scm_done_malloc. * list.c (scm_ilength): return a scm_bits_t, not long. some other {int,long} -> scm_bits_t changes. * hashtab.c: various [u]int -> scm_bits_t changes. scm_ihashx_closure -> scm_ihashx_closure_t (and made a typedef). (scm_ihashx): n: uint -> scm_bits_t use scm_bits2num instead of scm_ulong2num. * gsubr.c: various int -> scm_bits_t changes. * gh_data.c (gh_scm2double): no loss of precision any more. * gh.h (gh_str2scm): len: int -> size_t (gh_{get,set}_substr): start: int -> scm_bits_t, len: int -> size_t (gh_<num>2scm): n: int -> scm_bits_t (gh_*vector_length): return scm_[u]size_t, not unsigned long. (gh_length): return scm_bits_t, not unsigned long. * fports.h: type renaming: scm_fport -> scm_fport_t the old name is deprecated, all in-Guile uses changed. * fports.c (fport_fill_input): count: int -> scm_bits_t (fport_flush): init_size, remaining, count: int -> scm_bits_t * debug.h (scm_lookup_cstr, scm_lookup_soft, scm_evstr): removed those prototypes, as the functions they prototype don't exist. * fports.c (default_buffer_size): int -> size_t (scm_fport_buffer_add): read_size, write_size: int -> scm_bits_t default_size: int -> size_t (scm_setvbuf): csize: int -> scm_bits_t * fluids.c (n_fluids): int -> scm_bits_t (grow_fluids): old_length, i: int -> scm_bits_t (next_fluid_num, scm_fluid_ref, scm_fluid_set_x): n: int -> scm_bits_t (scm_c_with_fluids): flen, vlen: int -> scm_bits_t * filesys.c (s_scm_open_fdes): changed calls to SCM_NUM2LONG to the new and shiny SCM_NUM2INT. * extensions.c: extension -> extension_t (and made a typedef). * eval.h (SCM_IFRAME): cast to scm_bits_t, not int. just so there are no nasty surprises if/when the various deeply magic tag bits move somewhere else. * eval.c: changed the locals used to store results of SCM_IFRAME, scm_ilength and such to be of type scm_bits_t (and not int/long). (iqq): depth, edepth: int -> scm_bits_t (scm_eval_stack): int -> scm_bits_t (SCM_CEVAL): various vars are not scm_bits_t instead of int. (check_map_args, scm_map, scm_for_each): len: long -> scm_bits_t i: int -> scm_bits_t * environments.c: changed the many calls to scm_ulong2num to scm_ubits2num. (import_environment_fold): proc_as_ul: ulong -> scm_ubits_t * dynwind.c (scm_dowinds): delta: long -> scm_bits_t * debug.h: type renaming: scm_debug_info -> scm_debug_info_t scm_debug_frame -> scm_debug_frame_t the old names are deprecated, all in-Guile uses changed. (scm_debug_eframe_size): int -> scm_bits_t * debug.c (scm_init_debug): use scm_c_define instead of the deprecated scm_define. * continuations.h: type renaming: scm_contregs -> scm_contregs_t the old name is deprecated, all in-Guile uses changed. (scm_contregs_t.num_stack_items): size_t -> scm_bits_t (scm_contregs_t.num_stack_items): ulong -> scm_ubits_t * continuations.c (scm_make_continuation): change the type of stack_size form long to scm_bits_t. * ports.h: type renaming: scm_port_rw_active -> scm_port_rw_active_t (and made a typedef) scm_port -> scm_port_t scm_ptob_descriptor -> scm_ptob_descriptor_t the old names are deprecated, all in-Guile uses changed. (scm_port_t.entry): int -> scm_bits_t. (scm_port_t.line_number): int -> long. (scm_port_t.putback_buf_size): int -> size_t. * __scm.h (long_long, ulong_long): deprecated (they pollute the global namespace and have little value besides that). (SCM_BITS_LENGTH): new, is the bit size of scm_bits_t (i.e. of an SCM handle). (ifdef spaghetti): include sys/types.h and sys/stdtypes.h, if they exist (for size_t & ptrdiff_t) (scm_sizet): deprecated. * Makefile.am (noinst_HEADERS): add num2integral.i.c
307 lines
8.9 KiB
C
307 lines
8.9 KiB
C
/* Copyright (C) 1995, 1996, 1999, 2000 Free Software Foundation, Inc.
|
||
*
|
||
* This program is free software; you can redistribute it and/or modify
|
||
* it under the terms of the GNU General Public License as published by
|
||
* the Free Software Foundation; either version 2, or (at your option)
|
||
* any later version.
|
||
*
|
||
* This program 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 General Public License for more details.
|
||
*
|
||
* You should have received a copy of the GNU General Public License
|
||
* along with this software; see the file COPYING. If not, write to
|
||
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
|
||
* Boston, MA 02111-1307 USA
|
||
*
|
||
* As a special exception, the Free Software Foundation gives permission
|
||
* for additional uses of the text contained in its release of GUILE.
|
||
*
|
||
* The exception is that, if you link the GUILE library with other files
|
||
* to produce an executable, this does not by itself cause the
|
||
* resulting executable to be covered by the GNU General Public License.
|
||
* Your use of that executable is in no way restricted on account of
|
||
* linking the GUILE library code into it.
|
||
*
|
||
* This exception does not however invalidate any other reasons why
|
||
* the executable file might be covered by the GNU General Public License.
|
||
*
|
||
* This exception applies only to the code released by the
|
||
* Free Software Foundation under the name GUILE. If you copy
|
||
* code from other Free Software Foundation releases into a copy of
|
||
* GUILE, as the General Public License permits, the exception does
|
||
* not apply to the code that you add in this way. To avoid misleading
|
||
* anyone as to the status of such modified files, you must delete
|
||
* this exception notice from them.
|
||
*
|
||
* If you write modifications of your own for GUILE, it is your choice
|
||
* whether to permit this exception to apply to your modifications.
|
||
* If you do not wish that, delete this exception notice. */
|
||
|
||
/* Software engineering face-lift by Greg J. Badros, 11-Dec-1999,
|
||
gjb@cs.washington.edu, http://www.cs.washington.edu/homes/gjb */
|
||
|
||
|
||
#include "libguile/_scm.h"
|
||
#include "libguile/chars.h"
|
||
#include "libguile/strings.h"
|
||
#include "libguile/symbols.h"
|
||
|
||
#include "libguile/validate.h"
|
||
#include "libguile/strorder.h"
|
||
|
||
|
||
SCM_DEFINE1 (scm_string_equal_p, "string=?", scm_tc7_rpsubr,
|
||
(SCM s1, SCM s2),
|
||
"Lexicographic equality predicate; return @code{#t} if the two\n"
|
||
"strings are the same length and contain the same characters in\n"
|
||
"the same positions, otherwise return @code{#f}.\n"
|
||
"\n"
|
||
"The procedure @code{string-ci=?} treats upper and lower case\n"
|
||
"letters as though they were the same character, but\n"
|
||
"@code{string=?} treats upper and lower case as distinct\n"
|
||
"characters.")
|
||
#define FUNC_NAME s_scm_string_equal_p
|
||
{
|
||
size_t length;
|
||
|
||
SCM_VALIDATE_STRING (1, s1);
|
||
SCM_VALIDATE_STRING (2, s2);
|
||
|
||
length = SCM_STRING_LENGTH (s2);
|
||
if (SCM_STRING_LENGTH (s1) == length)
|
||
{
|
||
unsigned char *c1 = SCM_STRING_UCHARS (s1) + length - 1;
|
||
unsigned char *c2 = SCM_STRING_UCHARS (s2) + length - 1;
|
||
size_t i;
|
||
|
||
/* comparing from back to front typically finds mismatches faster */
|
||
for (i = 0; i != length; ++i, --c1, --c2)
|
||
if (*c1 != *c2)
|
||
return SCM_BOOL_F;
|
||
|
||
return SCM_BOOL_T;
|
||
}
|
||
else
|
||
{
|
||
return SCM_BOOL_F;
|
||
}
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
|
||
SCM_DEFINE1 (scm_string_ci_equal_p, "string-ci=?", scm_tc7_rpsubr,
|
||
(SCM s1, SCM s2),
|
||
"Case-insensitive string equality predicate; return @code{#t} if\n"
|
||
"the two strings are the same length and their component\n"
|
||
"characters match (ignoring case) at each position; otherwise\n"
|
||
"return @code{#f}.")
|
||
#define FUNC_NAME s_scm_string_ci_equal_p
|
||
{
|
||
size_t length;
|
||
|
||
SCM_VALIDATE_STRING (1, s1);
|
||
SCM_VALIDATE_STRING (2, s2);
|
||
|
||
length = SCM_STRING_LENGTH (s2);
|
||
if (SCM_STRING_LENGTH (s1) == length)
|
||
{
|
||
unsigned char *c1 = SCM_STRING_UCHARS (s1) + length - 1;
|
||
unsigned char *c2 = SCM_STRING_UCHARS (s2) + length - 1;
|
||
size_t i;
|
||
|
||
/* comparing from back to front typically finds mismatches faster */
|
||
for (i = 0; i != length; ++i, --c1, --c2)
|
||
if (scm_upcase (*c1) != scm_upcase (*c2))
|
||
return SCM_BOOL_F;
|
||
|
||
return SCM_BOOL_T;
|
||
}
|
||
else
|
||
{
|
||
return SCM_BOOL_F;
|
||
}
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
|
||
/* Helper function for the lexicographic ordering predicates.
|
||
* No argument checking is performed. */
|
||
static SCM
|
||
string_less_p (SCM s1, SCM s2)
|
||
{
|
||
size_t i, length1, length2, lengthm;
|
||
unsigned char *c1, *c2;
|
||
|
||
length1 = SCM_STRING_LENGTH (s1);
|
||
length2 = SCM_STRING_LENGTH (s2);
|
||
lengthm = min (length1, length2);
|
||
c1 = SCM_STRING_UCHARS (s1);
|
||
c2 = SCM_STRING_UCHARS (s2);
|
||
|
||
for (i = 0; i != lengthm; ++i, ++c1, ++c2) {
|
||
int c = *c1 - *c2;
|
||
if (c < 0) return SCM_BOOL_T;
|
||
if (c > 0) return SCM_BOOL_F;
|
||
}
|
||
|
||
return SCM_BOOL (length1 < length2);
|
||
}
|
||
|
||
|
||
SCM_DEFINE1 (scm_string_less_p, "string<?", scm_tc7_rpsubr,
|
||
(SCM s1, SCM s2),
|
||
"Lexicographic ordering predicate; return @code{#t} if @var{s1}\n"
|
||
"is lexicographically less than @var{s2}.")
|
||
#define FUNC_NAME s_scm_string_less_p
|
||
{
|
||
SCM_VALIDATE_STRING (1, s1);
|
||
SCM_VALIDATE_STRING (2, s2);
|
||
|
||
return string_less_p (s1, s2);
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
|
||
SCM_DEFINE1 (scm_string_leq_p, "string<=?", scm_tc7_rpsubr,
|
||
(SCM s1, SCM s2),
|
||
"Lexicographic ordering predicate; return @code{#t} if @var{s1}\n"
|
||
"is lexicographically less than or equal to @var{s2}.")
|
||
#define FUNC_NAME s_scm_string_leq_p
|
||
{
|
||
SCM_VALIDATE_STRING (1, s1);
|
||
SCM_VALIDATE_STRING (2, s2);
|
||
|
||
return SCM_BOOL_NOT (string_less_p (s2, s1));
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
|
||
SCM_DEFINE1 (scm_string_gr_p, "string>?", scm_tc7_rpsubr,
|
||
(SCM s1, SCM s2),
|
||
"Lexicographic ordering predicate; return @code{#t} if @var{s1}\n"
|
||
"is lexicographically greater than @var{s2}.")
|
||
#define FUNC_NAME s_scm_string_gr_p
|
||
{
|
||
SCM_VALIDATE_STRING (1, s1);
|
||
SCM_VALIDATE_STRING (2, s2);
|
||
|
||
return string_less_p (s2, s1);
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
|
||
SCM_DEFINE1 (scm_string_geq_p, "string>=?", scm_tc7_rpsubr,
|
||
(SCM s1, SCM s2),
|
||
"Lexicographic ordering predicate; return @code{#t} if @var{s1}\n"
|
||
"is lexicographically greater than or equal to @var{s2}.")
|
||
#define FUNC_NAME s_scm_string_geq_p
|
||
{
|
||
SCM_VALIDATE_STRING (1, s1);
|
||
SCM_VALIDATE_STRING (2, s2);
|
||
|
||
return SCM_BOOL_NOT (string_less_p (s1, s2));
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
|
||
/* Helper function for the case insensitive lexicographic ordering
|
||
* predicates. No argument checking is performed. */
|
||
static SCM
|
||
string_ci_less_p (SCM s1, SCM s2)
|
||
{
|
||
size_t i, length1, length2, lengthm;
|
||
unsigned char *c1, *c2;
|
||
|
||
length1 = SCM_STRING_LENGTH (s1);
|
||
length2 = SCM_STRING_LENGTH (s2);
|
||
lengthm = min (length1, length2);
|
||
c1 = SCM_STRING_UCHARS (s1);
|
||
c2 = SCM_STRING_UCHARS (s2);
|
||
|
||
for (i = 0; i != lengthm; ++i, ++c1, ++c2) {
|
||
int c = scm_upcase (*c1) - scm_upcase (*c2);
|
||
if (c < 0) return SCM_BOOL_T;
|
||
if (c > 0) return SCM_BOOL_F;
|
||
}
|
||
|
||
return SCM_BOOL (length1 < length2);
|
||
}
|
||
|
||
|
||
SCM_DEFINE1 (scm_string_ci_less_p, "string-ci<?", scm_tc7_rpsubr,
|
||
(SCM s1, SCM s2),
|
||
"Case insensitive lexicographic ordering predicate; return\n"
|
||
"@code{#t} if @var{s1} is lexicographically less than @var{s2}\n"
|
||
"regardless of case.")
|
||
#define FUNC_NAME s_scm_string_ci_less_p
|
||
{
|
||
SCM_VALIDATE_STRING (1, s1);
|
||
SCM_VALIDATE_STRING (2, s2);
|
||
|
||
return string_ci_less_p (s1, s2);
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
|
||
SCM_DEFINE1 (scm_string_ci_leq_p, "string-ci<=?", scm_tc7_rpsubr,
|
||
(SCM s1, SCM s2),
|
||
"Case insensitive lexicographic ordering predicate; return\n"
|
||
"@code{#t} if @var{s1} is lexicographically less than or equal\n"
|
||
"to @var{s2} regardless of case.")
|
||
#define FUNC_NAME s_scm_string_ci_leq_p
|
||
{
|
||
SCM_VALIDATE_STRING (1, s1);
|
||
SCM_VALIDATE_STRING (2, s2);
|
||
|
||
return SCM_BOOL_NOT (string_ci_less_p (s2, s1));
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
|
||
SCM_DEFINE1 (scm_string_ci_gr_p, "string-ci>?", scm_tc7_rpsubr,
|
||
(SCM s1, SCM s2),
|
||
"Case insensitive lexicographic ordering predicate; return\n"
|
||
"@code{#t} if @var{s1} is lexicographically greater than\n"
|
||
"@var{s2} regardless of case.")
|
||
#define FUNC_NAME s_scm_string_ci_gr_p
|
||
{
|
||
SCM_VALIDATE_STRING (1, s1);
|
||
SCM_VALIDATE_STRING (2, s2);
|
||
|
||
return string_ci_less_p (s2, s1);
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
|
||
SCM_DEFINE1 (scm_string_ci_geq_p, "string-ci>=?", scm_tc7_rpsubr,
|
||
(SCM s1, SCM s2),
|
||
"Case insensitive lexicographic ordering predicate; return\n"
|
||
"@code{#t} if @var{s1} is lexicographically greater than or\n"
|
||
"equal to @var{s2} regardless of case.")
|
||
#define FUNC_NAME s_scm_string_ci_geq_p
|
||
{
|
||
SCM_VALIDATE_STRING (1, s1);
|
||
SCM_VALIDATE_STRING (2, s2);
|
||
|
||
return SCM_BOOL_NOT (string_ci_less_p (s1, s2));
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
|
||
|
||
void
|
||
scm_init_strorder ()
|
||
{
|
||
#ifndef SCM_MAGIC_SNARFER
|
||
#include "libguile/strorder.x"
|
||
#endif
|
||
}
|
||
|
||
|
||
/*
|
||
Local Variables:
|
||
c-file-style: "gnu"
|
||
End:
|
||
*/
|