1999-09-11 18:49:48 +00:00
|
|
|
|
/* Copyright (C) 1995,1996,1997,1998, 1999 Free Software Foundation, Inc.
|
1999-01-10 07:38:39 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
* 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
|
1997-05-26 22:34:48 +00:00
|
|
|
|
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
|
|
|
|
|
|
* Boston, MA 02111-1307 USA
|
1996-07-25 22:56:11 +00:00
|
|
|
|
*
|
|
|
|
|
|
* 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.
|
1997-05-26 22:34:48 +00:00
|
|
|
|
* If you do not wish that, delete this exception notice. */
|
1999-12-12 02:36:16 +00:00
|
|
|
|
|
|
|
|
|
|
/* Software engineering face-lift by Greg J. Badros, 11-Dec-1999,
|
|
|
|
|
|
gjb@cs.washington.edu, http://www.cs.washington.edu/homes/gjb */
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
|
#include <math.h>
|
|
|
|
|
|
#include "_scm.h"
|
C files should #include only the header files they need, not
libguile.h (which #includes all the header files); the pointless
recompilation was wasting my time.
* Makefile.in (all .o dependency lists): Regenerated.
* libguile.h: Don't try to get a definition for size_t here...
* __scm.h: Do it here.
* _scm.h: Since this is the internal libguile header, put things
here that all (or a majority) of the libguile files will want.
Don't #include <libguile.h> here; that generates dependencies on
way too much. Instead, get "__scm.h", "error.h", "pairs.h",
"list.h", "gc.h", "gsubr.h", "procs.h", "numbers.h", "symbols.h",
"boolean.h", "strings.h", "vectors.h", "root.h", "ports.h", and
"async.h".
* alist.c: Get "eq.h", "list.h", "alist.h".
* append.c: Get "append.h", "list.h".
* arbiters.c: Get "arbiters.h", "smob.h".
* async.c: Get "async.h", "smob.h", "throw.h", "eval.h".
* boolean.c: Get "boolean.h".
* chars.c: Get "chars.h".
* continuations.c: Get "continuations.h", "dynwind.h", "debug.h",
"stackchk.h".
* debug.c: Get "debug.h", "feature.h", "read.h", "strports.h",
"continuations.h", "alist.h", "srcprop.h", "procprop.h", "smob.h",
"genio.h", "throw.h", "eval.h".
* dynwind.c: Get "dynwind.h", "alist.h", "eval.h".
* eq.c: Get "eq.h", "unif.h", "smob.h", "strorder.h",
"stackchk.h".
* error.c: Get "error.h", "throw.h", "genio.h", "pairs.h".
* eval.c: Get "eval.h", "stackchk.h", "srcprop.h", "debug.h",
"hashtab.h", "procprop.h", "markers.h", "smob.h", "throw.h",
"continuations.h", "eq.h", "sequences.h", "alist.h", "append.h",
"debug.h".
* fdsocket.c: Get "fdsocket.h", "unif.h", "filesys.h".
* feature.c: Get "feature.h".
* files.c: Get "files.h".
* filesys.c: Get "filesys.h", "smob.h", "genio.h".
* fports.c: Get "fports.h", "markers.h".
* gc.c: Get "async.h", "unif.h", "smob.h", "weaks.h",
"genio.h", "struct.h", "stackchk.h", "stime.h".
* gdbint.c: Get "gdbint.h", "chars.h", "eval.h", "print.h",
"read.h", "strports.h", "tag.h".
* genio.c: Get "genio.h", "chars.h".
* gsubr.c: Get "gsubr.h", "genio.h".
* hash.c: Get "hash.h", "chars.h".
* hashtab.c: Get "hashtab.h", "eval.h", "hash.h", "alist.h".
* init.c: Get everyone who has an scm_init_mumble function:
"weaks.h", "vports.h", "version.h", "vectors.h", "variable.h",
"unif.h", "throw.h", "tag.h", "symbols.h", "struct.h",
"strports.h", "strorder.h", "strop.h", "strings.h", "stime.h",
"stackchk.h", "srcprop.h", "socket.h", "simpos.h", "sequences.h",
"scmsigs.h", "read.h", "ramap.h", "procs.h", "procprop.h",
"print.h", "posix.h", "ports.h", "pairs.h", "options.h",
"objprop.h", "numbers.h", "mbstrings.h", "mallocs.h", "load.h",
"list.h", "kw.h", "ioext.h", "hashtab.h", "hash.h", "gsubr.h",
"gdbint.h", "gc.h", "fports.h", "filesys.h", "files.h",
"feature.h", "fdsocket.h", "eval.h", "error.h", "eq.h",
"dynwind.h", "debug.h", "continuations.h", "chars.h", "boolean.h",
"async.h", "arbiters.h", "append.h", "alist.h".
* ioext.c: Get "ioext.h", "fports.h".
* kw.c: Get "kw.h", "smob.h", "mbstrings.h", "genio.h".
* list.c: Get "list.h", "eq.h".
* load.c: Get "load.h", "eval.h", "read.h", "fports.h".
* mallocs.c: Get "smob.h", "genio.h".
* markers.c: Get "markers.h".
* mbstrings.c: Get "mbstrings.h", "read.h", "genio.h", "unif.h",
"chars.h".
* numbers.c: Get "unif.h", "genio.h".
* objprop.c: Get "objprop.h", "weaks.h", "alist.h", "hashtab.h".
* options.c: Get "options.h".
* ports.c: Get "ports.h", "vports.h", "strports.h", "fports.h",
"markers.h", "chars.h", "genio.h".
* posix.c: Get "posix.h", "sequences.h", "feature.h", "unif.h",
"read.h", "scmsigs.h", "genio.h", "fports.h".
* print.c: Get "print.h", "unif.h", "weaks.h", "read.h",
"procprop.h", "eval.h", "smob.h", "mbstrings.h", "genio.h",
"chars.h".
* procprop.c: Get "procprop.h", "eval.h", "alist.h".
* procs.c: Get "procs.h".
* ramap.c: Get "ramap.h", "feature.h", "eval.h", "eq.h",
"chars.h", "smob.h", "unif.h".
* read.c: Get "alist.h", "kw.h", "mbstrings.h", "unif.h",
"eval.h", "genio.h", "chars.h".
* root.c: Get "root.h", "stackchk.h".
* scmsigs.c: Get "scmsigs.h".
* sequences.c: Get "sequences.h".
* simpos.c: Get "simpos.h", "scmsigs.h".
* smob.c: Get "smob.h".
* socket.c: Get "socket.h", "feature.h".
* srcprop.c: Get "srcprop.h", "weaks.h", "hashtab.h", "debug.h",
"alist.h", "smob.h".
* stackchk.c: Get "stackchk.h", "genio.h".
* stime.c: Get "stime.h"."libguile/continuations.h".
* strings.c: Get "strings.h", "chars.h".
* strop.c: Get "strop.h", "chars.h".
* strorder.c: Get "strorder.h", "chars.h".
* strports.c: Get "strports.h", "print.h", "eval.h", "unif.h".
* struct.c: Get "struct.h", "chars.h".
* symbols.c: Get "symbols.h", "mbstrings.h", "alist.h",
"variable.h", "eval.h", "chars.h".
* tag.c: Get "tag.h", "struct.h", "chars.h".
* throw.c: Get "throw.h", "continuations.h", "debug.h",
"dynwind.h", "eval.h", "alist.h", "smob.h", "genio.h".
* unif.c: Get "unif.h", "feature.h", "strop.h", "sequences.h",
"smob.h", "genio.h", "eval.h", "chars.h".
* variable.c: Get "variable.h", "smob.h", "genio.h".
* vectors.c: Get "vectors.h", "eq.h".
* version.c: Get "version.h".
* vports.c: Get "vports.h", "fports.h", "chars.h", "eval.h".
* weaks.c: Get "weaks.h".
1996-09-10 02:26:07 +00:00
|
|
|
|
#include "genio.h"
|
|
|
|
|
|
#include "unif.h"
|
1999-06-05 05:59:50 +00:00
|
|
|
|
#include "feature.h"
|
1999-07-07 09:44:01 +00:00
|
|
|
|
#include "smob.h"
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#include "scm_validate.h"
|
C files should #include only the header files they need, not
libguile.h (which #includes all the header files); the pointless
recompilation was wasting my time.
* Makefile.in (all .o dependency lists): Regenerated.
* libguile.h: Don't try to get a definition for size_t here...
* __scm.h: Do it here.
* _scm.h: Since this is the internal libguile header, put things
here that all (or a majority) of the libguile files will want.
Don't #include <libguile.h> here; that generates dependencies on
way too much. Instead, get "__scm.h", "error.h", "pairs.h",
"list.h", "gc.h", "gsubr.h", "procs.h", "numbers.h", "symbols.h",
"boolean.h", "strings.h", "vectors.h", "root.h", "ports.h", and
"async.h".
* alist.c: Get "eq.h", "list.h", "alist.h".
* append.c: Get "append.h", "list.h".
* arbiters.c: Get "arbiters.h", "smob.h".
* async.c: Get "async.h", "smob.h", "throw.h", "eval.h".
* boolean.c: Get "boolean.h".
* chars.c: Get "chars.h".
* continuations.c: Get "continuations.h", "dynwind.h", "debug.h",
"stackchk.h".
* debug.c: Get "debug.h", "feature.h", "read.h", "strports.h",
"continuations.h", "alist.h", "srcprop.h", "procprop.h", "smob.h",
"genio.h", "throw.h", "eval.h".
* dynwind.c: Get "dynwind.h", "alist.h", "eval.h".
* eq.c: Get "eq.h", "unif.h", "smob.h", "strorder.h",
"stackchk.h".
* error.c: Get "error.h", "throw.h", "genio.h", "pairs.h".
* eval.c: Get "eval.h", "stackchk.h", "srcprop.h", "debug.h",
"hashtab.h", "procprop.h", "markers.h", "smob.h", "throw.h",
"continuations.h", "eq.h", "sequences.h", "alist.h", "append.h",
"debug.h".
* fdsocket.c: Get "fdsocket.h", "unif.h", "filesys.h".
* feature.c: Get "feature.h".
* files.c: Get "files.h".
* filesys.c: Get "filesys.h", "smob.h", "genio.h".
* fports.c: Get "fports.h", "markers.h".
* gc.c: Get "async.h", "unif.h", "smob.h", "weaks.h",
"genio.h", "struct.h", "stackchk.h", "stime.h".
* gdbint.c: Get "gdbint.h", "chars.h", "eval.h", "print.h",
"read.h", "strports.h", "tag.h".
* genio.c: Get "genio.h", "chars.h".
* gsubr.c: Get "gsubr.h", "genio.h".
* hash.c: Get "hash.h", "chars.h".
* hashtab.c: Get "hashtab.h", "eval.h", "hash.h", "alist.h".
* init.c: Get everyone who has an scm_init_mumble function:
"weaks.h", "vports.h", "version.h", "vectors.h", "variable.h",
"unif.h", "throw.h", "tag.h", "symbols.h", "struct.h",
"strports.h", "strorder.h", "strop.h", "strings.h", "stime.h",
"stackchk.h", "srcprop.h", "socket.h", "simpos.h", "sequences.h",
"scmsigs.h", "read.h", "ramap.h", "procs.h", "procprop.h",
"print.h", "posix.h", "ports.h", "pairs.h", "options.h",
"objprop.h", "numbers.h", "mbstrings.h", "mallocs.h", "load.h",
"list.h", "kw.h", "ioext.h", "hashtab.h", "hash.h", "gsubr.h",
"gdbint.h", "gc.h", "fports.h", "filesys.h", "files.h",
"feature.h", "fdsocket.h", "eval.h", "error.h", "eq.h",
"dynwind.h", "debug.h", "continuations.h", "chars.h", "boolean.h",
"async.h", "arbiters.h", "append.h", "alist.h".
* ioext.c: Get "ioext.h", "fports.h".
* kw.c: Get "kw.h", "smob.h", "mbstrings.h", "genio.h".
* list.c: Get "list.h", "eq.h".
* load.c: Get "load.h", "eval.h", "read.h", "fports.h".
* mallocs.c: Get "smob.h", "genio.h".
* markers.c: Get "markers.h".
* mbstrings.c: Get "mbstrings.h", "read.h", "genio.h", "unif.h",
"chars.h".
* numbers.c: Get "unif.h", "genio.h".
* objprop.c: Get "objprop.h", "weaks.h", "alist.h", "hashtab.h".
* options.c: Get "options.h".
* ports.c: Get "ports.h", "vports.h", "strports.h", "fports.h",
"markers.h", "chars.h", "genio.h".
* posix.c: Get "posix.h", "sequences.h", "feature.h", "unif.h",
"read.h", "scmsigs.h", "genio.h", "fports.h".
* print.c: Get "print.h", "unif.h", "weaks.h", "read.h",
"procprop.h", "eval.h", "smob.h", "mbstrings.h", "genio.h",
"chars.h".
* procprop.c: Get "procprop.h", "eval.h", "alist.h".
* procs.c: Get "procs.h".
* ramap.c: Get "ramap.h", "feature.h", "eval.h", "eq.h",
"chars.h", "smob.h", "unif.h".
* read.c: Get "alist.h", "kw.h", "mbstrings.h", "unif.h",
"eval.h", "genio.h", "chars.h".
* root.c: Get "root.h", "stackchk.h".
* scmsigs.c: Get "scmsigs.h".
* sequences.c: Get "sequences.h".
* simpos.c: Get "simpos.h", "scmsigs.h".
* smob.c: Get "smob.h".
* socket.c: Get "socket.h", "feature.h".
* srcprop.c: Get "srcprop.h", "weaks.h", "hashtab.h", "debug.h",
"alist.h", "smob.h".
* stackchk.c: Get "stackchk.h", "genio.h".
* stime.c: Get "stime.h"."libguile/continuations.h".
* strings.c: Get "strings.h", "chars.h".
* strop.c: Get "strop.h", "chars.h".
* strorder.c: Get "strorder.h", "chars.h".
* strports.c: Get "strports.h", "print.h", "eval.h", "unif.h".
* struct.c: Get "struct.h", "chars.h".
* symbols.c: Get "symbols.h", "mbstrings.h", "alist.h",
"variable.h", "eval.h", "chars.h".
* tag.c: Get "tag.h", "struct.h", "chars.h".
* throw.c: Get "throw.h", "continuations.h", "debug.h",
"dynwind.h", "eval.h", "alist.h", "smob.h", "genio.h".
* unif.c: Get "unif.h", "feature.h", "strop.h", "sequences.h",
"smob.h", "genio.h", "eval.h", "chars.h".
* variable.c: Get "variable.h", "smob.h", "genio.h".
* vectors.c: Get "vectors.h", "eq.h".
* version.c: Get "version.h".
* vports.c: Get "vports.h", "fports.h", "chars.h", "eval.h".
* weaks.c: Get "weaks.h".
1996-09-10 02:26:07 +00:00
|
|
|
|
#include "numbers.h"
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
#define DIGITS '0':case '1':case '2':case '3':case '4':\
|
|
|
|
|
|
case '5':case '6':case '7':case '8':case '9'
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* IS_INF tests its floating point number for infiniteness
|
|
|
|
|
|
*/
|
|
|
|
|
|
#ifndef IS_INF
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#define IS_INF(x) ((x) == (x) / 2)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
|
1999-03-26 13:45:05 +00:00
|
|
|
|
/* Return true if X is not infinite and is not a NaN
|
|
|
|
|
|
*/
|
|
|
|
|
|
#ifndef isfinite
|
|
|
|
|
|
#define isfinite(x) (!IS_INF (x) && (x) == (x))
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
/* MAXEXP is the maximum double precision expontent
|
|
|
|
|
|
* FLTMAX is less than or scm_equal the largest single precision float
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef SCM_FLOATS
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#ifdef STDC_HEADERS
|
|
|
|
|
|
#ifndef GO32
|
|
|
|
|
|
#include <float.h>
|
|
|
|
|
|
#endif /* ndef GO32 */
|
|
|
|
|
|
#endif /* def STDC_HEADERS */
|
|
|
|
|
|
#ifdef DBL_MAX_10_EXP
|
|
|
|
|
|
#define MAXEXP DBL_MAX_10_EXP
|
|
|
|
|
|
#else
|
|
|
|
|
|
#define MAXEXP 308 /* IEEE doubles */
|
|
|
|
|
|
#endif /* def DBL_MAX_10_EXP */
|
|
|
|
|
|
#ifdef FLT_MAX
|
|
|
|
|
|
#define FLTMAX FLT_MAX
|
|
|
|
|
|
#else
|
|
|
|
|
|
#define FLTMAX 1e+23
|
|
|
|
|
|
#endif /* def FLT_MAX */
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif /* def SCM_FLOATS */
|
|
|
|
|
|
|
|
|
|
|
|
|
1999-01-10 07:38:39 +00:00
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_exact_p, "exact?", 1, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM x),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_exact_p
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_INUMP (x))
|
|
|
|
|
|
return SCM_BOOL_T;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#ifdef SCM_BIGDIG
|
1999-12-16 20:48:05 +00:00
|
|
|
|
if (SCM_BIGP (x))
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return SCM_BOOL_T;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_odd_p, "odd?", 1, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM n),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_odd_p
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_NINUMP (n))
|
|
|
|
|
|
{
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_VALIDATE_BIGINT (1,n);
|
1999-12-12 02:36:16 +00:00
|
|
|
|
return SCM_BOOL(1 & SCM_BDIGITS (n)[0]);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#else
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_VALIDATE_INUM (1,n);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
1999-12-12 02:36:16 +00:00
|
|
|
|
return SCM_BOOL(4 & (int) n);
|
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:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_even_p, "even?", 1, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM n),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_even_p
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_NINUMP (n))
|
|
|
|
|
|
{
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_VALIDATE_BIGINT (1,n);
|
1999-12-12 02:36:16 +00:00
|
|
|
|
return SCM_NEGATE_BOOL(1 & SCM_BDIGITS (n)[0]);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#else
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_VALIDATE_INUM (1,n);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
1999-12-12 02:36:16 +00:00
|
|
|
|
return SCM_NEGATE_BOOL(4 & (int) n);
|
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
|
|
|
|
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_GPROC (s_abs, "abs", 1, 0, 0, scm_abs, g_abs);
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_abs (SCM x)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_NINUMP (x))
|
|
|
|
|
|
{
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_GASSERT1 (SCM_BIGP (x), g_abs, x, SCM_ARG1, s_abs);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_TYP16 (x) == scm_tc16_bigpos)
|
|
|
|
|
|
return x;
|
|
|
|
|
|
return scm_copybig (x, 0);
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#else
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_GASSERT1 (SCM_INUMP (x), g_abs, x, SCM_ARG1, s_abs);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_INUM (x) >= 0)
|
|
|
|
|
|
return x;
|
|
|
|
|
|
x = - SCM_INUM (x);
|
|
|
|
|
|
if (!SCM_POSFIXABLE (x))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#ifdef SCM_BIGDIG
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return scm_long2big (x);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#else
|
* debug.c, unif.c: use scm_out_of_range instead of
wta for range errors (ASSERT still needs work).
* error.c, error.h (scm_out_of_range): new procedure.
* error.c, error.h (scm_out_of_range_key): new key.
* posix.c (scm_sync): #else was missing.
* error.c, error.h: append _key to names scm_num_overflow and
scm_system_error.
* __scm.h (SCM_SYSMISSING, SCM_NUM_OVERFLOW): use SCM_BOOL_F instead
of consing an empty list.
(SCM_SYSERROR etc.): move into error.c, make them procedures instead
of macros, saves code and string space.
error.c, fports.c, numbers.c, posix.c, ioext.c, filesys.c, socket.c,
fdsocket.c, simpos.c: change names of SCM_SYSERROR etc., to
lower case. Rename scm_syserror_m to scm_syserror_msg.
error.h: prototypes for new procedures.
1996-09-15 06:41:31 +00:00
|
|
|
|
scm_num_overflow (s_abs);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return SCM_MAKINUM (x);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_GPROC (s_quotient, "quotient", 2, 0, 0, scm_quotient, g_quotient);
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_quotient (SCM x, SCM y)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
register long z;
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_NINUMP (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
long w;
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_GASSERT2 (SCM_BIGP (x),
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
g_quotient, x, y, SCM_ARG1, s_quotient);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_NINUMP (y))
|
|
|
|
|
|
{
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_ASRTGO (SCM_BIGP (y), bady);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return scm_divbigbig (SCM_BDIGITS (x), SCM_NUMDIGS (x),
|
|
|
|
|
|
SCM_BDIGITS (y), SCM_NUMDIGS (y),
|
|
|
|
|
|
SCM_BIGSIGN (x) ^ SCM_BIGSIGN (y), 2);
|
|
|
|
|
|
}
|
|
|
|
|
|
z = SCM_INUM (y);
|
|
|
|
|
|
SCM_ASRTGO (z, ov);
|
|
|
|
|
|
if (1 == z)
|
|
|
|
|
|
return x;
|
|
|
|
|
|
if (z < 0)
|
|
|
|
|
|
z = -z;
|
|
|
|
|
|
if (z < SCM_BIGRAD)
|
|
|
|
|
|
{
|
|
|
|
|
|
w = scm_copybig (x, SCM_BIGSIGN (x) ? (y > 0) : (y < 0));
|
|
|
|
|
|
scm_divbigdig (SCM_BDIGITS (w), SCM_NUMDIGS (w), (SCM_BIGDIG) z);
|
|
|
|
|
|
return scm_normbig (w);
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#ifndef SCM_DIGSTOOBIG
|
1999-01-10 07:38:39 +00:00
|
|
|
|
w = scm_pseudolong (z);
|
|
|
|
|
|
return scm_divbigbig (SCM_BDIGITS (x), SCM_NUMDIGS (x),
|
|
|
|
|
|
(SCM_BIGDIG *) & w, SCM_DIGSPERLONG,
|
|
|
|
|
|
SCM_BIGSIGN (x) ? (y > 0) : (y < 0), 2);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#else
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM_BIGDIG zdigs[SCM_DIGSPERLONG];
|
|
|
|
|
|
scm_longdigs (z, zdigs);
|
|
|
|
|
|
return scm_divbigbig (SCM_BDIGITS (x), SCM_NUMDIGS (x),
|
|
|
|
|
|
zdigs, SCM_DIGSPERLONG,
|
|
|
|
|
|
SCM_BIGSIGN (x) ? (y > 0) : (y < 0), 2);
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_NINUMP (y))
|
|
|
|
|
|
{
|
1999-12-16 20:48:05 +00:00
|
|
|
|
if (!SCM_BIGP (y))
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
|
|
|
|
|
bady:
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_quotient, x, y, SCM_ARG2, s_quotient);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
return SCM_INUM0;
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#else
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_GASSERT2 (SCM_INUMP (x), g_quotient, x, y, SCM_ARG1, s_quotient);
|
|
|
|
|
|
SCM_GASSERT2 (SCM_INUMP (y), g_quotient, x, y, SCM_ARG2, s_quotient);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if ((z = SCM_INUM (y)) == 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
ov:
|
|
|
|
|
|
scm_num_overflow (s_quotient);
|
|
|
|
|
|
}
|
|
|
|
|
|
z = SCM_INUM (x) / z;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#ifdef BADIVSGNS
|
|
|
|
|
|
{
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#if (__TURBOC__ == 1)
|
|
|
|
|
|
long t = ((y < 0) ? -SCM_INUM (x) : SCM_INUM (x)) % SCM_INUM (y);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#else
|
1999-01-10 07:38:39 +00:00
|
|
|
|
long t = SCM_INUM (x) % SCM_INUM (y);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (t == 0);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
else if (t < 0)
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (x < 0);
|
|
|
|
|
|
else
|
|
|
|
|
|
z--;
|
|
|
|
|
|
else if (x < 0)
|
|
|
|
|
|
z++;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
#endif
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (!SCM_FIXABLE (z))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#ifdef SCM_BIGDIG
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return scm_long2big (z);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#else
|
* debug.c, unif.c: use scm_out_of_range instead of
wta for range errors (ASSERT still needs work).
* error.c, error.h (scm_out_of_range): new procedure.
* error.c, error.h (scm_out_of_range_key): new key.
* posix.c (scm_sync): #else was missing.
* error.c, error.h: append _key to names scm_num_overflow and
scm_system_error.
* __scm.h (SCM_SYSMISSING, SCM_NUM_OVERFLOW): use SCM_BOOL_F instead
of consing an empty list.
(SCM_SYSERROR etc.): move into error.c, make them procedures instead
of macros, saves code and string space.
error.c, fports.c, numbers.c, posix.c, ioext.c, filesys.c, socket.c,
fdsocket.c, simpos.c: change names of SCM_SYSERROR etc., to
lower case. Rename scm_syserror_m to scm_syserror_msg.
error.h: prototypes for new procedures.
1996-09-15 06:41:31 +00:00
|
|
|
|
scm_num_overflow (s_quotient);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return SCM_MAKINUM (z);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_GPROC (s_remainder, "remainder", 2, 0, 0, scm_remainder, g_remainder);
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_remainder (SCM x, SCM y)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
register long z;
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_NINUMP (x))
|
|
|
|
|
|
{
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_GASSERT2 (SCM_BIGP (x),
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
g_remainder, x, y, SCM_ARG1, s_remainder);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_NINUMP (y))
|
|
|
|
|
|
{
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_ASRTGO (SCM_BIGP (y), bady);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return scm_divbigbig (SCM_BDIGITS (x), SCM_NUMDIGS (x),
|
|
|
|
|
|
SCM_BDIGITS (y), SCM_NUMDIGS (y),
|
|
|
|
|
|
SCM_BIGSIGN (x), 0);
|
|
|
|
|
|
}
|
|
|
|
|
|
if (!(z = SCM_INUM (y)))
|
|
|
|
|
|
goto ov;
|
|
|
|
|
|
return scm_divbigint (x, z, SCM_BIGSIGN (x), 0);
|
|
|
|
|
|
}
|
|
|
|
|
|
if (SCM_NINUMP (y))
|
|
|
|
|
|
{
|
1999-12-16 20:48:05 +00:00
|
|
|
|
if (!SCM_BIGP (y))
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
|
|
|
|
|
bady:
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_remainder, x, y, SCM_ARG2, s_remainder);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
return x;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
#else
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_GASSERT2 (SCM_INUMP (x), g_remainder, x, y, SCM_ARG1, s_remainder);
|
|
|
|
|
|
SCM_GASSERT2 (SCM_INUMP (y), g_remainder, x, y, SCM_ARG2, s_remainder);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (!(z = SCM_INUM (y)))
|
|
|
|
|
|
{
|
|
|
|
|
|
ov:
|
|
|
|
|
|
scm_num_overflow (s_remainder);
|
|
|
|
|
|
}
|
|
|
|
|
|
#if (__TURBOC__ == 1)
|
|
|
|
|
|
if (z < 0)
|
|
|
|
|
|
z = -z;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
1999-01-10 07:38:39 +00:00
|
|
|
|
z = SCM_INUM (x) % z;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#ifdef BADIVSGNS
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (!z);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
else if (z < 0)
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (x < 0);
|
|
|
|
|
|
else
|
|
|
|
|
|
z += SCM_INUM (y);
|
|
|
|
|
|
else if (x < 0)
|
|
|
|
|
|
z -= SCM_INUM (y);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return SCM_MAKINUM (z);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_GPROC (s_modulo, "modulo", 2, 0, 0, scm_modulo, g_modulo);
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_modulo (SCM x, SCM y)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
register long yy, z;
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_NINUMP (x))
|
|
|
|
|
|
{
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_GASSERT2 (SCM_BIGP (x),
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
g_modulo, x, y, SCM_ARG1, s_modulo);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_NINUMP (y))
|
|
|
|
|
|
{
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_ASRTGO (SCM_BIGP (y), bady);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return scm_divbigbig (SCM_BDIGITS (x), SCM_NUMDIGS (x),
|
|
|
|
|
|
SCM_BDIGITS (y), SCM_NUMDIGS (y),
|
|
|
|
|
|
SCM_BIGSIGN (y),
|
|
|
|
|
|
(SCM_BIGSIGN (x) ^ SCM_BIGSIGN (y)) ? 1 : 0);
|
|
|
|
|
|
}
|
|
|
|
|
|
if (!(z = SCM_INUM (y)))
|
|
|
|
|
|
goto ov;
|
|
|
|
|
|
return scm_divbigint (x, z, y < 0,
|
|
|
|
|
|
(SCM_BIGSIGN (x) ? (y > 0) : (y < 0)) ? 1 : 0);
|
|
|
|
|
|
}
|
|
|
|
|
|
if (SCM_NINUMP (y))
|
|
|
|
|
|
{
|
1999-12-16 20:48:05 +00:00
|
|
|
|
if (!SCM_BIGP (y))
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
|
|
|
|
|
bady:
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_modulo, x, y, SCM_ARG2, s_modulo);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
return (SCM_BIGSIGN (y) ? (x > 0) : (x < 0)) ? scm_sum (x, y) : x;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
#else
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_GASSERT1 (SCM_INUMP (x), g_modulo, x, y, SCM_ARG1, s_modulo);
|
|
|
|
|
|
SCM_GASSERT2 (SCM_INUMP (y), g_modulo, x, y, SCM_ARG2, s_modulo);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (!(yy = SCM_INUM (y)))
|
|
|
|
|
|
{
|
|
|
|
|
|
ov:
|
|
|
|
|
|
scm_num_overflow (s_modulo);
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#if (__TURBOC__==1)
|
1999-01-10 07:38:39 +00:00
|
|
|
|
z = SCM_INUM (x);
|
|
|
|
|
|
z = ((yy < 0) ? -z : z) % yy;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#else
|
1999-01-10 07:38:39 +00:00
|
|
|
|
z = SCM_INUM (x) % yy;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return SCM_MAKINUM (((yy < 0) ? (z > 0) : (z < 0)) ? z + yy : z);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_GPROC1 (s_gcd, "gcd", scm_tc7_asubr, scm_gcd, g_gcd);
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_gcd (SCM x, SCM y)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
register long u, v, k, t;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_UNBNDP (y))
|
|
|
|
|
|
return SCM_UNBNDP (x) ? SCM_INUM0 : x;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
tailrec:
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_NINUMP (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
big_gcd:
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_GASSERT2 (SCM_BIGP (x),
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
g_gcd, x, y, SCM_ARG1, s_gcd);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_BIGSIGN (x))
|
|
|
|
|
|
x = scm_copybig (x, 0);
|
|
|
|
|
|
newy:
|
|
|
|
|
|
if (SCM_NINUMP (y))
|
|
|
|
|
|
{
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_GASSERT2 (SCM_BIGP (y),
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
g_gcd, x, y, SCM_ARGn, s_gcd);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_BIGSIGN (y))
|
|
|
|
|
|
y = scm_copybig (y, 0);
|
|
|
|
|
|
switch (scm_bigcomp (x, y))
|
|
|
|
|
|
{
|
|
|
|
|
|
case -1:
|
|
|
|
|
|
swaprec:
|
|
|
|
|
|
t = scm_remainder (x, y);
|
|
|
|
|
|
x = y;
|
|
|
|
|
|
y = t;
|
|
|
|
|
|
goto tailrec;
|
|
|
|
|
|
case 0:
|
|
|
|
|
|
return x;
|
|
|
|
|
|
case 1:
|
|
|
|
|
|
y = scm_remainder (y, x);
|
|
|
|
|
|
goto newy;
|
|
|
|
|
|
}
|
|
|
|
|
|
/* instead of the switch, we could just
|
|
|
|
|
|
return scm_gcd (y, scm_modulo (x, y)); */
|
|
|
|
|
|
}
|
|
|
|
|
|
if (SCM_INUM0 == y)
|
|
|
|
|
|
return x;
|
|
|
|
|
|
goto swaprec;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_NINUMP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
t = x;
|
|
|
|
|
|
x = y;
|
|
|
|
|
|
y = t;
|
|
|
|
|
|
goto big_gcd;
|
|
|
|
|
|
}
|
|
|
|
|
|
#else
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_GASSERT2 (SCM_INUMP (x), g_gcd, x, y, SCM_ARG1, s_gcd);
|
|
|
|
|
|
SCM_GASSERT2 (SCM_INUMP (y), g_gcd, x, y, SCM_ARGn, s_gcd);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
u = SCM_INUM (x);
|
|
|
|
|
|
if (u < 0)
|
|
|
|
|
|
u = -u;
|
|
|
|
|
|
v = SCM_INUM (y);
|
|
|
|
|
|
if (v < 0)
|
|
|
|
|
|
v = -v;
|
|
|
|
|
|
else if (0 == v)
|
|
|
|
|
|
goto getout;
|
|
|
|
|
|
if (0 == u)
|
|
|
|
|
|
{
|
|
|
|
|
|
u = v;
|
|
|
|
|
|
goto getout;
|
|
|
|
|
|
}
|
|
|
|
|
|
for (k = 1; !(1 & ((int) u | (int) v)); k <<= 1, u >>= 1, v >>= 1);
|
|
|
|
|
|
if (1 & (int) u)
|
|
|
|
|
|
t = -v;
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
t = u;
|
|
|
|
|
|
b3:
|
|
|
|
|
|
t = SCM_SRS (t, 1);
|
|
|
|
|
|
}
|
|
|
|
|
|
if (!(1 & (int) t))
|
|
|
|
|
|
goto b3;
|
|
|
|
|
|
if (t > 0)
|
|
|
|
|
|
u = t;
|
|
|
|
|
|
else
|
|
|
|
|
|
v = -t;
|
|
|
|
|
|
if ((t = u - v))
|
|
|
|
|
|
goto b3;
|
|
|
|
|
|
u = u * k;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
getout:
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (!SCM_POSFIXABLE (u))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#ifdef SCM_BIGDIG
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return scm_long2big (u);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#else
|
* debug.c, unif.c: use scm_out_of_range instead of
wta for range errors (ASSERT still needs work).
* error.c, error.h (scm_out_of_range): new procedure.
* error.c, error.h (scm_out_of_range_key): new key.
* posix.c (scm_sync): #else was missing.
* error.c, error.h: append _key to names scm_num_overflow and
scm_system_error.
* __scm.h (SCM_SYSMISSING, SCM_NUM_OVERFLOW): use SCM_BOOL_F instead
of consing an empty list.
(SCM_SYSERROR etc.): move into error.c, make them procedures instead
of macros, saves code and string space.
error.c, fports.c, numbers.c, posix.c, ioext.c, filesys.c, socket.c,
fdsocket.c, simpos.c: change names of SCM_SYSERROR etc., to
lower case. Rename scm_syserror_m to scm_syserror_msg.
error.h: prototypes for new procedures.
1996-09-15 06:41:31 +00:00
|
|
|
|
scm_num_overflow (s_gcd);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return SCM_MAKINUM (u);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_GPROC1 (s_lcm, "lcm", scm_tc7_asubr, scm_lcm, g_lcm);
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_lcm (SCM n1, SCM n2)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM d;
|
1999-08-29 18:15:09 +00:00
|
|
|
|
#ifndef SCM_BIGDIG
|
1999-08-29 19:26:53 +00:00
|
|
|
|
SCM_GASSERT2 (SCM_INUMP (n1) || SCM_UNBNDP (n1),
|
|
|
|
|
|
g_lcm, n1, n2, SCM_ARG1, s_lcm);
|
1999-08-29 18:15:09 +00:00
|
|
|
|
SCM_GASSERT2 (SCM_INUMP (n2) || SCM_UNBNDP (n2),
|
|
|
|
|
|
g_lcm, n1, n2, SCM_ARGn, s_lcm);
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
#else
|
1999-08-29 19:26:53 +00:00
|
|
|
|
SCM_GASSERT2 (SCM_INUMP (n1)
|
|
|
|
|
|
|| SCM_UNBNDP (n1)
|
1999-12-16 20:48:05 +00:00
|
|
|
|
|| (SCM_BIGP (n1)),
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
g_lcm, n1, n2, SCM_ARG1, s_lcm);
|
1999-08-29 18:15:09 +00:00
|
|
|
|
SCM_GASSERT2 (SCM_INUMP (n2)
|
|
|
|
|
|
|| SCM_UNBNDP (n2)
|
1999-12-16 20:48:05 +00:00
|
|
|
|
|| (SCM_BIGP (n2)),
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
g_lcm, n1, n2, SCM_ARGn, s_lcm);
|
|
|
|
|
|
#endif
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_UNBNDP (n2))
|
|
|
|
|
|
{
|
|
|
|
|
|
n2 = SCM_MAKINUM (1L);
|
|
|
|
|
|
if (SCM_UNBNDP (n1))
|
|
|
|
|
|
return n2;
|
|
|
|
|
|
}
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
|
1999-01-10 07:38:39 +00:00
|
|
|
|
d = scm_gcd (n1, n2);
|
|
|
|
|
|
if (SCM_INUM0 == d)
|
|
|
|
|
|
return d;
|
|
|
|
|
|
return scm_abs (scm_product (n1, scm_quotient (n2, d)));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#ifndef SCM_BIGDIG
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#ifndef SCM_FLOATS
|
|
|
|
|
|
#define scm_long2num SCM_MAKINUM
|
|
|
|
|
|
#endif
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
#ifndef scm_long2num
|
2000-01-06 19:51:45 +00:00
|
|
|
|
SCM_DEFINE1 (scm_logand, "logand", scm_tc7_asubr,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM n1, SCM n2),
|
1999-12-13 03:40:23 +00:00
|
|
|
|
"Returns the integer which is the bit-wise AND of the two integer
|
|
|
|
|
|
arguments.
|
|
|
|
|
|
|
|
|
|
|
|
Example:
|
|
|
|
|
|
@lisp
|
|
|
|
|
|
(number->string (logand #b1100 #b1010) 2)
|
|
|
|
|
|
@result{} \"1000\"")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_logand
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-12-12 02:36:16 +00:00
|
|
|
|
int i1, i2;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_UNBNDP (n2))
|
1997-09-01 20:41:31 +00:00
|
|
|
|
{
|
|
|
|
|
|
if (SCM_UNBNDP (n1))
|
|
|
|
|
|
return SCM_MAKINUM (-1);
|
|
|
|
|
|
return n1;
|
|
|
|
|
|
}
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_VALIDATE_INUM_COPY (1,n1,i1);
|
|
|
|
|
|
SCM_VALIDATE_INUM_COPY (2,n2,i2);
|
1999-12-12 02:36:16 +00:00
|
|
|
|
return scm_ulong2num (i1 & i2);
|
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-06 19:51:45 +00:00
|
|
|
|
SCM_DEFINE1 (scm_logior, "logior", scm_tc7_asubr,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM n1, SCM n2),
|
1999-12-13 03:40:23 +00:00
|
|
|
|
"Returns the integer which is the bit-wise OR of the two integer
|
|
|
|
|
|
arguments.
|
|
|
|
|
|
|
|
|
|
|
|
Example:
|
|
|
|
|
|
@lisp
|
|
|
|
|
|
(number->string (logior #b1100 #b1010) 2)
|
|
|
|
|
|
@result{} \"1110\"
|
|
|
|
|
|
@end lisp")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_logior
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-12-12 02:36:16 +00:00
|
|
|
|
int i1, i2;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_UNBNDP (n2))
|
1997-09-01 20:41:31 +00:00
|
|
|
|
{
|
|
|
|
|
|
if (SCM_UNBNDP (n1))
|
|
|
|
|
|
return SCM_INUM0;
|
|
|
|
|
|
return n1;
|
|
|
|
|
|
}
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_VALIDATE_INUM_COPY (1,n1,i1);
|
|
|
|
|
|
SCM_VALIDATE_INUM_COPY (2,n2,i2);
|
1999-12-12 02:36:16 +00:00
|
|
|
|
return scm_ulong2num (i1 | i2);
|
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-06 19:51:45 +00:00
|
|
|
|
SCM_DEFINE1 (scm_logxor, "logxor", scm_tc7_asubr,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM n1, SCM n2),
|
1999-12-13 03:40:23 +00:00
|
|
|
|
"Returns the integer which is the bit-wise XOR of the two integer
|
|
|
|
|
|
arguments.
|
|
|
|
|
|
|
|
|
|
|
|
Example:
|
|
|
|
|
|
@lisp
|
|
|
|
|
|
(number->string (logxor #b1100 #b1010) 2)
|
|
|
|
|
|
@result{} \"110\"
|
|
|
|
|
|
@end lisp")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_logxor
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-12-12 02:36:16 +00:00
|
|
|
|
int i1, i2;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_UNBNDP (n2))
|
1997-09-01 20:41:31 +00:00
|
|
|
|
{
|
|
|
|
|
|
if (SCM_UNBNDP (n1))
|
|
|
|
|
|
return SCM_INUM0;
|
|
|
|
|
|
return n1;
|
|
|
|
|
|
}
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_VALIDATE_INUM_COPY (1,n1,i1);
|
|
|
|
|
|
SCM_VALIDATE_INUM_COPY (2,n2,i2);
|
1999-12-12 02:36:16 +00:00
|
|
|
|
return scm_ulong2num (i1 ^ i2);
|
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:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_logtest, "logtest", 2, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM n1, SCM n2),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_logtest
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-12-12 02:36:16 +00:00
|
|
|
|
int i1, i2;
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_VALIDATE_INUM_COPY (1,n1,i1);
|
|
|
|
|
|
SCM_VALIDATE_INUM_COPY (2,n2,i2);
|
1999-12-12 02:36:16 +00:00
|
|
|
|
return SCM_BOOL(i1 & i2);
|
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:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_logbit_p, "logbit?", 2, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM n1, SCM n2),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_logbit_p
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-12-12 02:36:16 +00:00
|
|
|
|
int i1, i2;
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_VALIDATE_INUM_COPY (1,n1,i1);
|
|
|
|
|
|
SCM_VALIDATE_INUM_COPY (2,n2,i2);
|
1999-12-12 02:36:16 +00:00
|
|
|
|
return SCM_BOOL((1 << i1) & i2);
|
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
|
|
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
|
|
2000-01-06 19:51:45 +00:00
|
|
|
|
SCM_DEFINE1 (scm_logand, "logand", scm_tc7_asubr,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM n1, SCM n2),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_logand
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-12-12 02:36:16 +00:00
|
|
|
|
int i1, i2;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_UNBNDP (n2))
|
1997-09-01 20:41:31 +00:00
|
|
|
|
{
|
|
|
|
|
|
if (SCM_UNBNDP (n1))
|
|
|
|
|
|
return SCM_MAKINUM (-1);
|
|
|
|
|
|
return n1;
|
|
|
|
|
|
}
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_VALIDATE_INUM_COPY (1,n1,i1);
|
|
|
|
|
|
SCM_VALIDATE_INUM_COPY (2,n2,i2);
|
1999-12-12 02:36:16 +00:00
|
|
|
|
return SCM_MAKINUM (i1 & i2);
|
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-06 19:51:45 +00:00
|
|
|
|
SCM_DEFINE1 (scm_logior, "logior", scm_tc7_asubr,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM n1, SCM n2),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_logior
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-12-12 02:36:16 +00:00
|
|
|
|
int i1, i2;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_UNBNDP (n2))
|
1997-09-01 20:41:31 +00:00
|
|
|
|
{
|
|
|
|
|
|
if (SCM_UNBNDP (n1))
|
|
|
|
|
|
return SCM_INUM0;
|
|
|
|
|
|
return n1;
|
|
|
|
|
|
}
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_VALIDATE_INUM_COPY (1,n1,i1);
|
|
|
|
|
|
SCM_VALIDATE_INUM_COPY (2,n2,i2);
|
1999-12-12 02:36:16 +00:00
|
|
|
|
return SCM_MAKINUM (i1 | i2);
|
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-06 19:51:45 +00:00
|
|
|
|
SCM_DEFINE1 (scm_logxor, "logxor", scm_tc7_asubr,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM n1, SCM n2),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_logxor
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-12-12 02:36:16 +00:00
|
|
|
|
int i1, i2;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_UNBNDP (n2))
|
1997-09-01 20:41:31 +00:00
|
|
|
|
{
|
|
|
|
|
|
if (SCM_UNBNDP (n1))
|
|
|
|
|
|
return SCM_INUM0;
|
|
|
|
|
|
return n1;
|
|
|
|
|
|
}
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_VALIDATE_INUM_COPY (1,n1,i1);
|
|
|
|
|
|
SCM_VALIDATE_INUM_COPY (2,n2,i2);
|
1999-12-12 02:36:16 +00:00
|
|
|
|
return SCM_MAKINUM (i1 ^ i2);
|
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:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_logtest, "logtest", 2, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM n1, SCM n2),
|
1999-12-13 03:40:23 +00:00
|
|
|
|
"@example
|
|
|
|
|
|
(logtest j k) @equiv{} (not (zero? (logand j k)))
|
|
|
|
|
|
|
|
|
|
|
|
(logtest #b0100 #b1011) @result{} #f
|
|
|
|
|
|
(logtest #b0100 #b0111) @result{} #t
|
|
|
|
|
|
@end example")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_logtest
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-12-12 02:36:16 +00:00
|
|
|
|
int i1, i2;
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_VALIDATE_INUM_COPY (1,n1,i1);
|
|
|
|
|
|
SCM_VALIDATE_INUM_COPY (2,n2,i2);
|
1999-12-12 02:36:16 +00:00
|
|
|
|
return SCM_BOOL(i1 & i2);
|
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:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_logbit_p, "logbit?", 2, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM n1, SCM n2),
|
1999-12-13 03:40:23 +00:00
|
|
|
|
"@example
|
|
|
|
|
|
(logbit? index j) @equiv{} (logtest (integer-expt 2 index) j)
|
|
|
|
|
|
|
|
|
|
|
|
(logbit? 0 #b1101) @result{} #t
|
|
|
|
|
|
(logbit? 1 #b1101) @result{} #f
|
|
|
|
|
|
(logbit? 2 #b1101) @result{} #t
|
|
|
|
|
|
(logbit? 3 #b1101) @result{} #t
|
|
|
|
|
|
(logbit? 4 #b1101) @result{} #f
|
|
|
|
|
|
@end example")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_logbit_p
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-12-12 02:36:16 +00:00
|
|
|
|
int i1, i2;
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_VALIDATE_INUM_MIN_COPY (1,n1,0,i1);
|
|
|
|
|
|
SCM_VALIDATE_INUM_COPY (2,n2,i2);
|
1999-12-12 02:36:16 +00:00
|
|
|
|
return SCM_BOOL((1 << i1) & i2);
|
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
|
|
|
|
#endif
|
|
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_lognot, "lognot", 1, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM n),
|
1999-12-13 03:40:23 +00:00
|
|
|
|
"Returns the integer which is the 2s-complement of the integer argument.
|
|
|
|
|
|
|
|
|
|
|
|
Example:
|
|
|
|
|
|
@lisp
|
|
|
|
|
|
(number->string (lognot #b10000000) 2)
|
|
|
|
|
|
@result{} \"-10000001\"
|
|
|
|
|
|
(number->string (lognot #b0) 2)
|
|
|
|
|
|
@result{} \"-1\"
|
|
|
|
|
|
@end lisp
|
|
|
|
|
|
")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_lognot
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_VALIDATE_INUM (1,n);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return scm_difference (SCM_MAKINUM (-1L), n);
|
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:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_integer_expt, "integer-expt", 2, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM z1, SCM z2),
|
1999-12-13 03:40:23 +00:00
|
|
|
|
"Returns @var{n} raised to the non-negative integer exponent @var{k}.
|
|
|
|
|
|
|
|
|
|
|
|
Example:
|
|
|
|
|
|
@lisp
|
|
|
|
|
|
(integer-expt 2 5)
|
|
|
|
|
|
@result{} 32
|
|
|
|
|
|
(integer-expt -3 3)
|
|
|
|
|
|
@result{} -27
|
|
|
|
|
|
@end lisp")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_integer_expt
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-01-10 07:38:39 +00:00
|
|
|
|
SCM acc = SCM_MAKINUM (1L);
|
1999-12-12 02:36:16 +00:00
|
|
|
|
int i2;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#ifdef SCM_BIGDIG
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_INUM0 == z1 || acc == z1)
|
|
|
|
|
|
return z1;
|
|
|
|
|
|
else if (SCM_MAKINUM (-1L) == z1)
|
|
|
|
|
|
return SCM_BOOL_F == scm_even_p (z2) ? z1 : acc;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_VALIDATE_INUM_COPY (2,z2,i2);
|
1999-12-12 02:36:16 +00:00
|
|
|
|
if (i2 < 0)
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
1999-12-12 02:36:16 +00:00
|
|
|
|
i2 = -i2;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
z1 = scm_divide (z1, SCM_UNDEFINED);
|
|
|
|
|
|
}
|
|
|
|
|
|
while (1)
|
|
|
|
|
|
{
|
1999-12-12 02:36:16 +00:00
|
|
|
|
if (0 == i2)
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return acc;
|
1999-12-12 02:36:16 +00:00
|
|
|
|
if (1 == i2)
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return scm_product (acc, z1);
|
1999-12-12 02:36:16 +00:00
|
|
|
|
if (i2 & 1)
|
1999-01-10 07:38:39 +00:00
|
|
|
|
acc = scm_product (acc, z1);
|
|
|
|
|
|
z1 = scm_product (z1, z1);
|
1999-12-12 02:36:16 +00:00
|
|
|
|
i2 >>= 1;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
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:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_ash, "ash", 2, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM n, SCM cnt),
|
1999-12-13 03:40:23 +00:00
|
|
|
|
"Returns an integer equivalent to
|
|
|
|
|
|
@code{(inexact->exact (floor (* @var{int} (expt 2 @var{count}))))}.@refill
|
|
|
|
|
|
|
|
|
|
|
|
Example:
|
|
|
|
|
|
@lisp
|
|
|
|
|
|
(number->string (ash #b1 3) 2)
|
|
|
|
|
|
@result{} "1000"
|
|
|
|
|
|
(number->string (ash #b1010 -1) 2)
|
|
|
|
|
|
@result{} "101"
|
|
|
|
|
|
@end lisp")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_ash
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-12-12 02:36:16 +00:00
|
|
|
|
/* GJB:FIXME:: what is going on here? */
|
1999-01-10 07:38:39 +00:00
|
|
|
|
SCM res = SCM_INUM (n);
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_VALIDATE_INUM (2,cnt);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#ifdef SCM_BIGDIG
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (cnt < 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
res = scm_integer_expt (SCM_MAKINUM (2), SCM_MAKINUM (-SCM_INUM (cnt)));
|
|
|
|
|
|
if (SCM_NFALSEP (scm_negative_p (n)))
|
|
|
|
|
|
return scm_sum (SCM_MAKINUM (-1L),
|
|
|
|
|
|
scm_quotient (scm_sum (SCM_MAKINUM (1L), n), res));
|
|
|
|
|
|
else
|
|
|
|
|
|
return scm_quotient (n, res);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
return scm_product (n, scm_integer_expt (SCM_MAKINUM (2), cnt));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#else
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_VALIDATE_INUM (1,n)
|
1999-01-10 07:38:39 +00:00
|
|
|
|
cnt = SCM_INUM (cnt);
|
|
|
|
|
|
if (cnt < 0)
|
|
|
|
|
|
return SCM_MAKINUM (SCM_SRS (res, -cnt));
|
|
|
|
|
|
res = SCM_MAKINUM (res << cnt);
|
|
|
|
|
|
if (SCM_INUM (res) >> cnt != SCM_INUM (n))
|
1999-12-12 02:36:16 +00:00
|
|
|
|
scm_num_overflow (FUNC_NAME);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return res;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
1999-12-12 02:36:16 +00:00
|
|
|
|
/* GJB:FIXME: do not use SCMs as integers! */
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_bit_extract, "bit-extract", 3, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM n, SCM start, SCM end),
|
1999-12-13 03:40:23 +00:00
|
|
|
|
"Returns the integer composed of the @var{start} (inclusive) through
|
|
|
|
|
|
@var{end} (exclusive) bits of @var{n}. The @var{start}th bit becomes
|
|
|
|
|
|
the 0-th bit in the result.@refill
|
|
|
|
|
|
|
|
|
|
|
|
Example:
|
|
|
|
|
|
@lisp
|
|
|
|
|
|
(number->string (bit-extract #b1101101010 0 4) 2)
|
|
|
|
|
|
@result{} \"1010\"
|
|
|
|
|
|
(number->string (bit-extract #b1101101010 4 9) 2)
|
|
|
|
|
|
@result{} \"10110\"
|
|
|
|
|
|
@end lisp")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_bit_extract
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_VALIDATE_INUM (1,n);
|
|
|
|
|
|
SCM_VALIDATE_INUM_MIN (2,start,0);
|
|
|
|
|
|
SCM_VALIDATE_INUM_MIN (3,end,0);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
start = SCM_INUM (start);
|
|
|
|
|
|
end = SCM_INUM (end);
|
1999-12-12 02:36:16 +00:00
|
|
|
|
SCM_ASSERT (end >= start, SCM_MAKINUM (end), SCM_OUTOFRANGE, FUNC_NAME);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#ifdef SCM_BIGDIG
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_NINUMP (n))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return
|
1999-01-10 07:38:39 +00:00
|
|
|
|
scm_logand (scm_difference (scm_integer_expt (SCM_MAKINUM (2),
|
|
|
|
|
|
SCM_MAKINUM (end - start)),
|
|
|
|
|
|
SCM_MAKINUM (1L)),
|
|
|
|
|
|
scm_ash (n, SCM_MAKINUM (-start)));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#else
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_VALIDATE_INUM (1,n);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return SCM_MAKINUM ((SCM_INUM (n) >> start) & ((1L << (end - start)) - 1));
|
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
|
|
|
|
|
1999-04-17 16:03:32 +00:00
|
|
|
|
static const char scm_logtab[] = {
|
|
|
|
|
|
0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4
|
|
|
|
|
|
};
|
* __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
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_logcount, "logcount", 1, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM n),
|
1999-12-13 03:40:23 +00:00
|
|
|
|
"Returns the number of bits in integer @var{n}. If integer is positive,
|
|
|
|
|
|
the 1-bits in its binary representation are counted. If negative, the
|
|
|
|
|
|
0-bits in its two's-complement binary representation are counted. If 0,
|
|
|
|
|
|
0 is returned.
|
|
|
|
|
|
|
|
|
|
|
|
Example:
|
|
|
|
|
|
@lisp
|
|
|
|
|
|
(logcount #b10101010)
|
|
|
|
|
|
@result{} 4
|
|
|
|
|
|
(logcount 0)
|
|
|
|
|
|
@result{} 0
|
|
|
|
|
|
(logcount -2)
|
|
|
|
|
|
@result{} 1
|
|
|
|
|
|
@end lisp")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_logcount
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
register unsigned long c = 0;
|
|
|
|
|
|
register long nn;
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_NINUMP (n))
|
|
|
|
|
|
{
|
|
|
|
|
|
scm_sizet i;
|
|
|
|
|
|
SCM_BIGDIG *ds, d;
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_VALIDATE_BIGINT (1,n);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_BIGSIGN (n))
|
|
|
|
|
|
return scm_logcount (scm_difference (SCM_MAKINUM (-1L), n));
|
|
|
|
|
|
ds = SCM_BDIGITS (n);
|
|
|
|
|
|
for (i = SCM_NUMDIGS (n); i--;)
|
|
|
|
|
|
for (d = ds[i]; d; d >>= 4)
|
|
|
|
|
|
c += scm_logtab[15 & d];
|
|
|
|
|
|
return SCM_MAKINUM (c);
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#else
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_VALIDATE_INUM (1,n);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if ((nn = SCM_INUM (n)) < 0)
|
|
|
|
|
|
nn = -1 - nn;
|
|
|
|
|
|
for (; nn; nn >>= 4)
|
|
|
|
|
|
c += scm_logtab[15 & nn];
|
|
|
|
|
|
return SCM_MAKINUM (c);
|
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
|
|
|
|
|
1999-04-17 16:03:32 +00:00
|
|
|
|
static const char scm_ilentab[] = {
|
|
|
|
|
|
0, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4
|
|
|
|
|
|
};
|
* __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
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_integer_length, "integer-length", 1, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM n),
|
1999-12-13 03:40:23 +00:00
|
|
|
|
"Returns the number of bits neccessary to represent @var{n}.
|
|
|
|
|
|
|
|
|
|
|
|
Example:
|
|
|
|
|
|
@lisp
|
|
|
|
|
|
(integer-length #b10101010)
|
|
|
|
|
|
@result{} 8
|
|
|
|
|
|
(integer-length 0)
|
|
|
|
|
|
@result{} 0
|
|
|
|
|
|
(integer-length #b1111)
|
|
|
|
|
|
@result{} 4
|
|
|
|
|
|
@end lisp")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_integer_length
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
register unsigned long c = 0;
|
|
|
|
|
|
register long nn;
|
|
|
|
|
|
unsigned int l = 4;
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_NINUMP (n))
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM_BIGDIG *ds, d;
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_VALIDATE_BIGINT (1,n);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_BIGSIGN (n))
|
|
|
|
|
|
return scm_integer_length (scm_difference (SCM_MAKINUM (-1L), n));
|
|
|
|
|
|
ds = SCM_BDIGITS (n);
|
|
|
|
|
|
d = ds[c = SCM_NUMDIGS (n) - 1];
|
|
|
|
|
|
for (c *= SCM_BITSPERDIG; d; d >>= 4)
|
|
|
|
|
|
{
|
|
|
|
|
|
c += 4;
|
|
|
|
|
|
l = scm_ilentab[15 & d];
|
|
|
|
|
|
}
|
|
|
|
|
|
return SCM_MAKINUM (c - 4 + l);
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#else
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_VALIDATE_INUM (1,n);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if ((nn = SCM_INUM (n)) < 0)
|
|
|
|
|
|
nn = -1 - nn;
|
|
|
|
|
|
for (; nn; nn >>= 4)
|
|
|
|
|
|
{
|
|
|
|
|
|
c += 4;
|
|
|
|
|
|
l = scm_ilentab[15 & nn];
|
|
|
|
|
|
}
|
|
|
|
|
|
return SCM_MAKINUM (c - 4 + l);
|
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
1999-04-17 16:03:32 +00:00
|
|
|
|
static const char s_bignum[] = "bignum";
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 02:36:16 +00:00
|
|
|
|
scm_mkbig (scm_sizet nlen, int sign)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM v = nlen;
|
1998-09-06 18:15:59 +00:00
|
|
|
|
/* Cast to SCM to avoid signed/unsigned comparison warnings. */
|
|
|
|
|
|
if (((v << 16) >> 16) != (SCM) nlen)
|
1999-04-17 16:03:32 +00:00
|
|
|
|
scm_wta (SCM_MAKINUM (nlen), (char *) SCM_NALLOC, s_bignum);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
SCM_NEWCELL (v);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM_DEFER_INTS;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
SCM_SETCHARS (v, scm_must_malloc ((long) (nlen * sizeof (SCM_BIGDIG)),
|
1999-04-17 16:03:32 +00:00
|
|
|
|
s_bignum));
|
1999-01-10 07:38:39 +00:00
|
|
|
|
SCM_SETNUMDIGS (v, nlen, sign ? scm_tc16_bigneg : scm_tc16_bigpos);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM_ALLOW_INTS;
|
|
|
|
|
|
return v;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 02:36:16 +00:00
|
|
|
|
scm_big2inum (SCM b, scm_sizet l)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
unsigned long num = 0;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
SCM_BIGDIG *tmp = SCM_BDIGITS (b);
|
|
|
|
|
|
while (l--)
|
|
|
|
|
|
num = SCM_BIGUP (num) + tmp[l];
|
|
|
|
|
|
if (SCM_TYP16 (b) == scm_tc16_bigpos)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_POSFIXABLE (num))
|
|
|
|
|
|
return SCM_MAKINUM (num);
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_UNEGFIXABLE (num))
|
|
|
|
|
|
return SCM_MAKINUM (-num);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return b;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
1999-04-17 16:03:32 +00:00
|
|
|
|
static const char s_adjbig[] = "scm_adjbig";
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 02:36:16 +00:00
|
|
|
|
scm_adjbig (SCM b, scm_sizet nlen)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1998-09-06 18:15:59 +00:00
|
|
|
|
scm_sizet nsiz = nlen;
|
|
|
|
|
|
if (((nsiz << 16) >> 16) != nlen)
|
1999-01-10 07:38:39 +00:00
|
|
|
|
scm_wta (scm_ulong2num (nsiz), (char *) SCM_NALLOC, s_adjbig);
|
1998-09-06 18:15:59 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM_DEFER_INTS;
|
1998-09-06 18:15:59 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM_BIGDIG *digits
|
|
|
|
|
|
= ((SCM_BIGDIG *)
|
1999-01-10 07:38:39 +00:00
|
|
|
|
scm_must_realloc ((char *) SCM_CHARS (b),
|
|
|
|
|
|
(long) (SCM_NUMDIGS (b) * sizeof (SCM_BIGDIG)),
|
|
|
|
|
|
(long) (nsiz * sizeof (SCM_BIGDIG)), s_adjbig));
|
1998-09-06 18:15:59 +00:00
|
|
|
|
|
|
|
|
|
|
SCM_SETCHARS (b, digits);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
SCM_SETNUMDIGS (b, nsiz, SCM_TYP16 (b));
|
1998-09-06 18:15:59 +00:00
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM_ALLOW_INTS;
|
|
|
|
|
|
return b;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 02:36:16 +00:00
|
|
|
|
scm_normbig (SCM b)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#ifndef _UNICOS
|
|
|
|
|
|
scm_sizet nlen = SCM_NUMDIGS (b);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#else
|
1999-01-10 07:38:39 +00:00
|
|
|
|
int nlen = SCM_NUMDIGS (b); /* unsigned nlen breaks on Cray when nlen => 0 */
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
1999-01-10 07:38:39 +00:00
|
|
|
|
SCM_BIGDIG *zds = SCM_BDIGITS (b);
|
|
|
|
|
|
while (nlen-- && !zds[nlen]);
|
|
|
|
|
|
nlen++;
|
|
|
|
|
|
if (nlen * SCM_BITSPERDIG / SCM_CHAR_BIT <= sizeof (SCM))
|
|
|
|
|
|
if (SCM_INUMP (b = scm_big2inum (b, (scm_sizet) nlen)))
|
|
|
|
|
|
return b;
|
|
|
|
|
|
if (SCM_NUMDIGS (b) == nlen)
|
|
|
|
|
|
return b;
|
|
|
|
|
|
return scm_adjbig (b, (scm_sizet) nlen);
|
1996-07-25 22:56:11 +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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 02:36:16 +00:00
|
|
|
|
scm_copybig (SCM b, int sign)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-01-10 07:38:39 +00:00
|
|
|
|
scm_sizet i = SCM_NUMDIGS (b);
|
|
|
|
|
|
SCM ans = scm_mkbig (i, sign);
|
|
|
|
|
|
SCM_BIGDIG *src = SCM_BDIGITS (b), *dst = SCM_BDIGITS (ans);
|
|
|
|
|
|
while (i--)
|
|
|
|
|
|
dst[i] = src[i];
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return ans;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 02:36:16 +00:00
|
|
|
|
scm_long2big (long n)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
scm_sizet i = 0;
|
|
|
|
|
|
SCM_BIGDIG *digits;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
SCM ans = scm_mkbig (SCM_DIGSPERLONG, n < 0);
|
|
|
|
|
|
digits = SCM_BDIGITS (ans);
|
|
|
|
|
|
if (n < 0)
|
|
|
|
|
|
n = -n;
|
|
|
|
|
|
while (i < SCM_DIGSPERLONG)
|
|
|
|
|
|
{
|
|
|
|
|
|
digits[i++] = SCM_BIGLO (n);
|
|
|
|
|
|
n = SCM_BIGDN ((unsigned long) n);
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return ans;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
* configure.in: check for hstrerror.
* socket.c (scm_htons, scm_ntohs, scm_htonl, scm_ntohl): new
functions for network data conversion.
* numbers.c (scm_num2long, scm_num2longlong):
throw out-of-range instead of wrong-type-arg if appropriate.
(scm_iint2str): handle -2^31 correctly.
(scm_num2long): handle -2^31 bignum correctly.
(scm_num2long_long): rewrite the bigdig case: basically copied
from scm_num2long.
numbers.h: (SCM_BITSPERLONGLONG): deleted.
* unif.c (rapr1): use sprintf instead of intprint for unsigned
longs: intprint can't cope with large values.
* numbers.c (scm_num2ulong): check more consistently that the
input is not negative. if it is, throw out-of-range instead of
wrong-type-arg.
* ramap.c (scm_array_fill_int): don't limit fill to INUM for
uvect, ivect or llvect.
Check that fill doesn't overflow short uniform array.
* __scm.h: add another long to the definition of long_long and
ulong_long.
* unif.c (scm_raprin1): use 'l' instead of "long_long" in the
print representation of llvect. read can't handle more than
one character.
(scm_dimensions_to_uniform_array): make "fill" an optional argument
instead of a rest argument.
* tags.h (scm_tc7_llvect): wasn't defined anywhere, so use the free
tag 29 for now.
* __scm.h: don't mention LONGLONGS.
* unif.c, numbers.c, eq.c, gc.c, print.c, eval.c, ramap.c:
replace LONGLONGS with HAVE_LONG_LONGS as set by configure.
* net_db.c (scm_inet_aton): throw errors using the misc-error key
instead of system-error. inet_aton doesn't set errno.
system-error isn't right in gethost either, since it's throwing
the value of h_errno instead of errno. so:
(scm_host_not_found_key, scm_try_again_key,
scm_no_recovery_key, scm_no_data_key): new error keys.
(scm_resolv_error): new procedure, use the new keys.
(scm_gethost): call scm_resolv_error not scm_syserror_msg.
* error.c: (various): use scm_cons instead of scm_listify
to build short lists.
* boot-9.scm (read-hash-extend to set up arrays): add 'l' for
long_long uniform vectors.
* networking.scm (sethostent, setnetent, setprotoent, setservent):
take an optional argument STAYOPEN. default is #f.
* readline.c (scm_init_readline): set rl_readline_name to Guile,
to allow conditionals in .inputrc.
1999-11-18 22:36:28 +00:00
|
|
|
|
#ifdef HAVE_LONG_LONGS
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 02:36:16 +00:00
|
|
|
|
scm_long_long2big (long_long n)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
scm_sizet i;
|
|
|
|
|
|
SCM_BIGDIG *digits;
|
|
|
|
|
|
SCM ans;
|
|
|
|
|
|
int n_digits;
|
|
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
long tn;
|
|
|
|
|
|
tn = (long) n;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if ((long long) tn == n)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return scm_long2big (tn);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
long_long tn;
|
|
|
|
|
|
|
|
|
|
|
|
for (tn = n, n_digits = 0;
|
|
|
|
|
|
tn;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
++n_digits, tn = SCM_BIGDN ((ulong_long) tn))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
i = 0;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
ans = scm_mkbig (n_digits, n < 0);
|
|
|
|
|
|
digits = SCM_BDIGITS (ans);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
if (n < 0)
|
|
|
|
|
|
n = -n;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
while (i < n_digits)
|
|
|
|
|
|
{
|
|
|
|
|
|
digits[i++] = SCM_BIGLO (n);
|
|
|
|
|
|
n = SCM_BIGDN ((ulong_long) n);
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return ans;
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 02:36:16 +00:00
|
|
|
|
scm_2ulong2big (unsigned long *np)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
unsigned long n;
|
|
|
|
|
|
scm_sizet i;
|
|
|
|
|
|
SCM_BIGDIG *digits;
|
|
|
|
|
|
SCM ans;
|
|
|
|
|
|
|
1999-01-10 07:38:39 +00:00
|
|
|
|
ans = scm_mkbig (2 * SCM_DIGSPERLONG, 0);
|
|
|
|
|
|
digits = SCM_BDIGITS (ans);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
n = np[0];
|
|
|
|
|
|
for (i = 0; i < SCM_DIGSPERLONG; ++i)
|
|
|
|
|
|
{
|
1999-01-10 07:38:39 +00:00
|
|
|
|
digits[i] = SCM_BIGLO (n);
|
|
|
|
|
|
n = SCM_BIGDN ((unsigned long) n);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
n = np[1];
|
|
|
|
|
|
for (i = 0; i < SCM_DIGSPERLONG; ++i)
|
|
|
|
|
|
{
|
1999-01-10 07:38:39 +00:00
|
|
|
|
digits[i + SCM_DIGSPERLONG] = SCM_BIGLO (n);
|
|
|
|
|
|
n = SCM_BIGDN ((unsigned long) n);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
return ans;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 02:36:16 +00:00
|
|
|
|
scm_ulong2big (unsigned long n)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
scm_sizet i = 0;
|
|
|
|
|
|
SCM_BIGDIG *digits;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
SCM ans = scm_mkbig (SCM_DIGSPERLONG, 0);
|
|
|
|
|
|
digits = SCM_BDIGITS (ans);
|
|
|
|
|
|
while (i < SCM_DIGSPERLONG)
|
|
|
|
|
|
{
|
|
|
|
|
|
digits[i++] = SCM_BIGLO (n);
|
|
|
|
|
|
n = SCM_BIGDN (n);
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return ans;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
int
|
1999-12-12 02:36:16 +00:00
|
|
|
|
scm_bigcomp (SCM x, SCM y)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-01-10 07:38:39 +00:00
|
|
|
|
int xsign = SCM_BIGSIGN (x);
|
|
|
|
|
|
int ysign = SCM_BIGSIGN (y);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
scm_sizet xlen, ylen;
|
1998-09-06 18:15:59 +00:00
|
|
|
|
|
|
|
|
|
|
/* Look at the signs, first. */
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (ysign < xsign)
|
|
|
|
|
|
return 1;
|
|
|
|
|
|
if (ysign > xsign)
|
|
|
|
|
|
return -1;
|
1998-09-06 18:15:59 +00:00
|
|
|
|
|
|
|
|
|
|
/* They're the same sign, so see which one has more digits. Note
|
|
|
|
|
|
that, if they are negative, the longer number is the lesser. */
|
1999-01-10 07:38:39 +00:00
|
|
|
|
ylen = SCM_NUMDIGS (y);
|
|
|
|
|
|
xlen = SCM_NUMDIGS (x);
|
1998-09-06 18:15:59 +00:00
|
|
|
|
if (ylen > xlen)
|
|
|
|
|
|
return (xsign) ? -1 : 1;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (ylen < xlen)
|
|
|
|
|
|
return (xsign) ? 1 : -1;
|
1998-09-06 18:15:59 +00:00
|
|
|
|
|
|
|
|
|
|
/* They have the same number of digits, so find the most significant
|
|
|
|
|
|
digit where they differ. */
|
|
|
|
|
|
while (xlen)
|
|
|
|
|
|
{
|
|
|
|
|
|
--xlen;
|
|
|
|
|
|
if (SCM_BDIGITS (y)[xlen] != SCM_BDIGITS (x)[xlen])
|
|
|
|
|
|
/* Make the discrimination based on the digit that differs. */
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return ((SCM_BDIGITS (y)[xlen] > SCM_BDIGITS (x)[xlen])
|
|
|
|
|
|
? (xsign ? -1 : 1)
|
|
|
|
|
|
: (xsign ? 1 : -1));
|
1998-09-06 18:15:59 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* The numbers are identical. */
|
|
|
|
|
|
return 0;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#ifndef SCM_DIGSTOOBIG
|
|
|
|
|
|
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
long
|
1999-12-12 02:36:16 +00:00
|
|
|
|
scm_pseudolong (long x)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-01-10 07:38:39 +00:00
|
|
|
|
union
|
|
|
|
|
|
{
|
1996-07-25 22:56:11 +00:00
|
|
|
|
long l;
|
|
|
|
|
|
SCM_BIGDIG bd[SCM_DIGSPERLONG];
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
p;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
scm_sizet i = 0;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (x < 0)
|
|
|
|
|
|
x = -x;
|
|
|
|
|
|
while (i < SCM_DIGSPERLONG)
|
|
|
|
|
|
{
|
|
|
|
|
|
p.bd[i++] = SCM_BIGLO (x);
|
|
|
|
|
|
x = SCM_BIGDN (x);
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
/* p.bd[0] = SCM_BIGLO(x); p.bd[1] = SCM_BIGDN(x); */
|
|
|
|
|
|
return p.l;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
|
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
void
|
1999-12-12 02:36:16 +00:00
|
|
|
|
scm_longdigs (long x, SCM_BIGDIG digs[])
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
scm_sizet i = 0;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (x < 0)
|
|
|
|
|
|
x = -x;
|
|
|
|
|
|
while (i < SCM_DIGSPERLONG)
|
|
|
|
|
|
{
|
|
|
|
|
|
digs[i++] = SCM_BIGLO (x);
|
|
|
|
|
|
x = SCM_BIGDN (x);
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 02:36:16 +00:00
|
|
|
|
scm_addbig (SCM_BIGDIG *x, scm_sizet nx, int xsgn, SCM bigy, int sgny)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
/* Assumes nx <= SCM_NUMDIGS(bigy) */
|
|
|
|
|
|
/* Assumes xsgn and sgny scm_equal either 0 or 0x0100 */
|
|
|
|
|
|
long num = 0;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
scm_sizet i = 0, ny = SCM_NUMDIGS (bigy);
|
|
|
|
|
|
SCM z = scm_copybig (bigy, SCM_BIGSIGN (bigy) ^ sgny);
|
|
|
|
|
|
SCM_BIGDIG *zds = SCM_BDIGITS (z);
|
|
|
|
|
|
if (xsgn ^ SCM_BIGSIGN (z))
|
|
|
|
|
|
{
|
|
|
|
|
|
do
|
|
|
|
|
|
{
|
|
|
|
|
|
num += (long) zds[i] - x[i];
|
|
|
|
|
|
if (num < 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
zds[i] = num + SCM_BIGRAD;
|
|
|
|
|
|
num = -1;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
zds[i] = SCM_BIGLO (num);
|
|
|
|
|
|
num = 0;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
while (++i < nx);
|
|
|
|
|
|
if (num && nx == ny)
|
|
|
|
|
|
{
|
|
|
|
|
|
num = 1;
|
|
|
|
|
|
i = 0;
|
|
|
|
|
|
SCM_SETCAR (z, SCM_CAR (z) ^ 0x0100);
|
|
|
|
|
|
do
|
|
|
|
|
|
{
|
|
|
|
|
|
num += (SCM_BIGRAD - 1) - zds[i];
|
|
|
|
|
|
zds[i++] = SCM_BIGLO (num);
|
|
|
|
|
|
num = SCM_BIGDN (num);
|
|
|
|
|
|
}
|
|
|
|
|
|
while (i < ny);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
while (i < ny)
|
|
|
|
|
|
{
|
|
|
|
|
|
num += zds[i];
|
|
|
|
|
|
if (num < 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
zds[i++] = num + SCM_BIGRAD;
|
|
|
|
|
|
num = -1;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
zds[i++] = SCM_BIGLO (num);
|
|
|
|
|
|
num = 0;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
do
|
|
|
|
|
|
{
|
|
|
|
|
|
num += (long) zds[i] + x[i];
|
|
|
|
|
|
zds[i++] = SCM_BIGLO (num);
|
|
|
|
|
|
num = SCM_BIGDN (num);
|
|
|
|
|
|
}
|
|
|
|
|
|
while (i < nx);
|
|
|
|
|
|
if (!num)
|
|
|
|
|
|
return z;
|
|
|
|
|
|
while (i < ny)
|
|
|
|
|
|
{
|
|
|
|
|
|
num += zds[i];
|
|
|
|
|
|
zds[i++] = SCM_BIGLO (num);
|
|
|
|
|
|
num = SCM_BIGDN (num);
|
|
|
|
|
|
if (!num)
|
|
|
|
|
|
return z;
|
|
|
|
|
|
}
|
|
|
|
|
|
if (num)
|
|
|
|
|
|
{
|
|
|
|
|
|
z = scm_adjbig (z, ny + 1);
|
|
|
|
|
|
SCM_BDIGITS (z)[ny] = num;
|
|
|
|
|
|
return z;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
return scm_normbig (z);
|
1996-07-25 22:56:11 +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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 02:36:16 +00:00
|
|
|
|
scm_mulbig (SCM_BIGDIG *x, scm_sizet nx, SCM_BIGDIG *y, scm_sizet ny, int sgn)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
scm_sizet i = 0, j = nx + ny;
|
|
|
|
|
|
unsigned long n = 0;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
SCM z = scm_mkbig (j, sgn);
|
|
|
|
|
|
SCM_BIGDIG *zds = SCM_BDIGITS (z);
|
|
|
|
|
|
while (j--)
|
|
|
|
|
|
zds[j] = 0;
|
|
|
|
|
|
do
|
|
|
|
|
|
{
|
|
|
|
|
|
j = 0;
|
|
|
|
|
|
if (x[i])
|
|
|
|
|
|
{
|
|
|
|
|
|
do
|
|
|
|
|
|
{
|
|
|
|
|
|
n += zds[i + j] + ((unsigned long) x[i] * y[j]);
|
|
|
|
|
|
zds[i + j++] = SCM_BIGLO (n);
|
|
|
|
|
|
n = SCM_BIGDN (n);
|
|
|
|
|
|
}
|
|
|
|
|
|
while (j < ny);
|
|
|
|
|
|
if (n)
|
|
|
|
|
|
{
|
|
|
|
|
|
zds[i + j] = n;
|
|
|
|
|
|
n = 0;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-01-10 07:38:39 +00:00
|
|
|
|
while (++i < nx);
|
|
|
|
|
|
return scm_normbig (z);
|
1996-07-25 22:56:11 +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
|
|
|
|
|
1997-01-07 23:42:35 +00:00
|
|
|
|
/* Sun's compiler complains about the fact that this function has an
|
|
|
|
|
|
ANSI prototype in numbers.h, but a K&R declaration here, and the
|
|
|
|
|
|
two specify different promotions for the third argument. I'm going
|
|
|
|
|
|
to turn this into an ANSI declaration, and see if anyone complains
|
|
|
|
|
|
about it not being K&R. */
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
unsigned int
|
1999-01-10 07:38:39 +00:00
|
|
|
|
scm_divbigdig (SCM_BIGDIG * ds,
|
|
|
|
|
|
scm_sizet h,
|
|
|
|
|
|
SCM_BIGDIG div)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
register unsigned long t2 = 0;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
while (h--)
|
|
|
|
|
|
{
|
|
|
|
|
|
t2 = SCM_BIGUP (t2) + ds[h];
|
|
|
|
|
|
ds[h] = t2 / div;
|
|
|
|
|
|
t2 %= div;
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return t2;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 02:36:16 +00:00
|
|
|
|
scm_divbigint (SCM x, long z, int sgn, int mode)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (z < 0)
|
|
|
|
|
|
z = -z;
|
|
|
|
|
|
if (z < SCM_BIGRAD)
|
|
|
|
|
|
{
|
|
|
|
|
|
register unsigned long t2 = 0;
|
|
|
|
|
|
register SCM_BIGDIG *ds = SCM_BDIGITS (x);
|
|
|
|
|
|
scm_sizet nd = SCM_NUMDIGS (x);
|
|
|
|
|
|
while (nd--)
|
|
|
|
|
|
t2 = (SCM_BIGUP (t2) + ds[nd]) % z;
|
|
|
|
|
|
if (mode && t2)
|
|
|
|
|
|
t2 = z - t2;
|
|
|
|
|
|
return SCM_MAKINUM (sgn ? -t2 : t2);
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
#ifndef SCM_DIGSTOOBIG
|
1999-01-10 07:38:39 +00:00
|
|
|
|
unsigned long t2 = scm_pseudolong (z);
|
|
|
|
|
|
return scm_divbigbig (SCM_BDIGITS (x), SCM_NUMDIGS (x),
|
|
|
|
|
|
(SCM_BIGDIG *) & t2, SCM_DIGSPERLONG,
|
|
|
|
|
|
sgn, mode);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#else
|
|
|
|
|
|
SCM_BIGDIG t2[SCM_DIGSPERLONG];
|
1999-01-10 07:38:39 +00:00
|
|
|
|
scm_longdigs (z, t2);
|
|
|
|
|
|
return scm_divbigbig (SCM_BDIGITS (x), SCM_NUMDIGS (x),
|
|
|
|
|
|
t2, SCM_DIGSPERLONG,
|
|
|
|
|
|
sgn, mode);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 02:36:16 +00:00
|
|
|
|
scm_divbigbig (SCM_BIGDIG *x, scm_sizet nx, SCM_BIGDIG *y, scm_sizet ny, int sgn, int modes)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
/* modes description
|
1999-01-10 07:38:39 +00:00
|
|
|
|
0 remainder
|
|
|
|
|
|
1 scm_modulo
|
|
|
|
|
|
2 quotient
|
|
|
|
|
|
3 quotient but returns 0 if division is not exact. */
|
1996-07-25 22:56:11 +00:00
|
|
|
|
scm_sizet i = 0, j = 0;
|
|
|
|
|
|
long num = 0;
|
|
|
|
|
|
unsigned long t2 = 0;
|
|
|
|
|
|
SCM z, newy;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
SCM_BIGDIG d = 0, qhat, *zds, *yds;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
/* algorithm requires nx >= ny */
|
|
|
|
|
|
if (nx < ny)
|
1999-01-10 07:38:39 +00:00
|
|
|
|
switch (modes)
|
|
|
|
|
|
{
|
|
|
|
|
|
case 0: /* remainder -- just return x */
|
|
|
|
|
|
z = scm_mkbig (nx, sgn);
|
|
|
|
|
|
zds = SCM_BDIGITS (z);
|
|
|
|
|
|
do
|
|
|
|
|
|
{
|
|
|
|
|
|
zds[i] = x[i];
|
|
|
|
|
|
}
|
|
|
|
|
|
while (++i < nx);
|
|
|
|
|
|
return z;
|
|
|
|
|
|
case 1: /* scm_modulo -- return y-x */
|
|
|
|
|
|
z = scm_mkbig (ny, sgn);
|
|
|
|
|
|
zds = SCM_BDIGITS (z);
|
|
|
|
|
|
do
|
|
|
|
|
|
{
|
|
|
|
|
|
num += (long) y[i] - x[i];
|
|
|
|
|
|
if (num < 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
zds[i] = num + SCM_BIGRAD;
|
|
|
|
|
|
num = -1;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
zds[i] = num;
|
|
|
|
|
|
num = 0;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
while (++i < nx);
|
|
|
|
|
|
while (i < ny)
|
|
|
|
|
|
{
|
|
|
|
|
|
num += y[i];
|
|
|
|
|
|
if (num < 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
zds[i++] = num + SCM_BIGRAD;
|
|
|
|
|
|
num = -1;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
zds[i++] = num;
|
|
|
|
|
|
num = 0;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
goto doadj;
|
|
|
|
|
|
case 2:
|
|
|
|
|
|
return SCM_INUM0; /* quotient is zero */
|
|
|
|
|
|
case 3:
|
|
|
|
|
|
return 0; /* the division is not exact */
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-01-10 07:38:39 +00:00
|
|
|
|
|
|
|
|
|
|
z = scm_mkbig (nx == ny ? nx + 2 : nx + 1, sgn);
|
|
|
|
|
|
zds = SCM_BDIGITS (z);
|
|
|
|
|
|
if (nx == ny)
|
|
|
|
|
|
zds[nx + 1] = 0;
|
|
|
|
|
|
while (!y[ny - 1])
|
|
|
|
|
|
ny--; /* in case y came in as a psuedolong */
|
|
|
|
|
|
if (y[ny - 1] < (SCM_BIGRAD >> 1))
|
|
|
|
|
|
{ /* normalize operands */
|
|
|
|
|
|
d = SCM_BIGRAD / (y[ny - 1] + 1);
|
|
|
|
|
|
newy = scm_mkbig (ny, 0);
|
|
|
|
|
|
yds = SCM_BDIGITS (newy);
|
|
|
|
|
|
while (j < ny)
|
|
|
|
|
|
{
|
|
|
|
|
|
t2 += (unsigned long) y[j] * d;
|
|
|
|
|
|
yds[j++] = SCM_BIGLO (t2);
|
|
|
|
|
|
t2 = SCM_BIGDN (t2);
|
|
|
|
|
|
}
|
|
|
|
|
|
y = yds;
|
|
|
|
|
|
j = 0;
|
|
|
|
|
|
t2 = 0;
|
|
|
|
|
|
while (j < nx)
|
|
|
|
|
|
{
|
|
|
|
|
|
t2 += (unsigned long) x[j] * d;
|
|
|
|
|
|
zds[j++] = SCM_BIGLO (t2);
|
|
|
|
|
|
t2 = SCM_BIGDN (t2);
|
|
|
|
|
|
}
|
|
|
|
|
|
zds[j] = t2;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
zds[j = nx] = 0;
|
|
|
|
|
|
while (j--)
|
|
|
|
|
|
zds[j] = x[j];
|
|
|
|
|
|
}
|
|
|
|
|
|
j = nx == ny ? nx + 1 : nx; /* dividend needs more digits than divisor */
|
|
|
|
|
|
do
|
|
|
|
|
|
{ /* loop over digits of quotient */
|
|
|
|
|
|
if (zds[j] == y[ny - 1])
|
|
|
|
|
|
qhat = SCM_BIGRAD - 1;
|
|
|
|
|
|
else
|
|
|
|
|
|
qhat = (SCM_BIGUP (zds[j]) + zds[j - 1]) / y[ny - 1];
|
|
|
|
|
|
if (!qhat)
|
|
|
|
|
|
continue;
|
|
|
|
|
|
i = 0;
|
|
|
|
|
|
num = 0;
|
|
|
|
|
|
t2 = 0;
|
|
|
|
|
|
do
|
|
|
|
|
|
{ /* multiply and subtract */
|
|
|
|
|
|
t2 += (unsigned long) y[i] * qhat;
|
|
|
|
|
|
num += zds[j - ny + i] - SCM_BIGLO (t2);
|
|
|
|
|
|
if (num < 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
zds[j - ny + i] = num + SCM_BIGRAD;
|
|
|
|
|
|
num = -1;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
zds[j - ny + i] = num;
|
|
|
|
|
|
num = 0;
|
|
|
|
|
|
}
|
|
|
|
|
|
t2 = SCM_BIGDN (t2);
|
|
|
|
|
|
}
|
|
|
|
|
|
while (++i < ny);
|
|
|
|
|
|
num += zds[j - ny + i] - t2; /* borrow from high digit; don't update */
|
|
|
|
|
|
while (num)
|
|
|
|
|
|
{ /* "add back" required */
|
|
|
|
|
|
i = 0;
|
|
|
|
|
|
num = 0;
|
|
|
|
|
|
qhat--;
|
|
|
|
|
|
do
|
|
|
|
|
|
{
|
|
|
|
|
|
num += (long) zds[j - ny + i] + y[i];
|
|
|
|
|
|
zds[j - ny + i] = SCM_BIGLO (num);
|
|
|
|
|
|
num = SCM_BIGDN (num);
|
|
|
|
|
|
}
|
|
|
|
|
|
while (++i < ny);
|
|
|
|
|
|
num--;
|
|
|
|
|
|
}
|
|
|
|
|
|
if (modes & 2)
|
|
|
|
|
|
zds[j] = qhat;
|
|
|
|
|
|
}
|
|
|
|
|
|
while (--j >= ny);
|
|
|
|
|
|
switch (modes)
|
|
|
|
|
|
{
|
|
|
|
|
|
case 3: /* check that remainder==0 */
|
|
|
|
|
|
for (j = ny; j && !zds[j - 1]; --j);
|
|
|
|
|
|
if (j)
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
case 2: /* move quotient down in z */
|
|
|
|
|
|
j = (nx == ny ? nx + 2 : nx + 1) - ny;
|
|
|
|
|
|
for (i = 0; i < j; i++)
|
|
|
|
|
|
zds[i] = zds[i + ny];
|
|
|
|
|
|
ny = i;
|
|
|
|
|
|
break;
|
|
|
|
|
|
case 1: /* subtract for scm_modulo */
|
|
|
|
|
|
i = 0;
|
|
|
|
|
|
num = 0;
|
|
|
|
|
|
j = 0;
|
|
|
|
|
|
do
|
|
|
|
|
|
{
|
|
|
|
|
|
num += y[i] - zds[i];
|
|
|
|
|
|
j = j | zds[i];
|
|
|
|
|
|
if (num < 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
zds[i] = num + SCM_BIGRAD;
|
|
|
|
|
|
num = -1;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
zds[i] = num;
|
|
|
|
|
|
num = 0;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
while (++i < ny);
|
|
|
|
|
|
if (!j)
|
|
|
|
|
|
return SCM_INUM0;
|
|
|
|
|
|
case 0: /* just normalize remainder */
|
|
|
|
|
|
if (d)
|
|
|
|
|
|
scm_divbigdig (zds, ny, d);
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
doadj:
|
1999-01-10 07:38:39 +00:00
|
|
|
|
for (j = ny; j && !zds[j - 1]; --j);
|
|
|
|
|
|
if (j * SCM_BITSPERDIG <= sizeof (SCM) * SCM_CHAR_BIT)
|
|
|
|
|
|
if (SCM_INUMP (z = scm_big2inum (z, j)))
|
|
|
|
|
|
return z;
|
|
|
|
|
|
return scm_adjbig (z, j);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
#endif
|
1999-01-10 07:38:39 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*** NUMBERS -> STRINGS ***/
|
|
|
|
|
|
#ifdef SCM_FLOATS
|
|
|
|
|
|
int scm_dblprec;
|
1999-04-17 16:03:32 +00:00
|
|
|
|
static const double fx[] =
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{ 0.0, 5e-1, 5e-2, 5e-3, 5e-4, 5e-5,
|
|
|
|
|
|
5e-6, 5e-7, 5e-8, 5e-9, 5e-10,
|
|
|
|
|
|
5e-11, 5e-12, 5e-13, 5e-14, 5e-15,
|
|
|
|
|
|
5e-16, 5e-17, 5e-18, 5e-19, 5e-20};
|
1996-07-25 22:56:11 +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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
static scm_sizet
|
1999-12-12 02:36:16 +00:00
|
|
|
|
idbl2str (double f, char *a)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
int efmt, dpt, d, i, wp = scm_dblprec;
|
|
|
|
|
|
scm_sizet ch = 0;
|
|
|
|
|
|
int exp = 0;
|
|
|
|
|
|
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (f == 0.0)
|
|
|
|
|
|
goto zero; /*{a[0]='0'; a[1]='.'; a[2]='0'; return 3;} */
|
|
|
|
|
|
if (f < 0.0)
|
|
|
|
|
|
{
|
|
|
|
|
|
f = -f;
|
|
|
|
|
|
a[ch++] = '-';
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (f > 0.0);
|
|
|
|
|
|
else
|
|
|
|
|
|
goto funny;
|
|
|
|
|
|
if (IS_INF (f))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (ch == 0)
|
|
|
|
|
|
a[ch++] = '+';
|
|
|
|
|
|
funny:
|
|
|
|
|
|
a[ch++] = '#';
|
|
|
|
|
|
a[ch++] = '.';
|
|
|
|
|
|
a[ch++] = '#';
|
|
|
|
|
|
return ch;
|
|
|
|
|
|
}
|
|
|
|
|
|
#ifdef DBL_MIN_10_EXP /* Prevent unnormalized values, as from
|
|
|
|
|
|
make-uniform-vector, from causing infinite loops. */
|
|
|
|
|
|
while (f < 1.0)
|
|
|
|
|
|
{
|
|
|
|
|
|
f *= 10.0;
|
|
|
|
|
|
if (exp-- < DBL_MIN_10_EXP)
|
|
|
|
|
|
goto funny;
|
|
|
|
|
|
}
|
|
|
|
|
|
while (f > 10.0)
|
|
|
|
|
|
{
|
|
|
|
|
|
f *= 0.10;
|
|
|
|
|
|
if (exp++ > DBL_MAX_10_EXP)
|
|
|
|
|
|
goto funny;
|
|
|
|
|
|
}
|
|
|
|
|
|
#else
|
|
|
|
|
|
while (f < 1.0)
|
|
|
|
|
|
{
|
|
|
|
|
|
f *= 10.0;
|
|
|
|
|
|
exp--;
|
|
|
|
|
|
}
|
|
|
|
|
|
while (f > 10.0)
|
|
|
|
|
|
{
|
|
|
|
|
|
f /= 10.0;
|
|
|
|
|
|
exp++;
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
if (f + fx[wp] >= 10.0)
|
|
|
|
|
|
{
|
|
|
|
|
|
f = 1.0;
|
|
|
|
|
|
exp++;
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
zero:
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#ifdef ENGNOT
|
|
|
|
|
|
dpt = (exp + 9999) % 3;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
exp -= dpt++;
|
|
|
|
|
|
efmt = 1;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#else
|
|
|
|
|
|
efmt = (exp < -3) || (exp > wp + 2);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
if (!efmt)
|
1998-03-30 21:03:35 +00:00
|
|
|
|
{
|
|
|
|
|
|
if (exp < 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
a[ch++] = '0';
|
|
|
|
|
|
a[ch++] = '.';
|
|
|
|
|
|
dpt = exp;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
while (++dpt)
|
|
|
|
|
|
a[ch++] = '0';
|
1998-03-30 21:03:35 +00:00
|
|
|
|
}
|
|
|
|
|
|
else
|
1999-01-10 07:38:39 +00:00
|
|
|
|
dpt = exp + 1;
|
1998-03-30 21:03:35 +00:00
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
else
|
|
|
|
|
|
dpt = 1;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
do
|
|
|
|
|
|
{
|
|
|
|
|
|
d = f;
|
|
|
|
|
|
f -= d;
|
|
|
|
|
|
a[ch++] = d + '0';
|
|
|
|
|
|
if (f < fx[wp])
|
|
|
|
|
|
break;
|
|
|
|
|
|
if (f + fx[wp] >= 1.0)
|
|
|
|
|
|
{
|
|
|
|
|
|
a[ch - 1]++;
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
|
|
|
|
|
f *= 10.0;
|
|
|
|
|
|
if (!(--dpt))
|
|
|
|
|
|
a[ch++] = '.';
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-01-10 07:38:39 +00:00
|
|
|
|
while (wp--);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
if (dpt > 0)
|
1998-03-30 21:03:35 +00:00
|
|
|
|
{
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#ifndef ENGNOT
|
1998-03-30 21:03:35 +00:00
|
|
|
|
if ((dpt > 4) && (exp > 6))
|
|
|
|
|
|
{
|
1999-01-10 07:38:39 +00:00
|
|
|
|
d = (a[0] == '-' ? 2 : 1);
|
1998-03-30 21:03:35 +00:00
|
|
|
|
for (i = ch++; i > d; i--)
|
1999-01-10 07:38:39 +00:00
|
|
|
|
a[i] = a[i - 1];
|
1998-03-30 21:03:35 +00:00
|
|
|
|
a[d] = '.';
|
|
|
|
|
|
efmt = 1;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif
|
1998-03-30 21:03:35 +00:00
|
|
|
|
{
|
1999-01-10 07:38:39 +00:00
|
|
|
|
while (--dpt)
|
|
|
|
|
|
a[ch++] = '0';
|
1998-03-30 21:03:35 +00:00
|
|
|
|
a[ch++] = '.';
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (a[ch - 1] == '.')
|
|
|
|
|
|
a[ch++] = '0'; /* trailing zero */
|
|
|
|
|
|
if (efmt && exp)
|
|
|
|
|
|
{
|
|
|
|
|
|
a[ch++] = 'e';
|
|
|
|
|
|
if (exp < 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
exp = -exp;
|
|
|
|
|
|
a[ch++] = '-';
|
|
|
|
|
|
}
|
|
|
|
|
|
for (i = 10; i <= exp; i *= 10);
|
|
|
|
|
|
for (i /= 10; i; i /= 10)
|
|
|
|
|
|
{
|
|
|
|
|
|
a[ch++] = exp / i + '0';
|
|
|
|
|
|
exp %= i;
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
return ch;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
static scm_sizet
|
1999-12-12 02:36:16 +00:00
|
|
|
|
iflo2str (SCM flt, char *str)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
scm_sizet i;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#ifdef SCM_SINGLES
|
|
|
|
|
|
if (SCM_SINGP (flt))
|
|
|
|
|
|
i = idbl2str (SCM_FLO (flt), str);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
else
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
i = idbl2str (SCM_REAL (flt), str);
|
|
|
|
|
|
if (SCM_CPLXP (flt))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (0 <= SCM_IMAG (flt)) /* jeh */
|
|
|
|
|
|
str[i++] = '+'; /* jeh */
|
|
|
|
|
|
i += idbl2str (SCM_IMAG (flt), &str[i]);
|
|
|
|
|
|
str[i++] = 'i';
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return i;
|
|
|
|
|
|
}
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif /* SCM_FLOATS */
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
* configure.in: check for hstrerror.
* socket.c (scm_htons, scm_ntohs, scm_htonl, scm_ntohl): new
functions for network data conversion.
* numbers.c (scm_num2long, scm_num2longlong):
throw out-of-range instead of wrong-type-arg if appropriate.
(scm_iint2str): handle -2^31 correctly.
(scm_num2long): handle -2^31 bignum correctly.
(scm_num2long_long): rewrite the bigdig case: basically copied
from scm_num2long.
numbers.h: (SCM_BITSPERLONGLONG): deleted.
* unif.c (rapr1): use sprintf instead of intprint for unsigned
longs: intprint can't cope with large values.
* numbers.c (scm_num2ulong): check more consistently that the
input is not negative. if it is, throw out-of-range instead of
wrong-type-arg.
* ramap.c (scm_array_fill_int): don't limit fill to INUM for
uvect, ivect or llvect.
Check that fill doesn't overflow short uniform array.
* __scm.h: add another long to the definition of long_long and
ulong_long.
* unif.c (scm_raprin1): use 'l' instead of "long_long" in the
print representation of llvect. read can't handle more than
one character.
(scm_dimensions_to_uniform_array): make "fill" an optional argument
instead of a rest argument.
* tags.h (scm_tc7_llvect): wasn't defined anywhere, so use the free
tag 29 for now.
* __scm.h: don't mention LONGLONGS.
* unif.c, numbers.c, eq.c, gc.c, print.c, eval.c, ramap.c:
replace LONGLONGS with HAVE_LONG_LONGS as set by configure.
* net_db.c (scm_inet_aton): throw errors using the misc-error key
instead of system-error. inet_aton doesn't set errno.
system-error isn't right in gethost either, since it's throwing
the value of h_errno instead of errno. so:
(scm_host_not_found_key, scm_try_again_key,
scm_no_recovery_key, scm_no_data_key): new error keys.
(scm_resolv_error): new procedure, use the new keys.
(scm_gethost): call scm_resolv_error not scm_syserror_msg.
* error.c: (various): use scm_cons instead of scm_listify
to build short lists.
* boot-9.scm (read-hash-extend to set up arrays): add 'l' for
long_long uniform vectors.
* networking.scm (sethostent, setnetent, setprotoent, setservent):
take an optional argument STAYOPEN. default is #f.
* readline.c (scm_init_readline): set rl_readline_name to Guile,
to allow conditionals in .inputrc.
1999-11-18 22:36:28 +00:00
|
|
|
|
/* convert a long to a string (unterminated). returns the number of
|
1999-12-12 02:36:16 +00:00
|
|
|
|
characters in the result.
|
|
|
|
|
|
rad is output base
|
|
|
|
|
|
p is destination: worst case (base 2) is SCM_INTBUFLEN */
|
1996-07-25 22:56:11 +00:00
|
|
|
|
scm_sizet
|
1999-12-12 02:36:16 +00:00
|
|
|
|
scm_iint2str (long num, int rad, char *p)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
* configure.in: check for hstrerror.
* socket.c (scm_htons, scm_ntohs, scm_htonl, scm_ntohl): new
functions for network data conversion.
* numbers.c (scm_num2long, scm_num2longlong):
throw out-of-range instead of wrong-type-arg if appropriate.
(scm_iint2str): handle -2^31 correctly.
(scm_num2long): handle -2^31 bignum correctly.
(scm_num2long_long): rewrite the bigdig case: basically copied
from scm_num2long.
numbers.h: (SCM_BITSPERLONGLONG): deleted.
* unif.c (rapr1): use sprintf instead of intprint for unsigned
longs: intprint can't cope with large values.
* numbers.c (scm_num2ulong): check more consistently that the
input is not negative. if it is, throw out-of-range instead of
wrong-type-arg.
* ramap.c (scm_array_fill_int): don't limit fill to INUM for
uvect, ivect or llvect.
Check that fill doesn't overflow short uniform array.
* __scm.h: add another long to the definition of long_long and
ulong_long.
* unif.c (scm_raprin1): use 'l' instead of "long_long" in the
print representation of llvect. read can't handle more than
one character.
(scm_dimensions_to_uniform_array): make "fill" an optional argument
instead of a rest argument.
* tags.h (scm_tc7_llvect): wasn't defined anywhere, so use the free
tag 29 for now.
* __scm.h: don't mention LONGLONGS.
* unif.c, numbers.c, eq.c, gc.c, print.c, eval.c, ramap.c:
replace LONGLONGS with HAVE_LONG_LONGS as set by configure.
* net_db.c (scm_inet_aton): throw errors using the misc-error key
instead of system-error. inet_aton doesn't set errno.
system-error isn't right in gethost either, since it's throwing
the value of h_errno instead of errno. so:
(scm_host_not_found_key, scm_try_again_key,
scm_no_recovery_key, scm_no_data_key): new error keys.
(scm_resolv_error): new procedure, use the new keys.
(scm_gethost): call scm_resolv_error not scm_syserror_msg.
* error.c: (various): use scm_cons instead of scm_listify
to build short lists.
* boot-9.scm (read-hash-extend to set up arrays): add 'l' for
long_long uniform vectors.
* networking.scm (sethostent, setnetent, setprotoent, setservent):
take an optional argument STAYOPEN. default is #f.
* readline.c (scm_init_readline): set rl_readline_name to Guile,
to allow conditionals in .inputrc.
1999-11-18 22:36:28 +00:00
|
|
|
|
scm_sizet j = 1;
|
|
|
|
|
|
scm_sizet i;
|
|
|
|
|
|
unsigned long n = (num < 0) ? -num : num;
|
|
|
|
|
|
|
1999-01-10 07:38:39 +00:00
|
|
|
|
for (n /= rad; n > 0; n /= rad)
|
* configure.in: check for hstrerror.
* socket.c (scm_htons, scm_ntohs, scm_htonl, scm_ntohl): new
functions for network data conversion.
* numbers.c (scm_num2long, scm_num2longlong):
throw out-of-range instead of wrong-type-arg if appropriate.
(scm_iint2str): handle -2^31 correctly.
(scm_num2long): handle -2^31 bignum correctly.
(scm_num2long_long): rewrite the bigdig case: basically copied
from scm_num2long.
numbers.h: (SCM_BITSPERLONGLONG): deleted.
* unif.c (rapr1): use sprintf instead of intprint for unsigned
longs: intprint can't cope with large values.
* numbers.c (scm_num2ulong): check more consistently that the
input is not negative. if it is, throw out-of-range instead of
wrong-type-arg.
* ramap.c (scm_array_fill_int): don't limit fill to INUM for
uvect, ivect or llvect.
Check that fill doesn't overflow short uniform array.
* __scm.h: add another long to the definition of long_long and
ulong_long.
* unif.c (scm_raprin1): use 'l' instead of "long_long" in the
print representation of llvect. read can't handle more than
one character.
(scm_dimensions_to_uniform_array): make "fill" an optional argument
instead of a rest argument.
* tags.h (scm_tc7_llvect): wasn't defined anywhere, so use the free
tag 29 for now.
* __scm.h: don't mention LONGLONGS.
* unif.c, numbers.c, eq.c, gc.c, print.c, eval.c, ramap.c:
replace LONGLONGS with HAVE_LONG_LONGS as set by configure.
* net_db.c (scm_inet_aton): throw errors using the misc-error key
instead of system-error. inet_aton doesn't set errno.
system-error isn't right in gethost either, since it's throwing
the value of h_errno instead of errno. so:
(scm_host_not_found_key, scm_try_again_key,
scm_no_recovery_key, scm_no_data_key): new error keys.
(scm_resolv_error): new procedure, use the new keys.
(scm_gethost): call scm_resolv_error not scm_syserror_msg.
* error.c: (various): use scm_cons instead of scm_listify
to build short lists.
* boot-9.scm (read-hash-extend to set up arrays): add 'l' for
long_long uniform vectors.
* networking.scm (sethostent, setnetent, setprotoent, setservent):
take an optional argument STAYOPEN. default is #f.
* readline.c (scm_init_readline): set rl_readline_name to Guile,
to allow conditionals in .inputrc.
1999-11-18 22:36:28 +00:00
|
|
|
|
j++;
|
|
|
|
|
|
|
|
|
|
|
|
i = j;
|
|
|
|
|
|
if (num < 0)
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
|
|
|
|
|
*p++ = '-';
|
* configure.in: check for hstrerror.
* socket.c (scm_htons, scm_ntohs, scm_htonl, scm_ntohl): new
functions for network data conversion.
* numbers.c (scm_num2long, scm_num2longlong):
throw out-of-range instead of wrong-type-arg if appropriate.
(scm_iint2str): handle -2^31 correctly.
(scm_num2long): handle -2^31 bignum correctly.
(scm_num2long_long): rewrite the bigdig case: basically copied
from scm_num2long.
numbers.h: (SCM_BITSPERLONGLONG): deleted.
* unif.c (rapr1): use sprintf instead of intprint for unsigned
longs: intprint can't cope with large values.
* numbers.c (scm_num2ulong): check more consistently that the
input is not negative. if it is, throw out-of-range instead of
wrong-type-arg.
* ramap.c (scm_array_fill_int): don't limit fill to INUM for
uvect, ivect or llvect.
Check that fill doesn't overflow short uniform array.
* __scm.h: add another long to the definition of long_long and
ulong_long.
* unif.c (scm_raprin1): use 'l' instead of "long_long" in the
print representation of llvect. read can't handle more than
one character.
(scm_dimensions_to_uniform_array): make "fill" an optional argument
instead of a rest argument.
* tags.h (scm_tc7_llvect): wasn't defined anywhere, so use the free
tag 29 for now.
* __scm.h: don't mention LONGLONGS.
* unif.c, numbers.c, eq.c, gc.c, print.c, eval.c, ramap.c:
replace LONGLONGS with HAVE_LONG_LONGS as set by configure.
* net_db.c (scm_inet_aton): throw errors using the misc-error key
instead of system-error. inet_aton doesn't set errno.
system-error isn't right in gethost either, since it's throwing
the value of h_errno instead of errno. so:
(scm_host_not_found_key, scm_try_again_key,
scm_no_recovery_key, scm_no_data_key): new error keys.
(scm_resolv_error): new procedure, use the new keys.
(scm_gethost): call scm_resolv_error not scm_syserror_msg.
* error.c: (various): use scm_cons instead of scm_listify
to build short lists.
* boot-9.scm (read-hash-extend to set up arrays): add 'l' for
long_long uniform vectors.
* networking.scm (sethostent, setnetent, setprotoent, setservent):
take an optional argument STAYOPEN. default is #f.
* readline.c (scm_init_readline): set rl_readline_name to Guile,
to allow conditionals in .inputrc.
1999-11-18 22:36:28 +00:00
|
|
|
|
j++;
|
|
|
|
|
|
n = -num;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
* configure.in: check for hstrerror.
* socket.c (scm_htons, scm_ntohs, scm_htonl, scm_ntohl): new
functions for network data conversion.
* numbers.c (scm_num2long, scm_num2longlong):
throw out-of-range instead of wrong-type-arg if appropriate.
(scm_iint2str): handle -2^31 correctly.
(scm_num2long): handle -2^31 bignum correctly.
(scm_num2long_long): rewrite the bigdig case: basically copied
from scm_num2long.
numbers.h: (SCM_BITSPERLONGLONG): deleted.
* unif.c (rapr1): use sprintf instead of intprint for unsigned
longs: intprint can't cope with large values.
* numbers.c (scm_num2ulong): check more consistently that the
input is not negative. if it is, throw out-of-range instead of
wrong-type-arg.
* ramap.c (scm_array_fill_int): don't limit fill to INUM for
uvect, ivect or llvect.
Check that fill doesn't overflow short uniform array.
* __scm.h: add another long to the definition of long_long and
ulong_long.
* unif.c (scm_raprin1): use 'l' instead of "long_long" in the
print representation of llvect. read can't handle more than
one character.
(scm_dimensions_to_uniform_array): make "fill" an optional argument
instead of a rest argument.
* tags.h (scm_tc7_llvect): wasn't defined anywhere, so use the free
tag 29 for now.
* __scm.h: don't mention LONGLONGS.
* unif.c, numbers.c, eq.c, gc.c, print.c, eval.c, ramap.c:
replace LONGLONGS with HAVE_LONG_LONGS as set by configure.
* net_db.c (scm_inet_aton): throw errors using the misc-error key
instead of system-error. inet_aton doesn't set errno.
system-error isn't right in gethost either, since it's throwing
the value of h_errno instead of errno. so:
(scm_host_not_found_key, scm_try_again_key,
scm_no_recovery_key, scm_no_data_key): new error keys.
(scm_resolv_error): new procedure, use the new keys.
(scm_gethost): call scm_resolv_error not scm_syserror_msg.
* error.c: (various): use scm_cons instead of scm_listify
to build short lists.
* boot-9.scm (read-hash-extend to set up arrays): add 'l' for
long_long uniform vectors.
* networking.scm (sethostent, setnetent, setprotoent, setservent):
take an optional argument STAYOPEN. default is #f.
* readline.c (scm_init_readline): set rl_readline_name to Guile,
to allow conditionals in .inputrc.
1999-11-18 22:36:28 +00:00
|
|
|
|
else
|
|
|
|
|
|
n = num;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
while (i--)
|
|
|
|
|
|
{
|
* configure.in: check for hstrerror.
* socket.c (scm_htons, scm_ntohs, scm_htonl, scm_ntohl): new
functions for network data conversion.
* numbers.c (scm_num2long, scm_num2longlong):
throw out-of-range instead of wrong-type-arg if appropriate.
(scm_iint2str): handle -2^31 correctly.
(scm_num2long): handle -2^31 bignum correctly.
(scm_num2long_long): rewrite the bigdig case: basically copied
from scm_num2long.
numbers.h: (SCM_BITSPERLONGLONG): deleted.
* unif.c (rapr1): use sprintf instead of intprint for unsigned
longs: intprint can't cope with large values.
* numbers.c (scm_num2ulong): check more consistently that the
input is not negative. if it is, throw out-of-range instead of
wrong-type-arg.
* ramap.c (scm_array_fill_int): don't limit fill to INUM for
uvect, ivect or llvect.
Check that fill doesn't overflow short uniform array.
* __scm.h: add another long to the definition of long_long and
ulong_long.
* unif.c (scm_raprin1): use 'l' instead of "long_long" in the
print representation of llvect. read can't handle more than
one character.
(scm_dimensions_to_uniform_array): make "fill" an optional argument
instead of a rest argument.
* tags.h (scm_tc7_llvect): wasn't defined anywhere, so use the free
tag 29 for now.
* __scm.h: don't mention LONGLONGS.
* unif.c, numbers.c, eq.c, gc.c, print.c, eval.c, ramap.c:
replace LONGLONGS with HAVE_LONG_LONGS as set by configure.
* net_db.c (scm_inet_aton): throw errors using the misc-error key
instead of system-error. inet_aton doesn't set errno.
system-error isn't right in gethost either, since it's throwing
the value of h_errno instead of errno. so:
(scm_host_not_found_key, scm_try_again_key,
scm_no_recovery_key, scm_no_data_key): new error keys.
(scm_resolv_error): new procedure, use the new keys.
(scm_gethost): call scm_resolv_error not scm_syserror_msg.
* error.c: (various): use scm_cons instead of scm_listify
to build short lists.
* boot-9.scm (read-hash-extend to set up arrays): add 'l' for
long_long uniform vectors.
* networking.scm (sethostent, setnetent, setprotoent, setservent):
take an optional argument STAYOPEN. default is #f.
* readline.c (scm_init_readline): set rl_readline_name to Guile,
to allow conditionals in .inputrc.
1999-11-18 22:36:28 +00:00
|
|
|
|
int d = n % rad;
|
|
|
|
|
|
|
1999-01-10 07:38:39 +00:00
|
|
|
|
n /= rad;
|
|
|
|
|
|
p[i] = d + ((d < 10) ? '0' : 'a' - 10);
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return j;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
static SCM
|
1999-12-12 02:36:16 +00:00
|
|
|
|
big2str (SCM b, unsigned int radix)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-01-10 07:38:39 +00:00
|
|
|
|
SCM t = scm_copybig (b, 0); /* sign of temp doesn't matter */
|
|
|
|
|
|
register SCM_BIGDIG *ds = SCM_BDIGITS (t);
|
|
|
|
|
|
scm_sizet i = SCM_NUMDIGS (t);
|
|
|
|
|
|
scm_sizet j = radix == 16 ? (SCM_BITSPERDIG * i) / 4 + 2
|
|
|
|
|
|
: radix >= 10 ? (SCM_BITSPERDIG * i * 241L) / 800 + 2
|
|
|
|
|
|
: (SCM_BITSPERDIG * i) + 2;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
scm_sizet k = 0;
|
|
|
|
|
|
scm_sizet radct = 0;
|
|
|
|
|
|
scm_sizet ch; /* jeh */
|
|
|
|
|
|
SCM_BIGDIG radpow = 1, radmod = 0;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
SCM ss = scm_makstr ((long) j, 0);
|
|
|
|
|
|
char *s = SCM_CHARS (ss), c;
|
|
|
|
|
|
while ((long) radpow * radix < SCM_BIGRAD)
|
|
|
|
|
|
{
|
|
|
|
|
|
radpow *= radix;
|
|
|
|
|
|
radct++;
|
|
|
|
|
|
}
|
|
|
|
|
|
s[0] = scm_tc16_bigneg == SCM_TYP16 (b) ? '-' : '+';
|
|
|
|
|
|
while ((i || radmod) && j)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (k == 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
radmod = (SCM_BIGDIG) scm_divbigdig (ds, i, radpow);
|
|
|
|
|
|
k = radct;
|
|
|
|
|
|
if (!ds[i - 1])
|
|
|
|
|
|
i--;
|
|
|
|
|
|
}
|
|
|
|
|
|
c = radmod % radix;
|
|
|
|
|
|
radmod /= radix;
|
|
|
|
|
|
k--;
|
|
|
|
|
|
s[--j] = c < 10 ? c + '0' : c + 'a' - 10;
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
ch = s[0] == '-' ? 1 : 0; /* jeh */
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (ch < j)
|
|
|
|
|
|
{ /* jeh */
|
|
|
|
|
|
for (i = j; j < SCM_LENGTH (ss); j++)
|
|
|
|
|
|
s[ch + j - i] = s[j]; /* jeh */
|
|
|
|
|
|
scm_vector_set_length_x (ss, /* jeh */
|
|
|
|
|
|
(SCM) SCM_MAKINUM (ch + SCM_LENGTH (ss) - i));
|
|
|
|
|
|
}
|
1998-10-10 12:59:37 +00:00
|
|
|
|
|
|
|
|
|
|
return scm_return_first (ss, t);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_number_to_string, "number->string", 1, 1, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM x, SCM radix),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_number_to_string
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-12-12 02:36:16 +00:00
|
|
|
|
int base;
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_VALIDATE_INUM_MIN_DEF_COPY (2,radix,2,10,base);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#ifdef SCM_FLOATS
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_NINUMP (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
char num_buf[SCM_FLOBUFLEN];
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
|
|
|
|
|
SCM_ASRTGO (SCM_NIMP (x), badx);
|
|
|
|
|
|
if (SCM_BIGP (x))
|
1999-12-12 02:36:16 +00:00
|
|
|
|
return big2str (x, (unsigned int) base);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#ifndef SCM_RECKLESS
|
1999-12-16 20:48:05 +00:00
|
|
|
|
if (!SCM_INEXP (x))
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
|
|
|
|
|
badx:
|
1999-12-18 23:24:35 +00:00
|
|
|
|
SCM_WTA (1, x);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
#endif
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#else
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_ASSERT (SCM_INEXP (x),
|
1999-01-10 07:38:39 +00:00
|
|
|
|
x, SCM_ARG1, s_number_to_string);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return scm_makfromstr (num_buf, iflo2str (x, num_buf), 0);
|
|
|
|
|
|
}
|
|
|
|
|
|
#else
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
|
|
|
|
|
if (SCM_NINUMP (x))
|
|
|
|
|
|
{
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_ASSERT (SCM_BIGP (x),
|
1999-01-10 07:38:39 +00:00
|
|
|
|
x, SCM_ARG1, s_number_to_string);
|
1999-12-12 02:36:16 +00:00
|
|
|
|
return big2str (x, (unsigned int) base);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
#else
|
|
|
|
|
|
SCM_ASSERT (SCM_INUMP (x), x, SCM_ARG1, s_number_to_string);
|
|
|
|
|
|
#endif
|
|
|
|
|
|
#endif
|
|
|
|
|
|
{
|
|
|
|
|
|
char num_buf[SCM_INTBUFLEN];
|
|
|
|
|
|
return scm_makfromstr (num_buf,
|
|
|
|
|
|
scm_iint2str (SCM_INUM (x),
|
1999-12-12 02:36:16 +00:00
|
|
|
|
base,
|
1999-01-10 07:38:39 +00:00
|
|
|
|
num_buf),
|
|
|
|
|
|
0);
|
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* These print routines are stubbed here so that scm_repl.c doesn't need
|
|
|
|
|
|
SCM_FLOATS or SCM_BIGDIGs conditionals */
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
int
|
1999-12-12 02:36:16 +00:00
|
|
|
|
scm_floprint (SCM sexp, SCM port, scm_print_state *pstate)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
#ifdef SCM_FLOATS
|
|
|
|
|
|
char num_buf[SCM_FLOBUFLEN];
|
1999-01-10 07:38:39 +00:00
|
|
|
|
scm_lfwrite (num_buf, iflo2str (sexp, num_buf), port);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#else
|
1999-01-10 07:38:39 +00:00
|
|
|
|
scm_ipruk ("float", sexp, port);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
return !0;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
int
|
1999-12-12 02:36:16 +00:00
|
|
|
|
scm_bigprint (SCM exp, SCM port, scm_print_state *pstate)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
1999-01-10 07:38:39 +00:00
|
|
|
|
exp = big2str (exp, (unsigned int) 10);
|
|
|
|
|
|
scm_lfwrite (SCM_CHARS (exp), (scm_sizet) SCM_LENGTH (exp), port);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#else
|
1999-01-10 07:38:39 +00:00
|
|
|
|
scm_ipruk ("bignum", exp, port);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
return !0;
|
|
|
|
|
|
}
|
|
|
|
|
|
/*** END nums->strs ***/
|
|
|
|
|
|
|
|
|
|
|
|
/*** STRINGS -> NUMBERS ***/
|
1996-10-03 05:18:47 +00:00
|
|
|
|
|
|
|
|
|
|
static SCM
|
1999-12-12 02:36:16 +00:00
|
|
|
|
scm_small_istr2int (char *str, long len, long radix)
|
1996-10-03 05:18:47 +00:00
|
|
|
|
{
|
|
|
|
|
|
register long n = 0, ln;
|
|
|
|
|
|
register int c;
|
|
|
|
|
|
register int i = 0;
|
|
|
|
|
|
int lead_neg = 0;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (0 >= len)
|
|
|
|
|
|
return SCM_BOOL_F; /* zero scm_length */
|
|
|
|
|
|
switch (*str)
|
|
|
|
|
|
{ /* leading sign */
|
|
|
|
|
|
case '-':
|
|
|
|
|
|
lead_neg = 1;
|
|
|
|
|
|
case '+':
|
|
|
|
|
|
if (++i == len)
|
|
|
|
|
|
return SCM_BOOL_F; /* bad if lone `+' or `-' */
|
|
|
|
|
|
}
|
1996-10-03 05:18:47 +00:00
|
|
|
|
|
1999-01-10 07:38:39 +00:00
|
|
|
|
do
|
|
|
|
|
|
{
|
|
|
|
|
|
switch (c = str[i++])
|
|
|
|
|
|
{
|
|
|
|
|
|
case DIGITS:
|
|
|
|
|
|
c = c - '0';
|
|
|
|
|
|
goto accumulate;
|
|
|
|
|
|
case 'A':
|
|
|
|
|
|
case 'B':
|
|
|
|
|
|
case 'C':
|
|
|
|
|
|
case 'D':
|
|
|
|
|
|
case 'E':
|
|
|
|
|
|
case 'F':
|
|
|
|
|
|
c = c - 'A' + 10;
|
|
|
|
|
|
goto accumulate;
|
|
|
|
|
|
case 'a':
|
|
|
|
|
|
case 'b':
|
|
|
|
|
|
case 'c':
|
|
|
|
|
|
case 'd':
|
|
|
|
|
|
case 'e':
|
|
|
|
|
|
case 'f':
|
|
|
|
|
|
c = c - 'a' + 10;
|
|
|
|
|
|
accumulate:
|
|
|
|
|
|
if (c >= radix)
|
|
|
|
|
|
return SCM_BOOL_F; /* bad digit for radix */
|
|
|
|
|
|
ln = n;
|
|
|
|
|
|
n = n * radix - c;
|
|
|
|
|
|
/* Negation is a workaround for HP700 cc bug */
|
|
|
|
|
|
if (n > ln || (-n > -SCM_MOST_NEGATIVE_FIXNUM))
|
|
|
|
|
|
goto ovfl;
|
|
|
|
|
|
break;
|
|
|
|
|
|
default:
|
|
|
|
|
|
return SCM_BOOL_F; /* not a digit */
|
|
|
|
|
|
}
|
1996-10-03 05:18:47 +00:00
|
|
|
|
}
|
1999-01-10 07:38:39 +00:00
|
|
|
|
while (i < len);
|
|
|
|
|
|
if (!lead_neg)
|
|
|
|
|
|
if ((n = -n) > SCM_MOST_POSITIVE_FIXNUM)
|
|
|
|
|
|
goto ovfl;
|
|
|
|
|
|
return SCM_MAKINUM (n);
|
1996-10-03 05:18:47 +00:00
|
|
|
|
ovfl: /* overflow scheme integer */
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 02:36:16 +00:00
|
|
|
|
scm_istr2int (char *str, long len, long radix)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
scm_sizet j;
|
|
|
|
|
|
register scm_sizet k, blen = 1;
|
|
|
|
|
|
scm_sizet i = 0;
|
|
|
|
|
|
int c;
|
|
|
|
|
|
SCM res;
|
|
|
|
|
|
register SCM_BIGDIG *ds;
|
|
|
|
|
|
register unsigned long t2;
|
|
|
|
|
|
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (0 >= len)
|
|
|
|
|
|
return SCM_BOOL_F; /* zero scm_length */
|
1996-10-03 05:18:47 +00:00
|
|
|
|
|
|
|
|
|
|
/* Short numbers we parse directly into an int, to avoid the overhead
|
|
|
|
|
|
of creating a bignum. */
|
|
|
|
|
|
if (len < 6)
|
|
|
|
|
|
return scm_small_istr2int (str, len, radix);
|
|
|
|
|
|
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (16 == radix)
|
|
|
|
|
|
j = 1 + (4 * len * sizeof (char)) / (SCM_BITSPERDIG);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
else if (10 <= radix)
|
1999-01-10 07:38:39 +00:00
|
|
|
|
j = 1 + (84 * len * sizeof (char)) / (SCM_BITSPERDIG * 25);
|
|
|
|
|
|
else
|
|
|
|
|
|
j = 1 + (len * sizeof (char)) / (SCM_BITSPERDIG);
|
|
|
|
|
|
switch (str[0])
|
|
|
|
|
|
{ /* leading sign */
|
|
|
|
|
|
case '-':
|
|
|
|
|
|
case '+':
|
|
|
|
|
|
if (++i == (unsigned) len)
|
|
|
|
|
|
return SCM_BOOL_F; /* bad if lone `+' or `-' */
|
|
|
|
|
|
}
|
|
|
|
|
|
res = scm_mkbig (j, '-' == str[0]);
|
|
|
|
|
|
ds = SCM_BDIGITS (res);
|
|
|
|
|
|
for (k = j; k--;)
|
|
|
|
|
|
ds[k] = 0;
|
|
|
|
|
|
do
|
|
|
|
|
|
{
|
|
|
|
|
|
switch (c = str[i++])
|
|
|
|
|
|
{
|
|
|
|
|
|
case DIGITS:
|
|
|
|
|
|
c = c - '0';
|
|
|
|
|
|
goto accumulate;
|
|
|
|
|
|
case 'A':
|
|
|
|
|
|
case 'B':
|
|
|
|
|
|
case 'C':
|
|
|
|
|
|
case 'D':
|
|
|
|
|
|
case 'E':
|
|
|
|
|
|
case 'F':
|
|
|
|
|
|
c = c - 'A' + 10;
|
|
|
|
|
|
goto accumulate;
|
|
|
|
|
|
case 'a':
|
|
|
|
|
|
case 'b':
|
|
|
|
|
|
case 'c':
|
|
|
|
|
|
case 'd':
|
|
|
|
|
|
case 'e':
|
|
|
|
|
|
case 'f':
|
|
|
|
|
|
c = c - 'a' + 10;
|
|
|
|
|
|
accumulate:
|
|
|
|
|
|
if (c >= radix)
|
|
|
|
|
|
return SCM_BOOL_F; /* bad digit for radix */
|
|
|
|
|
|
k = 0;
|
|
|
|
|
|
t2 = c;
|
|
|
|
|
|
moretodo:
|
|
|
|
|
|
while (k < blen)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* printf ("k = %d, blen = %d, t2 = %ld, ds[k] = %d\n", k, blen, t2, ds[k]); */
|
|
|
|
|
|
t2 += ds[k] * radix;
|
|
|
|
|
|
ds[k++] = SCM_BIGLO (t2);
|
|
|
|
|
|
t2 = SCM_BIGDN (t2);
|
|
|
|
|
|
}
|
|
|
|
|
|
if (blen > j)
|
|
|
|
|
|
scm_num_overflow ("bignum");
|
|
|
|
|
|
if (t2)
|
|
|
|
|
|
{
|
|
|
|
|
|
blen++;
|
|
|
|
|
|
goto moretodo;
|
|
|
|
|
|
}
|
|
|
|
|
|
break;
|
|
|
|
|
|
default:
|
|
|
|
|
|
return SCM_BOOL_F; /* not a digit */
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-01-10 07:38:39 +00:00
|
|
|
|
while (i < (unsigned) len);
|
|
|
|
|
|
if (blen * SCM_BITSPERDIG / SCM_CHAR_BIT <= sizeof (SCM))
|
|
|
|
|
|
if (SCM_INUMP (res = scm_big2inum (res, blen)))
|
|
|
|
|
|
return res;
|
|
|
|
|
|
if (j == blen)
|
|
|
|
|
|
return res;
|
|
|
|
|
|
return scm_adjbig (res, blen);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef SCM_FLOATS
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 02:36:16 +00:00
|
|
|
|
scm_istr2flo (char *str, long len, long radix)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
register int c, i = 0;
|
|
|
|
|
|
double lead_sgn;
|
|
|
|
|
|
double res = 0.0, tmp = 0.0;
|
|
|
|
|
|
int flg = 0;
|
|
|
|
|
|
int point = 0;
|
|
|
|
|
|
SCM second;
|
|
|
|
|
|
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (i >= len)
|
|
|
|
|
|
return SCM_BOOL_F; /* zero scm_length */
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
1999-01-10 07:38:39 +00:00
|
|
|
|
switch (*str)
|
|
|
|
|
|
{ /* leading sign */
|
|
|
|
|
|
case '-':
|
|
|
|
|
|
lead_sgn = -1.0;
|
|
|
|
|
|
i++;
|
|
|
|
|
|
break;
|
|
|
|
|
|
case '+':
|
|
|
|
|
|
lead_sgn = 1.0;
|
|
|
|
|
|
i++;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
break;
|
|
|
|
|
|
default:
|
1999-01-10 07:38:39 +00:00
|
|
|
|
lead_sgn = 0.0;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (i == len)
|
|
|
|
|
|
return SCM_BOOL_F; /* bad if lone `+' or `-' */
|
|
|
|
|
|
|
|
|
|
|
|
if (str[i] == 'i' || str[i] == 'I')
|
|
|
|
|
|
{ /* handle `+i' and `-i' */
|
|
|
|
|
|
if (lead_sgn == 0.0)
|
|
|
|
|
|
return SCM_BOOL_F; /* must have leading sign */
|
|
|
|
|
|
if (++i < len)
|
|
|
|
|
|
return SCM_BOOL_F; /* `i' not last character */
|
|
|
|
|
|
return scm_makdbl (0.0, lead_sgn);
|
|
|
|
|
|
}
|
|
|
|
|
|
do
|
|
|
|
|
|
{ /* check initial digits */
|
|
|
|
|
|
switch (c = str[i])
|
|
|
|
|
|
{
|
|
|
|
|
|
case DIGITS:
|
|
|
|
|
|
c = c - '0';
|
|
|
|
|
|
goto accum1;
|
|
|
|
|
|
case 'D':
|
|
|
|
|
|
case 'E':
|
|
|
|
|
|
case 'F':
|
|
|
|
|
|
if (radix == 10)
|
|
|
|
|
|
goto out1; /* must be exponent */
|
|
|
|
|
|
case 'A':
|
|
|
|
|
|
case 'B':
|
|
|
|
|
|
case 'C':
|
|
|
|
|
|
c = c - 'A' + 10;
|
|
|
|
|
|
goto accum1;
|
|
|
|
|
|
case 'd':
|
|
|
|
|
|
case 'e':
|
|
|
|
|
|
case 'f':
|
|
|
|
|
|
if (radix == 10)
|
|
|
|
|
|
goto out1;
|
|
|
|
|
|
case 'a':
|
|
|
|
|
|
case 'b':
|
|
|
|
|
|
case 'c':
|
|
|
|
|
|
c = c - 'a' + 10;
|
|
|
|
|
|
accum1:
|
|
|
|
|
|
if (c >= radix)
|
|
|
|
|
|
return SCM_BOOL_F; /* bad digit for radix */
|
|
|
|
|
|
res = res * radix + c;
|
|
|
|
|
|
flg = 1; /* res is valid */
|
|
|
|
|
|
break;
|
|
|
|
|
|
default:
|
|
|
|
|
|
goto out1;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
while (++i < len);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
out1:
|
|
|
|
|
|
|
|
|
|
|
|
/* if true, then we did see a digit above, and res is valid */
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (i == len)
|
|
|
|
|
|
goto done;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
/* By here, must have seen a digit,
|
|
|
|
|
|
or must have next char be a `.' with radix==10 */
|
|
|
|
|
|
if (!flg)
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (!(str[i] == '.' && radix == 10))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
|
1999-01-10 07:38:39 +00:00
|
|
|
|
while (str[i] == '#')
|
|
|
|
|
|
{ /* optional sharps */
|
|
|
|
|
|
res *= radix;
|
|
|
|
|
|
if (++i == len)
|
|
|
|
|
|
goto done;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (str[i] == '/')
|
|
|
|
|
|
{
|
|
|
|
|
|
while (++i < len)
|
|
|
|
|
|
{
|
|
|
|
|
|
switch (c = str[i])
|
|
|
|
|
|
{
|
|
|
|
|
|
case DIGITS:
|
|
|
|
|
|
c = c - '0';
|
|
|
|
|
|
goto accum2;
|
|
|
|
|
|
case 'A':
|
|
|
|
|
|
case 'B':
|
|
|
|
|
|
case 'C':
|
|
|
|
|
|
case 'D':
|
|
|
|
|
|
case 'E':
|
|
|
|
|
|
case 'F':
|
|
|
|
|
|
c = c - 'A' + 10;
|
|
|
|
|
|
goto accum2;
|
|
|
|
|
|
case 'a':
|
|
|
|
|
|
case 'b':
|
|
|
|
|
|
case 'c':
|
|
|
|
|
|
case 'd':
|
|
|
|
|
|
case 'e':
|
|
|
|
|
|
case 'f':
|
|
|
|
|
|
c = c - 'a' + 10;
|
|
|
|
|
|
accum2:
|
|
|
|
|
|
if (c >= radix)
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
tmp = tmp * radix + c;
|
|
|
|
|
|
break;
|
|
|
|
|
|
default:
|
|
|
|
|
|
goto out2;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
out2:
|
|
|
|
|
|
if (tmp == 0.0)
|
|
|
|
|
|
return SCM_BOOL_F; /* `slash zero' not allowed */
|
|
|
|
|
|
if (i < len)
|
|
|
|
|
|
while (str[i] == '#')
|
|
|
|
|
|
{ /* optional sharps */
|
|
|
|
|
|
tmp *= radix;
|
|
|
|
|
|
if (++i == len)
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
|
|
|
|
|
res /= tmp;
|
|
|
|
|
|
goto done;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-01-10 07:38:39 +00:00
|
|
|
|
|
|
|
|
|
|
if (str[i] == '.')
|
|
|
|
|
|
{ /* decimal point notation */
|
|
|
|
|
|
if (radix != 10)
|
|
|
|
|
|
return SCM_BOOL_F; /* must be radix 10 */
|
|
|
|
|
|
while (++i < len)
|
|
|
|
|
|
{
|
|
|
|
|
|
switch (c = str[i])
|
|
|
|
|
|
{
|
|
|
|
|
|
case DIGITS:
|
|
|
|
|
|
point--;
|
|
|
|
|
|
res = res * 10.0 + c - '0';
|
|
|
|
|
|
flg = 1;
|
|
|
|
|
|
break;
|
|
|
|
|
|
default:
|
|
|
|
|
|
goto out3;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
out3:
|
|
|
|
|
|
if (!flg)
|
|
|
|
|
|
return SCM_BOOL_F; /* no digits before or after decimal point */
|
|
|
|
|
|
if (i == len)
|
|
|
|
|
|
goto adjust;
|
|
|
|
|
|
while (str[i] == '#')
|
|
|
|
|
|
{ /* ignore remaining sharps */
|
|
|
|
|
|
if (++i == len)
|
|
|
|
|
|
goto adjust;
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
1999-01-10 07:38:39 +00:00
|
|
|
|
switch (str[i])
|
|
|
|
|
|
{ /* exponent */
|
|
|
|
|
|
case 'd':
|
|
|
|
|
|
case 'D':
|
|
|
|
|
|
case 'e':
|
|
|
|
|
|
case 'E':
|
|
|
|
|
|
case 'f':
|
|
|
|
|
|
case 'F':
|
|
|
|
|
|
case 'l':
|
|
|
|
|
|
case 'L':
|
|
|
|
|
|
case 's':
|
|
|
|
|
|
case 'S':
|
|
|
|
|
|
{
|
|
|
|
|
|
int expsgn = 1, expon = 0;
|
|
|
|
|
|
if (radix != 10)
|
|
|
|
|
|
return SCM_BOOL_F; /* only in radix 10 */
|
|
|
|
|
|
if (++i == len)
|
|
|
|
|
|
return SCM_BOOL_F; /* bad exponent */
|
|
|
|
|
|
switch (str[i])
|
|
|
|
|
|
{
|
|
|
|
|
|
case '-':
|
|
|
|
|
|
expsgn = (-1);
|
|
|
|
|
|
case '+':
|
|
|
|
|
|
if (++i == len)
|
|
|
|
|
|
return SCM_BOOL_F; /* bad exponent */
|
|
|
|
|
|
}
|
|
|
|
|
|
if (str[i] < '0' || str[i] > '9')
|
|
|
|
|
|
return SCM_BOOL_F; /* bad exponent */
|
|
|
|
|
|
do
|
|
|
|
|
|
{
|
|
|
|
|
|
switch (c = str[i])
|
|
|
|
|
|
{
|
|
|
|
|
|
case DIGITS:
|
|
|
|
|
|
expon = expon * 10 + c - '0';
|
|
|
|
|
|
if (expon > MAXEXP)
|
|
|
|
|
|
return SCM_BOOL_F; /* exponent too large */
|
|
|
|
|
|
break;
|
|
|
|
|
|
default:
|
|
|
|
|
|
goto out4;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
while (++i < len);
|
|
|
|
|
|
out4:
|
|
|
|
|
|
point += expsgn * expon;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
adjust:
|
|
|
|
|
|
if (point >= 0)
|
1999-01-10 07:38:39 +00:00
|
|
|
|
while (point--)
|
|
|
|
|
|
res *= 10.0;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
else
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#ifdef _UNICOS
|
|
|
|
|
|
while (point++)
|
|
|
|
|
|
res *= 0.1;
|
|
|
|
|
|
#else
|
|
|
|
|
|
while (point++)
|
|
|
|
|
|
res /= 10.0;
|
|
|
|
|
|
#endif
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
done:
|
|
|
|
|
|
/* at this point, we have a legitimate floating point result */
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (lead_sgn == -1.0)
|
|
|
|
|
|
res = -res;
|
|
|
|
|
|
if (i == len)
|
|
|
|
|
|
return scm_makdbl (res, 0.0);
|
|
|
|
|
|
|
|
|
|
|
|
if (str[i] == 'i' || str[i] == 'I')
|
|
|
|
|
|
{ /* pure imaginary number */
|
|
|
|
|
|
if (lead_sgn == 0.0)
|
|
|
|
|
|
return SCM_BOOL_F; /* must have leading sign */
|
|
|
|
|
|
if (++i < len)
|
|
|
|
|
|
return SCM_BOOL_F; /* `i' not last character */
|
|
|
|
|
|
return scm_makdbl (0.0, res);
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
1999-01-10 07:38:39 +00:00
|
|
|
|
switch (str[i++])
|
|
|
|
|
|
{
|
|
|
|
|
|
case '-':
|
|
|
|
|
|
lead_sgn = -1.0;
|
|
|
|
|
|
break;
|
|
|
|
|
|
case '+':
|
|
|
|
|
|
lead_sgn = 1.0;
|
|
|
|
|
|
break;
|
|
|
|
|
|
case '@':
|
|
|
|
|
|
{ /* polar input for complex number */
|
|
|
|
|
|
/* get a `real' for scm_angle */
|
|
|
|
|
|
second = scm_istr2flo (&str[i], (long) (len - i), radix);
|
1999-12-16 20:48:05 +00:00
|
|
|
|
if (!SCM_INEXP (second))
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return SCM_BOOL_F; /* not `real' */
|
|
|
|
|
|
if (SCM_CPLXP (second))
|
|
|
|
|
|
return SCM_BOOL_F; /* not `real' */
|
|
|
|
|
|
tmp = SCM_REALPART (second);
|
|
|
|
|
|
return scm_makdbl (res * cos (tmp), res * sin (tmp));
|
|
|
|
|
|
}
|
|
|
|
|
|
default:
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
/* at this point, last char must be `i' */
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (str[len - 1] != 'i' && str[len - 1] != 'I')
|
|
|
|
|
|
return SCM_BOOL_F;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
/* handles `x+i' and `x-i' */
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (i == (len - 1))
|
|
|
|
|
|
return scm_makdbl (res, lead_sgn);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
/* get a `ureal' for complex part */
|
1999-01-10 07:38:39 +00:00
|
|
|
|
second = scm_istr2flo (&str[i], (long) ((len - i) - 1), radix);
|
1999-12-16 20:48:05 +00:00
|
|
|
|
if (!SCM_INEXP (second))
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return SCM_BOOL_F; /* not `ureal' */
|
|
|
|
|
|
if (SCM_CPLXP (second))
|
|
|
|
|
|
return SCM_BOOL_F; /* not `ureal' */
|
|
|
|
|
|
tmp = SCM_REALPART (second);
|
|
|
|
|
|
if (tmp < 0.0)
|
|
|
|
|
|
return SCM_BOOL_F; /* not `ureal' */
|
|
|
|
|
|
return scm_makdbl (res, (lead_sgn * tmp));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif /* SCM_FLOATS */
|
1996-07-25 22:56:11 +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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 02:36:16 +00:00
|
|
|
|
scm_istring2number (char *str, long len, long radix)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
int i = 0;
|
|
|
|
|
|
char ex = 0;
|
|
|
|
|
|
char ex_p = 0, rx_p = 0; /* Only allow 1 exactness and 1 radix prefix */
|
|
|
|
|
|
SCM res;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (len == 1)
|
|
|
|
|
|
if (*str == '+' || *str == '-') /* Catches lone `+' and `-' for speed */
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
|
1999-01-10 07:38:39 +00:00
|
|
|
|
while ((len - i) >= 2 && str[i] == '#' && ++i)
|
|
|
|
|
|
switch (str[i++])
|
|
|
|
|
|
{
|
|
|
|
|
|
case 'b':
|
|
|
|
|
|
case 'B':
|
|
|
|
|
|
if (rx_p++)
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
radix = 2;
|
|
|
|
|
|
break;
|
|
|
|
|
|
case 'o':
|
|
|
|
|
|
case 'O':
|
|
|
|
|
|
if (rx_p++)
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
radix = 8;
|
|
|
|
|
|
break;
|
|
|
|
|
|
case 'd':
|
|
|
|
|
|
case 'D':
|
|
|
|
|
|
if (rx_p++)
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
radix = 10;
|
|
|
|
|
|
break;
|
|
|
|
|
|
case 'x':
|
|
|
|
|
|
case 'X':
|
|
|
|
|
|
if (rx_p++)
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
radix = 16;
|
|
|
|
|
|
break;
|
|
|
|
|
|
case 'i':
|
|
|
|
|
|
case 'I':
|
|
|
|
|
|
if (ex_p++)
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
ex = 2;
|
|
|
|
|
|
break;
|
|
|
|
|
|
case 'e':
|
|
|
|
|
|
case 'E':
|
|
|
|
|
|
if (ex_p++)
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
ex = 1;
|
|
|
|
|
|
break;
|
|
|
|
|
|
default:
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
switch (ex)
|
|
|
|
|
|
{
|
|
|
|
|
|
case 1:
|
|
|
|
|
|
return scm_istr2int (&str[i], len - i, radix);
|
|
|
|
|
|
case 0:
|
|
|
|
|
|
res = scm_istr2int (&str[i], len - i, radix);
|
|
|
|
|
|
if (SCM_NFALSEP (res))
|
|
|
|
|
|
return res;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#ifdef SCM_FLOATS
|
1999-01-10 07:38:39 +00:00
|
|
|
|
case 2:
|
|
|
|
|
|
return scm_istr2flo (&str[i], len - i, radix);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_string_to_number, "string->number", 1, 1, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM str, SCM radix),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_string_to_number
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM answer;
|
1999-12-12 02:36:16 +00:00
|
|
|
|
int base;
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_VALIDATE_ROSTRING (1,str);
|
|
|
|
|
|
SCM_VALIDATE_INUM_MIN_DEF_COPY (2,radix,2,10,base);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
answer = scm_istring2number (SCM_ROCHARS (str),
|
|
|
|
|
|
SCM_ROLENGTH (str),
|
1999-12-12 02:36:16 +00:00
|
|
|
|
base);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return scm_return_first (answer, str);
|
|
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
/*** END strs->nums ***/
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef SCM_FLOATS
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 02:36:16 +00:00
|
|
|
|
scm_makdbl (double x, double y)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM z;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if ((y == 0.0) && (x == 0.0))
|
|
|
|
|
|
return scm_flo0;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM_DEFER_INTS;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (y == 0.0)
|
|
|
|
|
|
{
|
|
|
|
|
|
#ifdef SCM_SINGLES
|
|
|
|
|
|
float fx = x;
|
|
|
|
|
|
#ifndef SCM_SINGLESONLY
|
|
|
|
|
|
if ((-FLTMAX < x) && (x < FLTMAX) && (fx == x))
|
|
|
|
|
|
#endif
|
|
|
|
|
|
{
|
1999-07-07 09:44:01 +00:00
|
|
|
|
SCM_NEWSMOB(z,scm_tc_flo,NULL);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
SCM_FLO (z) = x;
|
|
|
|
|
|
SCM_ALLOW_INTS;
|
|
|
|
|
|
return z;
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif /* def SCM_SINGLES */
|
1999-07-07 09:44:01 +00:00
|
|
|
|
SCM_NEWSMOB(z,scm_tc_dblr,scm_must_malloc (1L * sizeof (double), "real"));
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
1999-07-07 09:44:01 +00:00
|
|
|
|
SCM_NEWSMOB(z,scm_tc_dblc,scm_must_malloc (2L * sizeof (double), "comkplex"));
|
1999-07-31 09:05:02 +00:00
|
|
|
|
SCM_IMAG (z) = y;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
SCM_REAL (z) = x;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM_ALLOW_INTS;
|
|
|
|
|
|
return z;
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 02:36:16 +00:00
|
|
|
|
scm_bigequal (SCM x, SCM y)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (0 == scm_bigcomp (x, y))
|
|
|
|
|
|
return SCM_BOOL_T;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 02:36:16 +00:00
|
|
|
|
scm_floequal (SCM x, SCM y)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
#ifdef SCM_FLOATS
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_REALPART (x) != SCM_REALPART (y))
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
if (!(SCM_CPLXP (x) && (SCM_IMAG (x) != SCM_IMAG (y))))
|
|
|
|
|
|
return SCM_BOOL_T;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1999-12-12 02:36:16 +00:00
|
|
|
|
SCM_REGISTER_PROC (s_number_p, "number?", 1, 0, 0, scm_number_p);
|
* __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
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_number_p, "complex?", 1, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM x),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_number_p
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_INUMP (x))
|
|
|
|
|
|
return SCM_BOOL_T;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#ifdef SCM_FLOATS
|
1999-12-16 20:48:05 +00:00
|
|
|
|
if (SCM_NUMP (x))
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return SCM_BOOL_T;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#else
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#ifdef SCM_BIGDIG
|
1999-12-16 20:48:05 +00:00
|
|
|
|
if (SCM_NUMP (x))
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return SCM_BOOL_T;
|
|
|
|
|
|
#endif
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef SCM_FLOATS
|
1999-12-12 02:36:16 +00:00
|
|
|
|
SCM_REGISTER_PROC (s_real_p, "real?", 1, 0, 0, scm_real_p);
|
* __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
|
|
|
|
|
1999-12-12 02:36:16 +00:00
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_real_p, "rational?", 1, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM x),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_real_p
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_INUMP (x))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return SCM_BOOL_T;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_IMP (x))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return SCM_BOOL_F;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_REALP (x))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return SCM_BOOL_T;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#ifdef SCM_BIGDIG
|
|
|
|
|
|
if (SCM_BIGP (x))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return SCM_BOOL_T;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_integer_p, "integer?", 1, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM x),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_integer_p
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
double r;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_INUMP (x))
|
|
|
|
|
|
return SCM_BOOL_T;
|
|
|
|
|
|
if (SCM_IMP (x))
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
|
|
|
|
|
if (SCM_BIGP (x))
|
|
|
|
|
|
return SCM_BOOL_T;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
if (!SCM_INEXP (x))
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
if (SCM_CPLXP (x))
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
r = SCM_REALPART (x);
|
|
|
|
|
|
if (r == floor (r))
|
|
|
|
|
|
return SCM_BOOL_T;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif /* SCM_FLOATS */
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_inexact_p, "inexact?", 1, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM x),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_inexact_p
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
#ifdef SCM_FLOATS
|
1999-12-16 20:48:05 +00:00
|
|
|
|
if (SCM_INEXP (x))
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return SCM_BOOL_T;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1999-09-06 21:12:15 +00:00
|
|
|
|
SCM_GPROC1 (s_eq_p, "=", scm_tc7_rpsubr, scm_num_eq_p, g_eq_p);
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_num_eq_p (SCM x, SCM y)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
#ifdef SCM_FLOATS
|
|
|
|
|
|
SCM t;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_NINUMP (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
1999-12-16 20:48:05 +00:00
|
|
|
|
if (!SCM_NIMP (x))
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
|
|
|
|
|
badx:
|
1999-09-06 21:12:15 +00:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_eq_p, x, y, SCM_ARG1, s_eq_p);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
if (SCM_BIGP (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_INUMP (y))
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
SCM_ASRTGO (SCM_NIMP (y), bady);
|
|
|
|
|
|
if (SCM_BIGP (y))
|
1999-12-12 19:24:29 +00:00
|
|
|
|
return SCM_BOOL(0 == scm_bigcomp (x, y));
|
1999-01-10 07:38:39 +00:00
|
|
|
|
SCM_ASRTGO (SCM_INEXP (y), bady);
|
|
|
|
|
|
bigreal:
|
|
|
|
|
|
return ((SCM_REALP (y) && (scm_big2dbl (x) == SCM_REALPART (y)))
|
|
|
|
|
|
? SCM_BOOL_T
|
|
|
|
|
|
: SCM_BOOL_F);
|
|
|
|
|
|
}
|
|
|
|
|
|
SCM_ASRTGO (SCM_INEXP (x), badx);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#else
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_GASSERT2 (SCM_INEXP (x),
|
1999-09-06 21:12:15 +00:00
|
|
|
|
g_eq_p, x, y, SCM_ARG1, s_eq_p);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
if (SCM_INUMP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
t = x;
|
|
|
|
|
|
x = y;
|
|
|
|
|
|
y = t;
|
|
|
|
|
|
goto realint;
|
|
|
|
|
|
}
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
|
|
|
|
|
SCM_ASRTGO (SCM_NIMP (y), bady);
|
|
|
|
|
|
if (SCM_BIGP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
t = x;
|
|
|
|
|
|
x = y;
|
|
|
|
|
|
y = t;
|
|
|
|
|
|
goto bigreal;
|
|
|
|
|
|
}
|
|
|
|
|
|
SCM_ASRTGO (SCM_INEXP (y), bady);
|
|
|
|
|
|
#else
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_ASRTGO (SCM_INEXP (y), bady);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
if (SCM_REALPART (x) != SCM_REALPART (y))
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
if (SCM_CPLXP (x))
|
|
|
|
|
|
return ((SCM_CPLXP (y) && (SCM_IMAG (x) == SCM_IMAG (y)))
|
|
|
|
|
|
? SCM_BOOL_T
|
|
|
|
|
|
: SCM_BOOL_F);
|
1999-12-12 19:24:29 +00:00
|
|
|
|
return SCM_NEGATE_BOOL(SCM_CPLXP (y));
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
if (SCM_NINUMP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
|
|
|
|
|
SCM_ASRTGO (SCM_NIMP (y), bady);
|
|
|
|
|
|
if (SCM_BIGP (y))
|
|
|
|
|
|
return SCM_BOOL_F;
|
1999-12-16 20:48:05 +00:00
|
|
|
|
if (!SCM_INEXP (y))
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
|
|
|
|
|
bady:
|
1999-09-06 21:12:15 +00:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_eq_p, x, y, SCM_ARGn, s_eq_p);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
#else
|
1999-12-16 20:48:05 +00:00
|
|
|
|
if (!SCM_INEXP (y))
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
|
|
|
|
|
bady:
|
1999-09-06 21:12:15 +00:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_eq_p, x, y, SCM_ARGn, s_eq_p);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
realint:
|
|
|
|
|
|
return ((SCM_REALP (y) && (((double) SCM_INUM (x)) == SCM_REALPART (y)))
|
|
|
|
|
|
? SCM_BOOL_T
|
|
|
|
|
|
: SCM_BOOL_F);
|
|
|
|
|
|
}
|
|
|
|
|
|
#else
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
|
|
|
|
|
if (SCM_NINUMP (x))
|
|
|
|
|
|
{
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_GASSERT2 (SCM_BIGP (x),
|
1999-09-06 21:12:15 +00:00
|
|
|
|
g_eq_p, x, y, SCM_ARG1, s_eq_p);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_INUMP (y))
|
|
|
|
|
|
return SCM_BOOL_F;
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_ASRTGO (SCM_BIGP (y), bady);
|
1999-12-12 19:24:29 +00:00
|
|
|
|
return SCM_BOOL(0 == scm_bigcomp (x, y));
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
if (SCM_NINUMP (y))
|
|
|
|
|
|
{
|
1999-12-16 20:48:05 +00:00
|
|
|
|
if (!SCM_BIGP (y))
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
|
|
|
|
|
bady:
|
1999-09-06 21:12:15 +00:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_eq_p, x, y, SCM_ARGn, s_eq_p);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
}
|
|
|
|
|
|
#else
|
1999-09-06 21:12:15 +00:00
|
|
|
|
SCM_GASSERT2 (SCM_INUMP (x), g_eq_p, x, y, SCM_ARG1, s_eq_p);
|
|
|
|
|
|
SCM_GASSERT2 (SCM_INUMP (y), g_eq_p, x, y, SCM_ARGn, s_eq_p);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif
|
1999-12-12 19:24:29 +00:00
|
|
|
|
return SCM_BOOL((long) x == (long) y);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1999-09-06 21:12:15 +00:00
|
|
|
|
SCM_GPROC1 (s_less_p, "<", scm_tc7_rpsubr, scm_less_p, g_less_p);
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_less_p (SCM x, SCM y)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
#ifdef SCM_FLOATS
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_NINUMP (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
1999-12-16 20:48:05 +00:00
|
|
|
|
if (!SCM_NIMP (x))
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
|
|
|
|
|
badx:
|
1999-09-06 21:12:15 +00:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_less_p, x, y, SCM_ARG1, s_less_p);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
if (SCM_BIGP (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_INUMP (y))
|
1999-12-12 19:24:29 +00:00
|
|
|
|
return SCM_BOOL(SCM_BIGSIGN (x));
|
1999-01-10 07:38:39 +00:00
|
|
|
|
SCM_ASRTGO (SCM_NIMP (y), bady);
|
|
|
|
|
|
if (SCM_BIGP (y))
|
1999-12-12 19:24:29 +00:00
|
|
|
|
return SCM_BOOL(1 == scm_bigcomp (x, y));
|
1999-01-10 07:38:39 +00:00
|
|
|
|
SCM_ASRTGO (SCM_REALP (y), bady);
|
|
|
|
|
|
return ((scm_big2dbl (x) < SCM_REALPART (y))
|
|
|
|
|
|
? SCM_BOOL_T
|
|
|
|
|
|
: SCM_BOOL_F);
|
|
|
|
|
|
}
|
|
|
|
|
|
SCM_ASRTGO (SCM_REALP (x), badx);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#else
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_GASSERT2 (SCM_REALP (x),
|
1999-09-06 21:12:15 +00:00
|
|
|
|
g_less_p, x, y, SCM_ARG1, s_less_p);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
if (SCM_INUMP (y))
|
|
|
|
|
|
return ((SCM_REALPART (x) < ((double) SCM_INUM (y)))
|
|
|
|
|
|
? SCM_BOOL_T
|
|
|
|
|
|
: SCM_BOOL_F);
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
|
|
|
|
|
SCM_ASRTGO (SCM_NIMP (y), bady);
|
|
|
|
|
|
if (SCM_BIGP (y))
|
1999-12-12 19:24:29 +00:00
|
|
|
|
return SCM_BOOL(SCM_REALPART (x) < scm_big2dbl (y));
|
1999-01-10 07:38:39 +00:00
|
|
|
|
SCM_ASRTGO (SCM_REALP (y), bady);
|
|
|
|
|
|
#else
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_ASRTGO (SCM_REALP (y), bady);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif
|
1999-12-12 19:24:29 +00:00
|
|
|
|
return SCM_BOOL(SCM_REALPART (x) < SCM_REALPART (y));
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
if (SCM_NINUMP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
|
|
|
|
|
SCM_ASRTGO (SCM_NIMP (y), bady);
|
|
|
|
|
|
if (SCM_BIGP (y))
|
1999-12-12 19:24:29 +00:00
|
|
|
|
return SCM_NEGATE_BOOL(SCM_BIGSIGN (y));
|
1999-12-16 20:48:05 +00:00
|
|
|
|
if (!SCM_REALP (y))
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
|
|
|
|
|
bady:
|
1999-09-06 21:12:15 +00:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_less_p, x, y, SCM_ARGn, s_less_p);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
#else
|
1999-12-16 20:48:05 +00:00
|
|
|
|
if (!SCM_REALP (y))
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
|
|
|
|
|
bady:
|
1999-09-06 21:12:15 +00:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_less_p, x, y, SCM_ARGn, s_less_p);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
return ((((double) SCM_INUM (x)) < SCM_REALPART (y))
|
|
|
|
|
|
? SCM_BOOL_T
|
|
|
|
|
|
: SCM_BOOL_F);
|
|
|
|
|
|
}
|
|
|
|
|
|
#else
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
|
|
|
|
|
if (SCM_NINUMP (x))
|
|
|
|
|
|
{
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_GASSERT2 (SCM_BIGP (x),
|
1999-09-06 21:12:15 +00:00
|
|
|
|
g_less_p, x, y, SCM_ARG1, s_less_p);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_INUMP (y))
|
1999-12-12 19:24:29 +00:00
|
|
|
|
return SCM_BOOL(SCM_BIGSIGN (x));
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_ASRTGO (SCM_BIGP (y), bady);
|
1999-12-12 19:24:29 +00:00
|
|
|
|
return SCM_BOOL(1 == scm_bigcomp (x, y));
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
if (SCM_NINUMP (y))
|
|
|
|
|
|
{
|
1999-12-16 20:48:05 +00:00
|
|
|
|
if (!SCM_BIGP (y))
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
|
|
|
|
|
bady:
|
1999-09-06 21:12:15 +00:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_less_p, x, y, SCM_ARGn, s_less_p);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
1999-12-12 19:24:29 +00:00
|
|
|
|
return SCM_NEGATE_BOOL(SCM_BIGSIGN (y));
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
#else
|
1999-09-06 21:12:15 +00:00
|
|
|
|
SCM_GASSERT2 (SCM_INUMP (x), g_less_p, x, y, SCM_ARG1, s_less_p);
|
|
|
|
|
|
SCM_GASSERT2 (SCM_INUMP (y), g_less_p, x, y, SCM_ARGn, s_less_p);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif
|
1999-12-12 19:24:29 +00:00
|
|
|
|
return SCM_BOOL((long) x < (long) y);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2000-01-06 19:51:45 +00:00
|
|
|
|
SCM_DEFINE1 (scm_gr_p, ">", scm_tc7_rpsubr,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM x, SCM y),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_gr_p
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return scm_less_p (y, x);
|
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-06 19:51:45 +00:00
|
|
|
|
SCM_DEFINE1 (scm_leq_p, "<=", scm_tc7_rpsubr,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM x, SCM y),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_leq_p
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return SCM_BOOL_NOT (scm_less_p (y, x));
|
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-06 19:51:45 +00:00
|
|
|
|
SCM_DEFINE1 (scm_geq_p, ">=", scm_tc7_rpsubr,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM x, SCM y),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_geq_p
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return SCM_BOOL_NOT (scm_less_p (x, y));
|
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1999-09-06 21:12:15 +00:00
|
|
|
|
SCM_GPROC (s_zero_p, "zero?", 1, 0, 0, scm_zero_p, g_zero_p);
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_zero_p (SCM z)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
#ifdef SCM_FLOATS
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_NINUMP (z))
|
|
|
|
|
|
{
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
|
|
|
|
|
SCM_ASRTGO (SCM_NIMP (z), badz);
|
|
|
|
|
|
if (SCM_BIGP (z))
|
|
|
|
|
|
return SCM_BOOL_F;
|
1999-12-16 20:48:05 +00:00
|
|
|
|
if (!SCM_INEXP (z))
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
|
|
|
|
|
badz:
|
1999-09-06 21:12:15 +00:00
|
|
|
|
SCM_WTA_DISPATCH_1 (g_zero_p, z, SCM_ARG1, s_zero_p);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#else
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_GASSERT1 (SCM_INEXP (z),
|
1999-09-06 21:12:15 +00:00
|
|
|
|
g_zero_p, z, SCM_ARG1, s_zero_p);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif
|
1999-12-12 19:24:29 +00:00
|
|
|
|
return SCM_BOOL(z == scm_flo0);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
#else
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
|
|
|
|
|
if (SCM_NINUMP (z))
|
|
|
|
|
|
{
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_GASSERT1 (SCM_BIGP (z),
|
1999-09-06 21:12:15 +00:00
|
|
|
|
g_zero_p, z, SCM_ARG1, s_zero_p);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
}
|
|
|
|
|
|
#else
|
1999-09-06 21:12:15 +00:00
|
|
|
|
SCM_GASSERT1 (SCM_INUMP (z), g_zero_p, z, SCM_ARG1, s_zero_p);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif
|
1999-12-12 19:24:29 +00:00
|
|
|
|
return SCM_BOOL(z == SCM_INUM0);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1999-09-06 21:12:15 +00:00
|
|
|
|
SCM_GPROC (s_positive_p, "positive?", 1, 0, 0, scm_positive_p, g_positive_p);
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_positive_p (SCM x)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
#ifdef SCM_FLOATS
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_NINUMP (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
|
|
|
|
|
SCM_ASRTGO (SCM_NIMP (x), badx);
|
|
|
|
|
|
if (SCM_BIGP (x))
|
1999-12-12 19:24:29 +00:00
|
|
|
|
return SCM_BOOL(SCM_TYP16 (x) == scm_tc16_bigpos);
|
1999-12-16 20:48:05 +00:00
|
|
|
|
if (!SCM_REALP (x))
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
|
|
|
|
|
badx:
|
1999-09-06 21:12:15 +00:00
|
|
|
|
SCM_WTA_DISPATCH_1 (g_positive_p, x, SCM_ARG1, s_positive_p);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#else
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_GASSERT1 (SCM_REALP (x),
|
1999-09-06 21:12:15 +00:00
|
|
|
|
g_positive_p, x, SCM_ARG1, s_positive_p);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif
|
1999-12-12 19:24:29 +00:00
|
|
|
|
return SCM_BOOL(SCM_REALPART (x) > 0.0);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
#else
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
|
|
|
|
|
if (SCM_NINUMP (x))
|
|
|
|
|
|
{
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_GASSERT1 (SCM_BIGP (x),
|
1999-09-06 21:12:15 +00:00
|
|
|
|
g_positive_p, x, SCM_ARG1, s_positive_p);
|
1999-12-12 19:24:29 +00:00
|
|
|
|
return SCM_BOOL(SCM_TYP16 (x) == scm_tc16_bigpos);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
#else
|
1999-09-06 21:12:15 +00:00
|
|
|
|
SCM_GASSERT1 (SCM_INUMP (x), g_positive_p, x, SCM_ARG1, s_positive_p);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
1999-12-12 19:24:29 +00:00
|
|
|
|
return SCM_BOOL(x > SCM_INUM0);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1999-09-06 21:12:15 +00:00
|
|
|
|
SCM_GPROC (s_negative_p, "negative?", 1, 0, 0, scm_negative_p, g_negative_p);
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_negative_p (SCM x)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
#ifdef SCM_FLOATS
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_NINUMP (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
|
|
|
|
|
SCM_ASRTGO (SCM_NIMP (x), badx);
|
|
|
|
|
|
if (SCM_BIGP (x))
|
1999-12-12 19:24:29 +00:00
|
|
|
|
return SCM_NEGATE_BOOL(SCM_TYP16 (x) == scm_tc16_bigpos);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (!(SCM_REALP (x)))
|
|
|
|
|
|
{
|
|
|
|
|
|
badx:
|
1999-09-06 21:12:15 +00:00
|
|
|
|
SCM_WTA_DISPATCH_1 (g_negative_p, x, SCM_ARG1, s_negative_p);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#else
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_GASSERT1 (SCM_REALP (x),
|
1999-09-06 21:12:15 +00:00
|
|
|
|
g_negative_p, x, SCM_ARG1, s_negative_p);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
1999-12-12 19:24:29 +00:00
|
|
|
|
return SCM_BOOL(SCM_REALPART (x) < 0.0);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
#else
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
|
|
|
|
|
if (SCM_NINUMP (x))
|
|
|
|
|
|
{
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_GASSERT1 (SCM_BIGP (x),
|
1999-09-06 21:12:15 +00:00
|
|
|
|
g_negative_p, x, SCM_ARG1, s_negative_p);
|
1999-12-12 19:24:29 +00:00
|
|
|
|
return SCM_BOOL(SCM_TYP16 (x) == scm_tc16_bigneg);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
#else
|
1999-09-06 21:12:15 +00:00
|
|
|
|
SCM_GASSERT1 (SCM_INUMP (x), g_negative_p, x, SCM_ARG1, s_negative_p);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
#endif
|
1999-12-12 19:24:29 +00:00
|
|
|
|
return SCM_BOOL(x < SCM_INUM0);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_GPROC1 (s_max, "max", scm_tc7_asubr, scm_max, g_max);
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_max (SCM x, SCM y)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
#ifdef SCM_FLOATS
|
|
|
|
|
|
double z;
|
|
|
|
|
|
#endif
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_UNBNDP (y))
|
|
|
|
|
|
{
|
1999-09-20 22:10:38 +00:00
|
|
|
|
SCM_GASSERT0 (!SCM_UNBNDP (x),
|
|
|
|
|
|
g_max, scm_makfrom0str (s_max), SCM_WNA, 0);
|
1999-09-20 21:51:50 +00:00
|
|
|
|
SCM_GASSERT1 (SCM_NUMBERP (x), g_max, x, SCM_ARG1, s_max);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return x;
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#ifdef SCM_FLOATS
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_NINUMP (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
1999-09-20 21:51:50 +00:00
|
|
|
|
if (!SCM_NIMP (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
badx2:
|
|
|
|
|
|
SCM_WTA_DISPATCH_2 (g_max, x, y, SCM_ARG1, s_max);
|
|
|
|
|
|
}
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_BIGP (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_INUMP (y))
|
|
|
|
|
|
return SCM_BIGSIGN (x) ? y : x;
|
|
|
|
|
|
SCM_ASRTGO (SCM_NIMP (y), bady);
|
|
|
|
|
|
if (SCM_BIGP (y))
|
|
|
|
|
|
return (1 == scm_bigcomp (x, y)) ? y : x;
|
|
|
|
|
|
SCM_ASRTGO (SCM_REALP (y), bady);
|
|
|
|
|
|
z = scm_big2dbl (x);
|
|
|
|
|
|
return (z < SCM_REALPART (y)) ? y : scm_makdbl (z, 0.0);
|
|
|
|
|
|
}
|
1999-09-20 21:51:50 +00:00
|
|
|
|
SCM_ASRTGO (SCM_REALP (x), badx2);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#else
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_GASSERT2 (SCM_REALP (x),
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
g_max, x, y, SCM_ARG1, s_max);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
if (SCM_INUMP (y))
|
|
|
|
|
|
return ((SCM_REALPART (x) < (z = SCM_INUM (y)))
|
|
|
|
|
|
? scm_makdbl (z, 0.0)
|
|
|
|
|
|
: x);
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
|
|
|
|
|
SCM_ASRTGO (SCM_NIMP (y), bady);
|
|
|
|
|
|
if (SCM_BIGP (y))
|
|
|
|
|
|
return ((SCM_REALPART (x) < (z = scm_big2dbl (y)))
|
|
|
|
|
|
? scm_makdbl (z, 0.0)
|
|
|
|
|
|
: x);
|
|
|
|
|
|
SCM_ASRTGO (SCM_REALP (y), bady);
|
|
|
|
|
|
#else
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_ASRTGO (SCM_REALP (y), bady);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
return (SCM_REALPART (x) < SCM_REALPART (y)) ? y : x;
|
|
|
|
|
|
}
|
|
|
|
|
|
if (SCM_NINUMP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
|
|
|
|
|
SCM_ASRTGO (SCM_NIMP (y), bady);
|
|
|
|
|
|
if (SCM_BIGP (y))
|
|
|
|
|
|
return SCM_BIGSIGN (y) ? x : y;
|
|
|
|
|
|
if (!(SCM_REALP (y)))
|
|
|
|
|
|
{
|
|
|
|
|
|
bady:
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_max, x, y, SCM_ARGn, s_max);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
#else
|
1999-12-16 20:48:05 +00:00
|
|
|
|
if (!SCM_REALP (y))
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
|
|
|
|
|
bady:
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_max, x, y, SCM_ARGn, s_max);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
return (((z = SCM_INUM (x)) < SCM_REALPART (y))
|
|
|
|
|
|
? y
|
|
|
|
|
|
: scm_makdbl (z, 0.0));
|
|
|
|
|
|
}
|
|
|
|
|
|
#else
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
|
|
|
|
|
if (SCM_NINUMP (x))
|
|
|
|
|
|
{
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_GASSERT2 (SCM_BIGP (x),
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
g_max, x, y, SCM_ARG1, s_max);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_INUMP (y))
|
|
|
|
|
|
return SCM_BIGSIGN (x) ? y : x;
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_ASRTGO (SCM_BIGP (y), bady);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return (1 == scm_bigcomp (x, y)) ? y : x;
|
|
|
|
|
|
}
|
|
|
|
|
|
if (SCM_NINUMP (y))
|
|
|
|
|
|
{
|
1999-12-16 20:48:05 +00:00
|
|
|
|
if (!SCM_BIGP (y))
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
|
|
|
|
|
bady:
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_max, x, y, SCM_ARGn, s_max);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
return SCM_BIGSIGN (y) ? x : y;
|
|
|
|
|
|
}
|
|
|
|
|
|
#else
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_GASSERT2 (SCM_INUMP (x), g_max, x, y, SCM_ARG1, s_max);
|
|
|
|
|
|
SCM_GASSERT2 (SCM_INUMP (y), g_max, x, y, SCM_ARGn, s_max);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
#endif
|
|
|
|
|
|
return ((long) x < (long) y) ? y : x;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_GPROC1 (s_min, "min", scm_tc7_asubr, scm_min, g_min);
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_min (SCM x, SCM y)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
#ifdef SCM_FLOATS
|
|
|
|
|
|
double z;
|
|
|
|
|
|
#endif
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_UNBNDP (y))
|
|
|
|
|
|
{
|
1999-09-20 22:10:38 +00:00
|
|
|
|
SCM_GASSERT0 (!SCM_UNBNDP (x),
|
|
|
|
|
|
g_min, scm_makfrom0str (s_min), SCM_WNA, 0);
|
1999-09-20 21:51:50 +00:00
|
|
|
|
SCM_GASSERT1 (SCM_NUMBERP (x), g_min, x, SCM_ARG1, s_min);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return x;
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#ifdef SCM_FLOATS
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_NINUMP (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
1999-12-16 20:48:05 +00:00
|
|
|
|
if (!SCM_NIMP (x))
|
1999-09-20 21:51:50 +00:00
|
|
|
|
{
|
|
|
|
|
|
badx2:
|
|
|
|
|
|
SCM_WTA_DISPATCH_2 (g_min, x, y, SCM_ARG1, s_min);
|
|
|
|
|
|
}
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_BIGP (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_INUMP (y))
|
|
|
|
|
|
return SCM_BIGSIGN (x) ? x : y;
|
|
|
|
|
|
SCM_ASRTGO (SCM_NIMP (y), bady);
|
|
|
|
|
|
if (SCM_BIGP (y))
|
|
|
|
|
|
return (-1 == scm_bigcomp (x, y)) ? y : x;
|
|
|
|
|
|
SCM_ASRTGO (SCM_REALP (y), bady);
|
|
|
|
|
|
z = scm_big2dbl (x);
|
|
|
|
|
|
return (z > SCM_REALPART (y)) ? y : scm_makdbl (z, 0.0);
|
|
|
|
|
|
}
|
1999-09-20 21:51:50 +00:00
|
|
|
|
SCM_ASRTGO (SCM_REALP (x), badx2);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#else
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_GASSERT2 (SCM_REALP (x),
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
g_min, x, y, SCM_ARG1, s_min);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
if (SCM_INUMP (y))
|
|
|
|
|
|
return ((SCM_REALPART (x) > (z = SCM_INUM (y)))
|
|
|
|
|
|
? scm_makdbl (z, 0.0)
|
|
|
|
|
|
: x);
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
|
|
|
|
|
SCM_ASRTGO (SCM_NIMP (y), bady);
|
|
|
|
|
|
if (SCM_BIGP (y))
|
|
|
|
|
|
return ((SCM_REALPART (x) > (z = scm_big2dbl (y)))
|
|
|
|
|
|
? scm_makdbl (z, 0.0)
|
|
|
|
|
|
: x);
|
|
|
|
|
|
SCM_ASRTGO (SCM_REALP (y), bady);
|
|
|
|
|
|
#else
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_ASRTGO (SCM_REALP (y), bady);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
return (SCM_REALPART (x) > SCM_REALPART (y)) ? y : x;
|
|
|
|
|
|
}
|
|
|
|
|
|
if (SCM_NINUMP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
|
|
|
|
|
SCM_ASRTGO (SCM_NIMP (y), bady);
|
|
|
|
|
|
if (SCM_BIGP (y))
|
|
|
|
|
|
return SCM_BIGSIGN (y) ? y : x;
|
|
|
|
|
|
if (!(SCM_REALP (y)))
|
|
|
|
|
|
{
|
|
|
|
|
|
bady:
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_min, x, y, SCM_ARGn, s_min);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
#else
|
1999-12-16 20:48:05 +00:00
|
|
|
|
if (!SCM_REALP (y))
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
|
|
|
|
|
bady:
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_min, x, y, SCM_ARGn, s_min);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return (((z = SCM_INUM (x)) > SCM_REALPART (y))
|
|
|
|
|
|
? y
|
|
|
|
|
|
: scm_makdbl (z, 0.0));
|
|
|
|
|
|
}
|
|
|
|
|
|
#else
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
|
|
|
|
|
if (SCM_NINUMP (x))
|
|
|
|
|
|
{
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_GASSERT2 (SCM_BIGP (x),
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
g_min, x, y, SCM_ARG1, s_min);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_INUMP (y))
|
|
|
|
|
|
return SCM_BIGSIGN (x) ? x : y;
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_ASRTGO (SCM_BIGP (y), bady);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return (-1 == scm_bigcomp (x, y)) ? y : x;
|
|
|
|
|
|
}
|
|
|
|
|
|
if (SCM_NINUMP (y))
|
|
|
|
|
|
{
|
1999-12-16 20:48:05 +00:00
|
|
|
|
if (!SCM_BIGP (y))
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
|
|
|
|
|
bady:
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_min, x, y, SCM_ARGn, s_min);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
return SCM_BIGSIGN (y) ? y : x;
|
|
|
|
|
|
}
|
|
|
|
|
|
#else
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_GASSERT2 (SCM_INUMP (x), g_min, x, y, SCM_ARG1, s_min);
|
|
|
|
|
|
SCM_GASSERT2 (SCM_INUMP (y), g_min, x, y, SCM_ARGn, s_min);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
#endif
|
|
|
|
|
|
return ((long) x > (long) y) ? y : x;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_GPROC1 (s_sum, "+", scm_tc7_asubr, scm_sum, g_sum);
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_sum (SCM x, SCM y)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_UNBNDP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_UNBNDP (x))
|
|
|
|
|
|
return SCM_INUM0;
|
1999-09-20 21:51:50 +00:00
|
|
|
|
SCM_GASSERT1 (SCM_NUMBERP (x), g_sum, x, SCM_ARG1, s_sum);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return x;
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#ifdef SCM_FLOATS
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_NINUMP (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM t;
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
1999-09-20 21:51:50 +00:00
|
|
|
|
if (!SCM_NIMP (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
badx2:
|
|
|
|
|
|
SCM_WTA_DISPATCH_2 (g_sum, x, y, SCM_ARG1, s_sum);
|
|
|
|
|
|
}
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_BIGP (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_INUMP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
t = x;
|
|
|
|
|
|
x = y;
|
|
|
|
|
|
y = t;
|
|
|
|
|
|
goto intbig;
|
|
|
|
|
|
}
|
|
|
|
|
|
SCM_ASRTGO (SCM_NIMP (y), bady);
|
|
|
|
|
|
if (SCM_BIGP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_NUMDIGS (x) > SCM_NUMDIGS (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
t = x;
|
|
|
|
|
|
x = y;
|
|
|
|
|
|
y = t;
|
|
|
|
|
|
}
|
|
|
|
|
|
return scm_addbig (SCM_BDIGITS (x), SCM_NUMDIGS (x),
|
|
|
|
|
|
SCM_BIGSIGN (x),
|
|
|
|
|
|
y, 0);
|
|
|
|
|
|
}
|
|
|
|
|
|
SCM_ASRTGO (SCM_INEXP (y), bady);
|
|
|
|
|
|
bigreal:
|
|
|
|
|
|
return scm_makdbl (scm_big2dbl (x) + SCM_REALPART (y),
|
|
|
|
|
|
SCM_CPLXP (y) ? SCM_IMAG (y) : 0.0);
|
|
|
|
|
|
}
|
1999-09-20 21:51:50 +00:00
|
|
|
|
SCM_ASRTGO (SCM_INEXP (x), badx2);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#else
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_ASRTGO (SCM_INEXP (x), badx2);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
if (SCM_INUMP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
t = x;
|
|
|
|
|
|
x = y;
|
|
|
|
|
|
y = t;
|
|
|
|
|
|
goto intreal;
|
|
|
|
|
|
}
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
|
|
|
|
|
SCM_ASRTGO (SCM_NIMP (y), bady);
|
|
|
|
|
|
if (SCM_BIGP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
t = x;
|
|
|
|
|
|
x = y;
|
|
|
|
|
|
y = t;
|
|
|
|
|
|
goto bigreal;
|
|
|
|
|
|
}
|
1999-12-16 20:48:05 +00:00
|
|
|
|
else if (!SCM_INEXP (y))
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
|
|
|
|
|
bady:
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_sum, x, y, SCM_ARGn, s_sum);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
#else
|
1999-12-16 20:48:05 +00:00
|
|
|
|
if (!SCM_INEXP (y))
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
|
|
|
|
|
bady:
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_sum, x, y, SCM_ARGn, s_sum);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
{
|
|
|
|
|
|
double i = 0.0;
|
|
|
|
|
|
if (SCM_CPLXP (x))
|
|
|
|
|
|
i = SCM_IMAG (x);
|
|
|
|
|
|
if (SCM_CPLXP (y))
|
|
|
|
|
|
i += SCM_IMAG (y);
|
|
|
|
|
|
return scm_makdbl (SCM_REALPART (x) + SCM_REALPART (y), i);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
if (SCM_NINUMP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
|
|
|
|
|
SCM_ASRTGO (SCM_NIMP (y), bady);
|
|
|
|
|
|
if (SCM_BIGP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
intbig:
|
|
|
|
|
|
{
|
|
|
|
|
|
#ifndef SCM_DIGSTOOBIG
|
|
|
|
|
|
long z = scm_pseudolong (SCM_INUM (x));
|
|
|
|
|
|
return scm_addbig ((SCM_BIGDIG *) & z,
|
|
|
|
|
|
SCM_DIGSPERLONG,
|
|
|
|
|
|
(x < 0) ? 0x0100 : 0,
|
|
|
|
|
|
y, 0);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#else
|
1999-01-10 07:38:39 +00:00
|
|
|
|
SCM_BIGDIG zdigs[SCM_DIGSPERLONG];
|
|
|
|
|
|
scm_longdigs (SCM_INUM (x), zdigs);
|
|
|
|
|
|
return scm_addbig (zdigs, SCM_DIGSPERLONG, (x < 0) ? 0x0100 : 0,
|
|
|
|
|
|
y, 0);
|
|
|
|
|
|
#endif
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
SCM_ASRTGO (SCM_INEXP (y), bady);
|
|
|
|
|
|
#else
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_ASRTGO (SCM_INEXP (y), bady);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
intreal:
|
|
|
|
|
|
return scm_makdbl (SCM_INUM (x) + SCM_REALPART (y),
|
|
|
|
|
|
SCM_CPLXP (y) ? SCM_IMAG (y) : 0.0);
|
|
|
|
|
|
}
|
|
|
|
|
|
#else
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
|
|
|
|
|
if (SCM_NINUMP (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM t;
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_ASRTGO (SCM_BIGP (x), badx2);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_INUMP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
t = x;
|
|
|
|
|
|
x = y;
|
|
|
|
|
|
y = t;
|
|
|
|
|
|
goto intbig;
|
|
|
|
|
|
}
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_ASRTGO (SCM_BIGP (y), bady);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_NUMDIGS (x) > SCM_NUMDIGS (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
t = x;
|
|
|
|
|
|
x = y;
|
|
|
|
|
|
y = t;
|
|
|
|
|
|
}
|
|
|
|
|
|
return scm_addbig (SCM_BDIGITS (x), SCM_NUMDIGS (x), SCM_BIGSIGN (x),
|
|
|
|
|
|
y, 0);
|
|
|
|
|
|
}
|
|
|
|
|
|
if (SCM_NINUMP (y))
|
|
|
|
|
|
{
|
1999-12-16 20:48:05 +00:00
|
|
|
|
if (!SCM_BIGP (y))
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
|
|
|
|
|
bady:
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_sum, x, y, SCM_ARGn, s_sum);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
intbig:
|
|
|
|
|
|
{
|
|
|
|
|
|
#ifndef SCM_DIGSTOOBIG
|
|
|
|
|
|
long z = scm_pseudolong (SCM_INUM (x));
|
|
|
|
|
|
return scm_addbig (&z, SCM_DIGSPERLONG, (x < 0) ? 0x0100 : 0, y, 0);
|
|
|
|
|
|
#else
|
|
|
|
|
|
SCM_BIGDIG zdigs[SCM_DIGSPERLONG];
|
|
|
|
|
|
scm_longdigs (SCM_INUM (x), zdigs);
|
|
|
|
|
|
return scm_addbig (zdigs, SCM_DIGSPERLONG, (x < 0) ? 0x0100 : 0, y, 0);
|
|
|
|
|
|
#endif
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
#else
|
1999-09-20 21:51:50 +00:00
|
|
|
|
SCM_ASRTGO (SCM_INUMP (x), badx2);
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_GASSERT2 (SCM_INUMP (y), g_sum, x, y, SCM_ARGn, s_sum);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
#endif
|
|
|
|
|
|
x = SCM_INUM (x) + SCM_INUM (y);
|
|
|
|
|
|
if (SCM_FIXABLE (x))
|
|
|
|
|
|
return SCM_MAKINUM (x);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#ifdef SCM_BIGDIG
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return scm_long2big (x);
|
|
|
|
|
|
#else
|
|
|
|
|
|
#ifdef SCM_FLOATS
|
|
|
|
|
|
return scm_makdbl ((double) x, 0.0);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#else
|
* debug.c, unif.c: use scm_out_of_range instead of
wta for range errors (ASSERT still needs work).
* error.c, error.h (scm_out_of_range): new procedure.
* error.c, error.h (scm_out_of_range_key): new key.
* posix.c (scm_sync): #else was missing.
* error.c, error.h: append _key to names scm_num_overflow and
scm_system_error.
* __scm.h (SCM_SYSMISSING, SCM_NUM_OVERFLOW): use SCM_BOOL_F instead
of consing an empty list.
(SCM_SYSERROR etc.): move into error.c, make them procedures instead
of macros, saves code and string space.
error.c, fports.c, numbers.c, posix.c, ioext.c, filesys.c, socket.c,
fdsocket.c, simpos.c: change names of SCM_SYSERROR etc., to
lower case. Rename scm_syserror_m to scm_syserror_msg.
error.h: prototypes for new procedures.
1996-09-15 06:41:31 +00:00
|
|
|
|
scm_num_overflow (s_sum);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return SCM_UNSPECIFIED;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_GPROC1 (s_difference, "-", scm_tc7_asubr, scm_difference, g_difference);
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_difference (SCM x, SCM y)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
#ifdef SCM_FLOATS
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_NINUMP (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (!(SCM_NIMP (x)))
|
|
|
|
|
|
{
|
1999-09-20 21:51:50 +00:00
|
|
|
|
if (SCM_UNBNDP (y))
|
|
|
|
|
|
{
|
1999-09-20 22:10:38 +00:00
|
|
|
|
SCM_GASSERT0 (!SCM_UNBNDP (x), g_difference,
|
|
|
|
|
|
scm_makfrom0str (s_difference), SCM_WNA, 0);
|
1999-09-20 21:51:50 +00:00
|
|
|
|
badx:
|
|
|
|
|
|
SCM_WTA_DISPATCH_1 (g_difference, x, SCM_ARG1, s_difference);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
badx2:
|
|
|
|
|
|
SCM_WTA_DISPATCH_2 (g_difference, x, y, SCM_ARG1, s_difference);
|
|
|
|
|
|
}
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
if (SCM_UNBNDP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
|
|
|
|
|
if (SCM_BIGP (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
x = scm_copybig (x, !SCM_BIGSIGN (x));
|
|
|
|
|
|
return (SCM_NUMDIGS (x) * SCM_BITSPERDIG / SCM_CHAR_BIT
|
|
|
|
|
|
<= sizeof (SCM)
|
|
|
|
|
|
? scm_big2inum (x, SCM_NUMDIGS (x))
|
|
|
|
|
|
: x);
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
SCM_ASRTGO (SCM_INEXP (x), badx);
|
|
|
|
|
|
return scm_makdbl (- SCM_REALPART (x),
|
|
|
|
|
|
SCM_CPLXP (x) ? -SCM_IMAG (x) : 0.0);
|
|
|
|
|
|
}
|
|
|
|
|
|
if (SCM_INUMP (y))
|
|
|
|
|
|
return scm_sum (x, SCM_MAKINUM (- SCM_INUM (y)));
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
|
|
|
|
|
SCM_ASRTGO (SCM_NIMP (y), bady);
|
|
|
|
|
|
if (SCM_BIGP (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_BIGP (y))
|
|
|
|
|
|
return ((SCM_NUMDIGS (x) < SCM_NUMDIGS (y))
|
|
|
|
|
|
? scm_addbig (SCM_BDIGITS (x), SCM_NUMDIGS (x),
|
|
|
|
|
|
SCM_BIGSIGN (x),
|
|
|
|
|
|
y, 0x0100)
|
|
|
|
|
|
: scm_addbig (SCM_BDIGITS (y), SCM_NUMDIGS (y),
|
|
|
|
|
|
SCM_BIGSIGN (y) ^ 0x0100,
|
|
|
|
|
|
x, 0));
|
|
|
|
|
|
SCM_ASRTGO (SCM_INEXP (y), bady);
|
|
|
|
|
|
return scm_makdbl (scm_big2dbl (x) - SCM_REALPART (y),
|
|
|
|
|
|
SCM_CPLXP (y) ? -SCM_IMAG (y) : 0.0);
|
|
|
|
|
|
}
|
1999-09-20 21:51:50 +00:00
|
|
|
|
SCM_ASRTGO (SCM_INEXP (x), badx2);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_BIGP (y))
|
|
|
|
|
|
return scm_makdbl (SCM_REALPART (x) - scm_big2dbl (y),
|
|
|
|
|
|
SCM_CPLXP (x) ? SCM_IMAG (x) : 0.0);
|
|
|
|
|
|
SCM_ASRTGO (SCM_INEXP (y), bady);
|
|
|
|
|
|
#else
|
1999-09-20 21:51:50 +00:00
|
|
|
|
SCM_ASRTGO (SCM_INEXP (x), badx2);
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_ASRTGO (SCM_INEXP (y), bady);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
if (SCM_CPLXP (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_CPLXP (y))
|
|
|
|
|
|
return scm_makdbl (SCM_REAL (x) - SCM_REAL (y),
|
|
|
|
|
|
SCM_IMAG (x) - SCM_IMAG (y));
|
|
|
|
|
|
else
|
|
|
|
|
|
return scm_makdbl (SCM_REAL (x) - SCM_REALPART (y), SCM_IMAG (x));
|
|
|
|
|
|
}
|
|
|
|
|
|
return scm_makdbl (SCM_REALPART (x) - SCM_REALPART (y),
|
|
|
|
|
|
SCM_CPLXP (y) ? - SCM_IMAG (y) : 0.0);
|
|
|
|
|
|
}
|
|
|
|
|
|
if (SCM_UNBNDP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
x = -SCM_INUM (x);
|
|
|
|
|
|
goto checkx;
|
|
|
|
|
|
}
|
|
|
|
|
|
if (SCM_NINUMP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
|
|
|
|
|
SCM_ASRTGO (SCM_NIMP (y), bady);
|
|
|
|
|
|
if (SCM_BIGP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
#ifndef SCM_DIGSTOOBIG
|
|
|
|
|
|
long z = scm_pseudolong (SCM_INUM (x));
|
|
|
|
|
|
return scm_addbig ((SCM_BIGDIG *) & z, SCM_DIGSPERLONG,
|
|
|
|
|
|
(x < 0) ? 0x0100 : 0,
|
|
|
|
|
|
y, 0x0100);
|
|
|
|
|
|
#else
|
|
|
|
|
|
SCM_BIGDIG zdigs[SCM_DIGSPERLONG];
|
|
|
|
|
|
scm_longdigs (SCM_INUM (x), zdigs);
|
|
|
|
|
|
return scm_addbig (zdigs, SCM_DIGSPERLONG, (x < 0) ? 0x0100 : 0,
|
|
|
|
|
|
y, 0x0100);
|
|
|
|
|
|
#endif
|
|
|
|
|
|
}
|
1999-12-16 20:48:05 +00:00
|
|
|
|
if (!SCM_INEXP (y))
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
|
|
|
|
|
bady:
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_difference, x, y, SCM_ARGn, s_difference);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
#else
|
1999-12-16 20:48:05 +00:00
|
|
|
|
if (!SCM_INEXP (y))
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
|
|
|
|
|
bady:
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_difference, x, y, SCM_ARGn, s_difference);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
return scm_makdbl (SCM_INUM (x) - SCM_REALPART (y),
|
|
|
|
|
|
SCM_CPLXP (y) ? -SCM_IMAG (y) : 0.0);
|
|
|
|
|
|
}
|
|
|
|
|
|
#else
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
|
|
|
|
|
if (SCM_NINUMP (x))
|
|
|
|
|
|
{
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_GASSERT2 (SCM_BIGP (x),
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
g_difference, x, y, SCM_ARG1, s_difference);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_UNBNDP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
x = scm_copybig (x, !SCM_BIGSIGN (x));
|
|
|
|
|
|
return (SCM_NUMDIGS (x) * SCM_BITSPERDIG / SCM_CHAR_BIT
|
|
|
|
|
|
<= sizeof (SCM)
|
|
|
|
|
|
? scm_big2inum (x, SCM_NUMDIGS (x))
|
|
|
|
|
|
: x);
|
|
|
|
|
|
}
|
|
|
|
|
|
if (SCM_INUMP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
#ifndef SCM_DIGSTOOBIG
|
|
|
|
|
|
long z = scm_pseudolong (SCM_INUM (y));
|
|
|
|
|
|
return scm_addbig (&z, SCM_DIGSPERLONG, (y < 0) ? 0 : 0x0100, x, 0);
|
|
|
|
|
|
#else
|
|
|
|
|
|
SCM_BIGDIG zdigs[SCM_DIGSPERLONG];
|
|
|
|
|
|
scm_longdigs (SCM_INUM (x), zdigs);
|
|
|
|
|
|
return scm_addbig (zdigs, SCM_DIGSPERLONG, (y < 0) ? 0 : 0x0100,
|
|
|
|
|
|
x, 0);
|
|
|
|
|
|
#endif
|
|
|
|
|
|
}
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_ASRTGO (SCM_BIGP (y), bady);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return (SCM_NUMDIGS (x) < SCM_NUMDIGS (y)) ?
|
|
|
|
|
|
scm_addbig (SCM_BDIGITS (x), SCM_NUMDIGS (x), SCM_BIGSIGN (x),
|
|
|
|
|
|
y, 0x0100) :
|
|
|
|
|
|
scm_addbig (SCM_BDIGITS (y), SCM_NUMDIGS (y), SCM_BIGSIGN (y) ^ 0x0100,
|
|
|
|
|
|
x, 0);
|
|
|
|
|
|
}
|
|
|
|
|
|
if (SCM_UNBNDP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
x = -SCM_INUM (x);
|
|
|
|
|
|
goto checkx;
|
|
|
|
|
|
}
|
|
|
|
|
|
if (SCM_NINUMP (y))
|
|
|
|
|
|
{
|
1999-12-16 20:48:05 +00:00
|
|
|
|
if (!SCM_BIGP (y))
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
|
|
|
|
|
bady:
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_difference, x, y, SCM_ARGn, s_difference);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
1998-03-30 21:03:35 +00:00
|
|
|
|
{
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#ifndef SCM_DIGSTOOBIG
|
|
|
|
|
|
long z = scm_pseudolong (SCM_INUM (x));
|
|
|
|
|
|
return scm_addbig (&z, SCM_DIGSPERLONG, (x < 0) ? 0x0100 : 0,
|
|
|
|
|
|
y, 0x0100);
|
|
|
|
|
|
#else
|
|
|
|
|
|
SCM_BIGDIG zdigs[SCM_DIGSPERLONG];
|
|
|
|
|
|
scm_longdigs (SCM_INUM (x), zdigs);
|
|
|
|
|
|
return scm_addbig (zdigs, SCM_DIGSPERLONG, (x < 0) ? 0x0100 : 0,
|
|
|
|
|
|
y, 0x0100);
|
|
|
|
|
|
#endif
|
1998-03-30 21:03:35 +00:00
|
|
|
|
}
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#else
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_GASSERT2 (SCM_INUMP (x), g_difference, x, y, SCM_ARG1, s_difference);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_UNBNDP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
x = -SCM_INUM (x);
|
|
|
|
|
|
goto checkx;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_GASSERT2 (SCM_INUMP (y), g_difference, x, y, SCM_ARGn, s_difference);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
x = SCM_INUM (x) - SCM_INUM (y);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
checkx:
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_FIXABLE (x))
|
|
|
|
|
|
return SCM_MAKINUM (x);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#ifdef SCM_BIGDIG
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return scm_long2big (x);
|
|
|
|
|
|
#else
|
|
|
|
|
|
#ifdef SCM_FLOATS
|
|
|
|
|
|
return scm_makdbl ((double) x, 0.0);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#else
|
* debug.c, unif.c: use scm_out_of_range instead of
wta for range errors (ASSERT still needs work).
* error.c, error.h (scm_out_of_range): new procedure.
* error.c, error.h (scm_out_of_range_key): new key.
* posix.c (scm_sync): #else was missing.
* error.c, error.h: append _key to names scm_num_overflow and
scm_system_error.
* __scm.h (SCM_SYSMISSING, SCM_NUM_OVERFLOW): use SCM_BOOL_F instead
of consing an empty list.
(SCM_SYSERROR etc.): move into error.c, make them procedures instead
of macros, saves code and string space.
error.c, fports.c, numbers.c, posix.c, ioext.c, filesys.c, socket.c,
fdsocket.c, simpos.c: change names of SCM_SYSERROR etc., to
lower case. Rename scm_syserror_m to scm_syserror_msg.
error.h: prototypes for new procedures.
1996-09-15 06:41:31 +00:00
|
|
|
|
scm_num_overflow (s_difference);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return SCM_UNSPECIFIED;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_GPROC1 (s_product, "*", scm_tc7_asubr, scm_product, g_product);
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_product (SCM x, SCM y)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_UNBNDP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_UNBNDP (x))
|
|
|
|
|
|
return SCM_MAKINUM (1L);
|
1999-09-20 21:51:50 +00:00
|
|
|
|
SCM_GASSERT1 (SCM_NUMBERP (x), g_product, x, SCM_ARG1, s_product);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return x;
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#ifdef SCM_FLOATS
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_NINUMP (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM t;
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
1999-09-20 21:51:50 +00:00
|
|
|
|
if (!SCM_NIMP (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
badx2:
|
|
|
|
|
|
SCM_WTA_DISPATCH_2 (g_product, x, y, SCM_ARG1, s_product);
|
|
|
|
|
|
}
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_BIGP (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_INUMP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
t = x;
|
|
|
|
|
|
x = y;
|
|
|
|
|
|
y = t;
|
|
|
|
|
|
goto intbig;
|
|
|
|
|
|
}
|
|
|
|
|
|
SCM_ASRTGO (SCM_NIMP (y), bady);
|
|
|
|
|
|
if (SCM_BIGP (y))
|
|
|
|
|
|
return scm_mulbig (SCM_BDIGITS (x), SCM_NUMDIGS (x),
|
|
|
|
|
|
SCM_BDIGITS (y), SCM_NUMDIGS (y),
|
|
|
|
|
|
SCM_BIGSIGN (x) ^ SCM_BIGSIGN (y));
|
|
|
|
|
|
SCM_ASRTGO (SCM_INEXP (y), bady);
|
|
|
|
|
|
bigreal:
|
|
|
|
|
|
{
|
|
|
|
|
|
double bg = scm_big2dbl (x);
|
|
|
|
|
|
return scm_makdbl (bg * SCM_REALPART (y),
|
|
|
|
|
|
SCM_CPLXP (y) ? bg * SCM_IMAG (y) : 0.0);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
1999-09-20 21:51:50 +00:00
|
|
|
|
SCM_ASRTGO (SCM_INEXP (x), badx2);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#else
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_ASRTGO (SCM_INEXP (x), badx2);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
if (SCM_INUMP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
t = x;
|
|
|
|
|
|
x = y;
|
|
|
|
|
|
y = t;
|
|
|
|
|
|
goto intreal;
|
|
|
|
|
|
}
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
|
|
|
|
|
SCM_ASRTGO (SCM_NIMP (y), bady);
|
|
|
|
|
|
if (SCM_BIGP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
t = x;
|
|
|
|
|
|
x = y;
|
|
|
|
|
|
y = t;
|
|
|
|
|
|
goto bigreal;
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (!(SCM_INEXP (y)))
|
|
|
|
|
|
{
|
|
|
|
|
|
bady:
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_product, x, y, SCM_ARGn, s_product);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
#else
|
1999-12-16 20:48:05 +00:00
|
|
|
|
if (!SCM_INEXP (y))
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
|
|
|
|
|
bady:
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_product, x, y, SCM_ARGn, s_product);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
if (SCM_CPLXP (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_CPLXP (y))
|
|
|
|
|
|
return scm_makdbl (SCM_REAL (x) * SCM_REAL (y)
|
|
|
|
|
|
- SCM_IMAG (x) * SCM_IMAG (y),
|
|
|
|
|
|
SCM_REAL (x) * SCM_IMAG (y)
|
|
|
|
|
|
+ SCM_IMAG (x) * SCM_REAL (y));
|
|
|
|
|
|
else
|
|
|
|
|
|
return scm_makdbl (SCM_REAL (x) * SCM_REALPART (y),
|
|
|
|
|
|
SCM_IMAG (x) * SCM_REALPART (y));
|
|
|
|
|
|
}
|
|
|
|
|
|
return scm_makdbl (SCM_REALPART (x) * SCM_REALPART (y),
|
|
|
|
|
|
SCM_CPLXP (y)
|
|
|
|
|
|
? SCM_REALPART (x) * SCM_IMAG (y)
|
|
|
|
|
|
: 0.0);
|
|
|
|
|
|
}
|
|
|
|
|
|
if (SCM_NINUMP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
|
|
|
|
|
SCM_ASRTGO (SCM_NIMP (y), bady);
|
|
|
|
|
|
if (SCM_BIGP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
intbig:
|
|
|
|
|
|
if (SCM_INUM0 == x)
|
|
|
|
|
|
return x;
|
|
|
|
|
|
if (SCM_MAKINUM (1L) == x)
|
|
|
|
|
|
return y;
|
|
|
|
|
|
{
|
|
|
|
|
|
#ifndef SCM_DIGSTOOBIG
|
|
|
|
|
|
long z = scm_pseudolong (SCM_INUM (x));
|
|
|
|
|
|
return scm_mulbig ((SCM_BIGDIG *) & z, SCM_DIGSPERLONG,
|
|
|
|
|
|
SCM_BDIGITS (y), SCM_NUMDIGS (y),
|
|
|
|
|
|
SCM_BIGSIGN (y) ? (x > 0) : (x < 0));
|
|
|
|
|
|
#else
|
|
|
|
|
|
SCM_BIGDIG zdigs[SCM_DIGSPERLONG];
|
|
|
|
|
|
scm_longdigs (SCM_INUM (x), zdigs);
|
|
|
|
|
|
return scm_mulbig (zdigs, SCM_DIGSPERLONG,
|
|
|
|
|
|
SCM_BDIGITS (y), SCM_NUMDIGS (y),
|
|
|
|
|
|
SCM_BIGSIGN (y) ? (x > 0) : (x < 0));
|
|
|
|
|
|
#endif
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
SCM_ASRTGO (SCM_INEXP (y), bady);
|
|
|
|
|
|
#else
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_ASRTGO (SCM_INEXP (y), bady);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
intreal:
|
|
|
|
|
|
return scm_makdbl (SCM_INUM (x) * SCM_REALPART (y),
|
|
|
|
|
|
SCM_CPLXP (y) ? SCM_INUM (x) * SCM_IMAG (y) : 0.0);
|
|
|
|
|
|
}
|
|
|
|
|
|
#else
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
|
|
|
|
|
if (SCM_NINUMP (x))
|
|
|
|
|
|
{
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_ASRTGO (SCM_BIGP (x), badx2);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_INUMP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM t = x;
|
|
|
|
|
|
x = y;
|
|
|
|
|
|
y = t;
|
|
|
|
|
|
goto intbig;
|
|
|
|
|
|
}
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_ASRTGO (SCM_BIGP (y), bady);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return scm_mulbig (SCM_BDIGITS (x), SCM_NUMDIGS (x),
|
|
|
|
|
|
SCM_BDIGITS (y), SCM_NUMDIGS (y),
|
|
|
|
|
|
SCM_BIGSIGN (x) ^ SCM_BIGSIGN (y));
|
|
|
|
|
|
}
|
|
|
|
|
|
if (SCM_NINUMP (y))
|
|
|
|
|
|
{
|
1999-12-16 20:48:05 +00:00
|
|
|
|
if (!SCM_BIGP (y))
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
|
|
|
|
|
bady:
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_product, x, y, SCM_ARGn, s_product);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
intbig:
|
|
|
|
|
|
if (SCM_INUM0 == x)
|
|
|
|
|
|
return x;
|
|
|
|
|
|
if (SCM_MAKINUM (1L) == x)
|
|
|
|
|
|
return y;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#ifndef SCM_DIGSTOOBIG
|
|
|
|
|
|
long z = scm_pseudolong (SCM_INUM (x));
|
|
|
|
|
|
return scm_mulbig (&z, SCM_DIGSPERLONG,
|
|
|
|
|
|
SCM_BDIGITS (y), SCM_NUMDIGS (y),
|
|
|
|
|
|
SCM_BIGSIGN (y) ? (x > 0) : (x < 0));
|
|
|
|
|
|
#else
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM_BIGDIG zdigs[SCM_DIGSPERLONG];
|
1999-01-10 07:38:39 +00:00
|
|
|
|
scm_longdigs (SCM_INUM (x), zdigs);
|
|
|
|
|
|
return scm_mulbig (zdigs, SCM_DIGSPERLONG,
|
|
|
|
|
|
SCM_BDIGITS (y), SCM_NUMDIGS (y),
|
|
|
|
|
|
SCM_BIGSIGN (y) ? (x > 0) : (x < 0));
|
|
|
|
|
|
#endif
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
#else
|
1999-09-20 21:51:50 +00:00
|
|
|
|
SCM_ASRTGO (SCM_INUMP (x), badx2);
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_GASSERT (SCM_INUMP (y), g_product, x, y, SCM_ARGn, s_product);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
{
|
|
|
|
|
|
long i, j, k;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
i = SCM_INUM (x);
|
|
|
|
|
|
if (0 == i)
|
|
|
|
|
|
return x;
|
|
|
|
|
|
j = SCM_INUM (y);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
k = i * j;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
y = SCM_MAKINUM (k);
|
|
|
|
|
|
if (k != SCM_INUM (y) || k / i != j)
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
|
|
|
|
|
{
|
|
|
|
|
|
int sgn = (i < 0) ^ (j < 0);
|
|
|
|
|
|
#ifndef SCM_DIGSTOOBIG
|
|
|
|
|
|
i = scm_pseudolong (i);
|
|
|
|
|
|
j = scm_pseudolong (j);
|
|
|
|
|
|
return scm_mulbig ((SCM_BIGDIG *) & i, SCM_DIGSPERLONG,
|
|
|
|
|
|
(SCM_BIGDIG *) & j, SCM_DIGSPERLONG, sgn);
|
|
|
|
|
|
#else /* SCM_DIGSTOOBIG */
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM_BIGDIG idigs[SCM_DIGSPERLONG];
|
|
|
|
|
|
SCM_BIGDIG jdigs[SCM_DIGSPERLONG];
|
1999-01-10 07:38:39 +00:00
|
|
|
|
scm_longdigs (i, idigs);
|
|
|
|
|
|
scm_longdigs (j, jdigs);
|
|
|
|
|
|
return scm_mulbig (idigs, SCM_DIGSPERLONG,
|
|
|
|
|
|
jdigs, SCM_DIGSPERLONG,
|
|
|
|
|
|
sgn);
|
|
|
|
|
|
#endif
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
#else
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#ifdef SCM_FLOATS
|
|
|
|
|
|
return scm_makdbl (((double) i) * ((double) j), 0.0);
|
|
|
|
|
|
#else
|
* debug.c, unif.c: use scm_out_of_range instead of
wta for range errors (ASSERT still needs work).
* error.c, error.h (scm_out_of_range): new procedure.
* error.c, error.h (scm_out_of_range_key): new key.
* posix.c (scm_sync): #else was missing.
* error.c, error.h: append _key to names scm_num_overflow and
scm_system_error.
* __scm.h (SCM_SYSMISSING, SCM_NUM_OVERFLOW): use SCM_BOOL_F instead
of consing an empty list.
(SCM_SYSERROR etc.): move into error.c, make them procedures instead
of macros, saves code and string space.
error.c, fports.c, numbers.c, posix.c, ioext.c, filesys.c, socket.c,
fdsocket.c, simpos.c: change names of SCM_SYSERROR etc., to
lower case. Rename scm_syserror_m to scm_syserror_msg.
error.h: prototypes for new procedures.
1996-09-15 06:41:31 +00:00
|
|
|
|
scm_num_overflow (s_product);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
return y;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
double
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_num2dbl (SCM a, const char *why)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
if (SCM_INUMP (a))
|
|
|
|
|
|
return (double) SCM_INUM (a);
|
|
|
|
|
|
#ifdef SCM_FLOATS
|
|
|
|
|
|
SCM_ASSERT (SCM_NIMP (a), a, "wrong type argument", why);
|
|
|
|
|
|
if (SCM_REALP (a))
|
|
|
|
|
|
return (SCM_REALPART (a));
|
|
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
|
|
|
|
|
return scm_big2dbl (a);
|
|
|
|
|
|
#endif
|
|
|
|
|
|
SCM_ASSERT (0, a, "wrong type argument", why);
|
|
|
|
|
|
return SCM_UNSPECIFIED;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_GPROC1 (s_divide, "/", scm_tc7_asubr, scm_divide, g_divide);
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_divide (SCM x, SCM y)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
#ifdef SCM_FLOATS
|
|
|
|
|
|
double d, r, i, a;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_NINUMP (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (!(SCM_NIMP (x)))
|
|
|
|
|
|
{
|
1999-09-20 21:51:50 +00:00
|
|
|
|
if (SCM_UNBNDP (y))
|
|
|
|
|
|
{
|
1999-09-20 22:10:38 +00:00
|
|
|
|
SCM_GASSERT0 (!SCM_UNBNDP (x),
|
|
|
|
|
|
g_divide, scm_makfrom0str (s_divide), SCM_WNA, 0);
|
1999-09-20 21:51:50 +00:00
|
|
|
|
badx:
|
|
|
|
|
|
SCM_WTA_DISPATCH_1 (g_divide, x, SCM_ARG1, s_divide);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
badx2:
|
|
|
|
|
|
SCM_WTA_DISPATCH_2 (g_divide, x, y, SCM_ARG1, s_divide);
|
|
|
|
|
|
}
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
if (SCM_UNBNDP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
|
|
|
|
|
if (SCM_BIGP (x))
|
|
|
|
|
|
return scm_makdbl (1.0 / scm_big2dbl (x), 0.0);
|
|
|
|
|
|
#endif
|
|
|
|
|
|
SCM_ASRTGO (SCM_INEXP (x), badx);
|
|
|
|
|
|
if (SCM_REALP (x))
|
|
|
|
|
|
return scm_makdbl (1.0 / SCM_REALPART (x), 0.0);
|
|
|
|
|
|
r = SCM_REAL (x);
|
|
|
|
|
|
i = SCM_IMAG (x);
|
|
|
|
|
|
d = r * r + i * i;
|
|
|
|
|
|
return scm_makdbl (r / d, -i / d);
|
|
|
|
|
|
}
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
|
|
|
|
|
if (SCM_BIGP (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM z;
|
|
|
|
|
|
if (SCM_INUMP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
z = SCM_INUM (y);
|
|
|
|
|
|
#ifndef SCM_RECKLESS
|
|
|
|
|
|
if (!z)
|
|
|
|
|
|
scm_num_overflow (s_divide);
|
|
|
|
|
|
#endif
|
|
|
|
|
|
if (1 == z)
|
|
|
|
|
|
return x;
|
|
|
|
|
|
if (z < 0)
|
|
|
|
|
|
z = -z;
|
|
|
|
|
|
if (z < SCM_BIGRAD)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM w = scm_copybig (x, SCM_BIGSIGN (x) ? (y > 0) : (y < 0));
|
|
|
|
|
|
return (scm_divbigdig (SCM_BDIGITS (w), SCM_NUMDIGS (w),
|
|
|
|
|
|
(SCM_BIGDIG) z)
|
|
|
|
|
|
? scm_makdbl (scm_big2dbl (x) / SCM_INUM (y), 0.0)
|
|
|
|
|
|
: scm_normbig (w));
|
|
|
|
|
|
}
|
|
|
|
|
|
#ifndef SCM_DIGSTOOBIG
|
|
|
|
|
|
z = scm_pseudolong (z);
|
|
|
|
|
|
z = scm_divbigbig (SCM_BDIGITS (x), SCM_NUMDIGS (x),
|
|
|
|
|
|
(SCM_BIGDIG *) & z, SCM_DIGSPERLONG,
|
|
|
|
|
|
SCM_BIGSIGN (x) ? (y > 0) : (y < 0), 3);
|
|
|
|
|
|
#else
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM_BIGDIG zdigs[SCM_DIGSPERLONG];
|
|
|
|
|
|
scm_longdigs (z, zdigs);
|
|
|
|
|
|
z = scm_divbigbig (SCM_BDIGITS (x), SCM_NUMDIGS (x),
|
|
|
|
|
|
zdigs, SCM_DIGSPERLONG,
|
|
|
|
|
|
SCM_BIGSIGN (x) ? (y > 0) : (y < 0), 3);
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
return z ? z : scm_makdbl (scm_big2dbl (x) / SCM_INUM (y), 0.0);
|
|
|
|
|
|
}
|
|
|
|
|
|
SCM_ASRTGO (SCM_NIMP (y), bady);
|
|
|
|
|
|
if (SCM_BIGP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
z = scm_divbigbig (SCM_BDIGITS (x), SCM_NUMDIGS (x),
|
|
|
|
|
|
SCM_BDIGITS (y), SCM_NUMDIGS (y),
|
|
|
|
|
|
SCM_BIGSIGN (x) ^ SCM_BIGSIGN (y), 3);
|
|
|
|
|
|
return z ? z : scm_makdbl (scm_big2dbl (x) / scm_big2dbl (y),
|
|
|
|
|
|
0.0);
|
|
|
|
|
|
}
|
|
|
|
|
|
SCM_ASRTGO (SCM_INEXP (y), bady);
|
|
|
|
|
|
if (SCM_REALP (y))
|
|
|
|
|
|
return scm_makdbl (scm_big2dbl (x) / SCM_REALPART (y), 0.0);
|
|
|
|
|
|
a = scm_big2dbl (x);
|
|
|
|
|
|
goto complex_div;
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
1999-09-20 21:51:50 +00:00
|
|
|
|
SCM_ASRTGO (SCM_INEXP (x), badx2);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_INUMP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
d = SCM_INUM (y);
|
|
|
|
|
|
goto basic_div;
|
|
|
|
|
|
}
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
|
|
|
|
|
SCM_ASRTGO (SCM_NIMP (y), bady);
|
|
|
|
|
|
if (SCM_BIGP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
d = scm_big2dbl (y);
|
|
|
|
|
|
goto basic_div;
|
|
|
|
|
|
}
|
|
|
|
|
|
SCM_ASRTGO (SCM_INEXP (y), bady);
|
|
|
|
|
|
#else
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_ASRTGO (SCM_INEXP (y), bady);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
if (SCM_REALP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
d = SCM_REALPART (y);
|
|
|
|
|
|
basic_div:
|
|
|
|
|
|
return scm_makdbl (SCM_REALPART (x) / d,
|
|
|
|
|
|
SCM_CPLXP (x) ? SCM_IMAG (x) / d : 0.0);
|
|
|
|
|
|
}
|
|
|
|
|
|
a = SCM_REALPART (x);
|
|
|
|
|
|
if (SCM_REALP (x))
|
|
|
|
|
|
goto complex_div;
|
|
|
|
|
|
r = SCM_REAL (y);
|
|
|
|
|
|
i = SCM_IMAG (y);
|
|
|
|
|
|
d = r * r + i * i;
|
|
|
|
|
|
return scm_makdbl ((a * r + SCM_IMAG (x) * i) / d,
|
|
|
|
|
|
(SCM_IMAG (x) * r - a * i) / d);
|
|
|
|
|
|
}
|
|
|
|
|
|
if (SCM_UNBNDP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
if ((SCM_MAKINUM (1L) == x) || (SCM_MAKINUM (-1L) == x))
|
|
|
|
|
|
return x;
|
|
|
|
|
|
return scm_makdbl (1.0 / ((double) SCM_INUM (x)), 0.0);
|
|
|
|
|
|
}
|
|
|
|
|
|
if (SCM_NINUMP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
|
|
|
|
|
SCM_ASRTGO (SCM_NIMP (y), bady);
|
|
|
|
|
|
if (SCM_BIGP (y))
|
|
|
|
|
|
return scm_makdbl (SCM_INUM (x) / scm_big2dbl (y), 0.0);
|
|
|
|
|
|
if (!(SCM_INEXP (y)))
|
|
|
|
|
|
{
|
|
|
|
|
|
bady:
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_divide, x, y, SCM_ARGn, s_divide);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
#else
|
1999-12-16 20:48:05 +00:00
|
|
|
|
if (!SCM_INEXP (y))
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
|
|
|
|
|
bady:
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_divide, x, y, SCM_ARGn, s_divide);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
if (SCM_REALP (y))
|
|
|
|
|
|
return scm_makdbl (SCM_INUM (x) / SCM_REALPART (y), 0.0);
|
|
|
|
|
|
a = SCM_INUM (x);
|
|
|
|
|
|
complex_div:
|
|
|
|
|
|
r = SCM_REAL (y);
|
|
|
|
|
|
i = SCM_IMAG (y);
|
|
|
|
|
|
d = r * r + i * i;
|
|
|
|
|
|
return scm_makdbl ((a * r) / d, (-a * i) / d);
|
|
|
|
|
|
}
|
|
|
|
|
|
#else
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
|
|
|
|
|
if (SCM_NINUMP (x))
|
|
|
|
|
|
{
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM z;
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_GASSERT2 (SCM_BIGP (x),
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
g_divide, x, y, SCM_ARG1, s_divide);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_UNBNDP (y))
|
|
|
|
|
|
goto ov;
|
|
|
|
|
|
if (SCM_INUMP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
z = SCM_INUM (y);
|
|
|
|
|
|
if (!z)
|
|
|
|
|
|
goto ov;
|
|
|
|
|
|
if (1 == z)
|
|
|
|
|
|
return x;
|
|
|
|
|
|
if (z < 0)
|
|
|
|
|
|
z = -z;
|
|
|
|
|
|
if (z < SCM_BIGRAD)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM w = scm_copybig (x, SCM_BIGSIGN (x) ? (y > 0) : (y < 0));
|
|
|
|
|
|
if (scm_divbigdig (SCM_BDIGITS (w), SCM_NUMDIGS (w),
|
|
|
|
|
|
(SCM_BIGDIG) z))
|
|
|
|
|
|
goto ov;
|
|
|
|
|
|
return w;
|
|
|
|
|
|
}
|
|
|
|
|
|
#ifndef SCM_DIGSTOOBIG
|
|
|
|
|
|
z = scm_pseudolong (z);
|
|
|
|
|
|
z = scm_divbigbig (SCM_BDIGITS (x), SCM_NUMDIGS (x),
|
|
|
|
|
|
&z, SCM_DIGSPERLONG,
|
|
|
|
|
|
SCM_BIGSIGN (x) ? (y > 0) : (y < 0), 3);
|
|
|
|
|
|
#else
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM_BIGDIG zdigs[SCM_DIGSPERLONG];
|
|
|
|
|
|
scm_longdigs (z, zdigs);
|
|
|
|
|
|
z = scm_divbigbig (SCM_BDIGITS (x), SCM_NUMDIGS (x),
|
|
|
|
|
|
zdigs, SCM_DIGSPERLONG,
|
|
|
|
|
|
SCM_BIGSIGN (x) ? (y > 0) : (y < 0), 3);
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_ASRTGO (SCM_BIGP (y), bady);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
z = scm_divbigbig (SCM_BDIGITS (x), SCM_NUMDIGS (x),
|
|
|
|
|
|
SCM_BDIGITS (y), SCM_NUMDIGS (y),
|
|
|
|
|
|
SCM_BIGSIGN (x) ^ SCM_BIGSIGN (y), 3);
|
|
|
|
|
|
}
|
|
|
|
|
|
if (!z)
|
|
|
|
|
|
goto ov;
|
|
|
|
|
|
return z;
|
|
|
|
|
|
}
|
|
|
|
|
|
if (SCM_UNBNDP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
if ((SCM_MAKINUM (1L) == x) || (SCM_MAKINUM (-1L) == x))
|
|
|
|
|
|
return x;
|
|
|
|
|
|
goto ov;
|
|
|
|
|
|
}
|
|
|
|
|
|
if (SCM_NINUMP (y))
|
|
|
|
|
|
{
|
1999-12-16 20:48:05 +00:00
|
|
|
|
if (!SCM_BIGP (y))
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
|
|
|
|
|
bady:
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_divide, x, y, SCM_ARGn, s_divide);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
goto ov;
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#else
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_GASSERT2 (SCM_INUMP (x), g_divide, x, y, SCM_ARG1, s_divide);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_UNBNDP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
if ((SCM_MAKINUM (1L) == x) || (SCM_MAKINUM (-1L) == x))
|
|
|
|
|
|
return x;
|
|
|
|
|
|
goto ov;
|
|
|
|
|
|
}
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_GASSERT2 (SCM_INUMP (y), g_divide, x, y, SCM_ARGn, s_divide);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
{
|
1999-01-10 07:38:39 +00:00
|
|
|
|
long z = SCM_INUM (y);
|
|
|
|
|
|
if ((0 == z) || SCM_INUM (x) % z)
|
|
|
|
|
|
goto ov;
|
|
|
|
|
|
z = SCM_INUM (x) / z;
|
|
|
|
|
|
if (SCM_FIXABLE (z))
|
|
|
|
|
|
return SCM_MAKINUM (z);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#ifdef SCM_BIGDIG
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return scm_long2big (z);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef SCM_FLOATS
|
1999-01-10 07:38:39 +00:00
|
|
|
|
ov:
|
|
|
|
|
|
return scm_makdbl (((double) SCM_INUM (x)) / ((double) SCM_INUM (y)), 0.0);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#else
|
1999-01-10 07:38:39 +00:00
|
|
|
|
ov:
|
|
|
|
|
|
scm_num_overflow (s_divide);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return SCM_UNSPECIFIED;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef SCM_FLOATS
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_GPROC1 (s_asinh, "$asinh", scm_tc7_cxr, (SCM (*)()) scm_asinh, g_asinh);
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
double
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_asinh (double x)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return log (x + sqrt (x * x + 1));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_GPROC1 (s_acosh, "$acosh", scm_tc7_cxr, (SCM (*)()) scm_acosh, g_acosh);
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
double
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_acosh (double x)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return log (x + sqrt (x * x - 1));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_GPROC1 (s_atanh, "$atanh", scm_tc7_cxr, (SCM (*)()) scm_atanh, g_atanh);
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
double
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_atanh (double x)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return 0.5 * log ((1 + x) / (1 - x));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_GPROC1 (s_truncate, "truncate", scm_tc7_cxr, (SCM (*)()) scm_truncate, g_truncate);
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
double
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_truncate (double x)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (x < 0.0)
|
|
|
|
|
|
return -floor (-x);
|
|
|
|
|
|
return floor (x);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_GPROC1 (s_round, "round", scm_tc7_cxr, (SCM (*)()) scm_round, g_round);
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
double
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_round (double x)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
double plus_half = x + 0.5;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
double result = floor (plus_half);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
/* Adjust so that the scm_round is towards even. */
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return (plus_half == result && plus_half / 2 != floor (plus_half / 2))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
? result - 1 : result;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_GPROC1 (s_exact_to_inexact, "exact->inexact", scm_tc7_cxr, (SCM (*)()) scm_exact_to_inexact, g_exact_to_inexact);
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
double
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_exact_to_inexact (double z)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
return z;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_GPROC1 (s_i_floor, "floor", scm_tc7_cxr, (SCM (*)()) floor, g_i_floor);
|
|
|
|
|
|
SCM_GPROC1 (s_i_ceil, "ceiling", scm_tc7_cxr, (SCM (*)()) ceil, g_i_ceil);
|
|
|
|
|
|
SCM_GPROC1 (s_i_sqrt, "$sqrt", scm_tc7_cxr, (SCM (*)()) sqrt, g_i_sqrt);
|
|
|
|
|
|
SCM_GPROC1 (s_i_abs, "$abs", scm_tc7_cxr, (SCM (*)()) fabs, g_i_abs);
|
|
|
|
|
|
SCM_GPROC1 (s_i_exp, "$exp", scm_tc7_cxr, (SCM (*)()) exp, g_i_exp);
|
|
|
|
|
|
SCM_GPROC1 (s_i_log, "$log", scm_tc7_cxr, (SCM (*)()) log, g_i_log);
|
|
|
|
|
|
SCM_GPROC1 (s_i_sin, "$sin", scm_tc7_cxr, (SCM (*)()) sin, g_i_sin);
|
|
|
|
|
|
SCM_GPROC1 (s_i_cos, "$cos", scm_tc7_cxr, (SCM (*)()) cos, g_i_cos);
|
|
|
|
|
|
SCM_GPROC1 (s_i_tan, "$tan", scm_tc7_cxr, (SCM (*)()) tan, g_i_tan);
|
|
|
|
|
|
SCM_GPROC1 (s_i_asin, "$asin", scm_tc7_cxr, (SCM (*)()) asin, g_i_asin);
|
|
|
|
|
|
SCM_GPROC1 (s_i_acos, "$acos", scm_tc7_cxr, (SCM (*)()) acos, g_i_acos);
|
|
|
|
|
|
SCM_GPROC1 (s_i_atan, "$atan", scm_tc7_cxr, (SCM (*)()) atan, g_i_atan);
|
|
|
|
|
|
SCM_GPROC1 (s_i_sinh, "$sinh", scm_tc7_cxr, (SCM (*)()) sinh, g_i_sinh);
|
|
|
|
|
|
SCM_GPROC1 (s_i_cosh, "$cosh", scm_tc7_cxr, (SCM (*)()) cosh, g_i_cosh);
|
|
|
|
|
|
SCM_GPROC1 (s_i_tanh, "$tanh", scm_tc7_cxr, (SCM (*)()) tanh, g_i_tanh);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
|
|
|
|
|
|
struct dpair
|
|
|
|
|
|
{
|
|
|
|
|
|
double x, y;
|
|
|
|
|
|
};
|
|
|
|
|
|
|
* chars.c (scm_lowers, scm_uppers, scm_charnames, scm_charnums),
eval.c (s_expression, s_test, s_body, s_bindings, s_variable,
s_clauses, s_formals): Variables now const.
* eval.c (promsmob): Now const.
* macros.c (macrosmob): Now const.
* smob.c (scm_newsmob): Smobfuns argument now points to const.
(freecell, flob, bigob): Now const.
* dynl.c (scm_make_argv_from_stringlist, scm_coerce_rostring),
error.c (scm_error, scm_syserror, scm_syserror_msg,
scm_num_overflow, scm_out_of_range, scm_wrong_type_arg,
scm_memory_error, scm_misc_error, scm_wta), macros.c
(scm_make_synt), feature.c (scm_add_feature), filesys.c
(scm_input_waiting_p), gc.c (scm_gc_start, scm_igc,
scm_must_malloc, scm_must_realloc), gsubr.c (scm_make_gsubr),
numbers.c (scm_num2dbl, scm_two_doubles, scm_num2long,
scm_num2long_long, scm_num2ulong),
options.c (scm_options), posix.c (scm_convert_exec_args,
environ_list_to_c), procs.c (scm_make_subr_opt, scm_make_subr),
ramap.c (scm_ramapc), read.c (scm_flush_ws), socket.c
(scm_sock_fd_to_port, scm_fill_sockaddr, scm_addr_vector), stime.c
(setzone, restorezone, bdtime2c), strop.c (scm_i_index),
strports.c (scm_mkstrport), symbols.c (scm_intern_obarray_soft,
scm_intern_obarray, scm_intern, scm_intern0,
scm_sysintern0_no_module_lookup, scm_sysintern, scm_sysintern0,
scm_symbol_value0), unif.c (scm_aind, scm_shap2ra): Argument
indicating calling subr, error message text, reason for error,
symbol name or feature name are now pointer to const.
* snarf.h (SCM_PROC, SCM_PROC1): String variables are now const.
* procs.c (scm_init_iprocs): iproc argument now points to const.
* pairs.c (cxrs): Now const.
* chars.h, error.h, feature.h, filesys.h, gc.h, gsubr.h, macros.h,
numbers.h, options.h, procs.h, ramap.h, read.h, smob.h,
strports.h, symbols.h, unif.h: Update variable declarations and
function prototypes for above changes.
* dynl.c, dynl-dld.c, dynl-dl.c, dynl-shl.c (sysdep_dynl_link,
sysdep_dynl_unlink, sysdep_dynl_func): Arguments FNAME, SUBR, and
SYMB now point to const.
1999-02-06 12:31:04 +00:00
|
|
|
|
static void scm_two_doubles (SCM z1,
|
|
|
|
|
|
SCM z2,
|
|
|
|
|
|
const char *sstring,
|
|
|
|
|
|
struct dpair * xy);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
|
|
|
|
|
|
static void
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_two_doubles (SCM z1, SCM z2, const char *sstring, struct dpair *xy)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_INUMP (z1))
|
|
|
|
|
|
xy->x = SCM_INUM (z1);
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
|
|
|
|
|
SCM_ASRTGO (SCM_NIMP (z1), badz1);
|
|
|
|
|
|
if (SCM_BIGP (z1))
|
|
|
|
|
|
xy->x = scm_big2dbl (z1);
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
#ifndef SCM_RECKLESS
|
1999-12-16 20:48:05 +00:00
|
|
|
|
if (!SCM_REALP (z1))
|
1999-01-10 07:38:39 +00:00
|
|
|
|
badz1:scm_wta (z1, (char *) SCM_ARG1, sstring);
|
|
|
|
|
|
#endif
|
|
|
|
|
|
xy->x = SCM_REALPART (z1);
|
|
|
|
|
|
}
|
|
|
|
|
|
#else
|
|
|
|
|
|
{
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_ASSERT (SCM_REALP (z1), z1, SCM_ARG1, sstring);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
xy->x = SCM_REALPART (z1);
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
}
|
|
|
|
|
|
if (SCM_INUMP (z2))
|
|
|
|
|
|
xy->y = SCM_INUM (z2);
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
|
|
|
|
|
SCM_ASRTGO (SCM_NIMP (z2), badz2);
|
|
|
|
|
|
if (SCM_BIGP (z2))
|
|
|
|
|
|
xy->y = scm_big2dbl (z2);
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
#ifndef SCM_RECKLESS
|
|
|
|
|
|
if (!(SCM_REALP (z2)))
|
|
|
|
|
|
badz2:scm_wta (z2, (char *) SCM_ARG2, sstring);
|
|
|
|
|
|
#endif
|
|
|
|
|
|
xy->y = SCM_REALPART (z2);
|
|
|
|
|
|
}
|
|
|
|
|
|
#else
|
|
|
|
|
|
{
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_ASSERT (SCM_REALP (z2), z2, SCM_ARG2, sstring);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
xy->y = SCM_REALPART (z2);
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_sys_expt, "$expt", 2, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM z1, SCM z2),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_sys_expt
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
struct dpair xy;
|
1999-12-12 02:36:16 +00:00
|
|
|
|
scm_two_doubles (z1, z2, FUNC_NAME, &xy);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return scm_makdbl (pow (xy.x, xy.y), 0.0);
|
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:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_sys_atan2, "$atan2", 2, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM z1, SCM z2),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_sys_atan2
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
struct dpair xy;
|
1999-12-12 02:36:16 +00:00
|
|
|
|
scm_two_doubles (z1, z2, FUNC_NAME, &xy);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return scm_makdbl (atan2 (xy.x, xy.y), 0.0);
|
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:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_make_rectangular, "make-rectangular", 2, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM z1, SCM z2),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_make_rectangular
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
struct dpair xy;
|
1999-12-12 02:36:16 +00:00
|
|
|
|
scm_two_doubles (z1, z2, FUNC_NAME, &xy);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return scm_makdbl (xy.x, xy.y);
|
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:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_make_polar, "make-polar", 2, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM z1, SCM z2),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_make_polar
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
struct dpair xy;
|
1999-12-12 02:36:16 +00:00
|
|
|
|
scm_two_doubles (z1, z2, FUNC_NAME, &xy);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return scm_makdbl (xy.x * cos (xy.y), xy.x * sin (xy.y));
|
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1999-09-06 21:12:15 +00:00
|
|
|
|
SCM_GPROC (s_real_part, "real-part", 1, 0, 0, scm_real_part, g_real_part);
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_real_part (SCM z)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_NINUMP (z))
|
|
|
|
|
|
{
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
|
|
|
|
|
SCM_ASRTGO (SCM_NIMP (z), badz);
|
|
|
|
|
|
if (SCM_BIGP (z))
|
|
|
|
|
|
return z;
|
|
|
|
|
|
if (!(SCM_INEXP (z)))
|
|
|
|
|
|
{
|
|
|
|
|
|
badz:
|
1999-09-06 21:12:15 +00:00
|
|
|
|
SCM_WTA_DISPATCH_1 (g_real_part, z, SCM_ARG1, s_real_part);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
#else
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_GASSERT1 (SCM_INEXP (z),
|
1999-09-06 21:12:15 +00:00
|
|
|
|
g_real_part, z, SCM_ARG1, s_real_part);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
if (SCM_CPLXP (z))
|
|
|
|
|
|
return scm_makdbl (SCM_REAL (z), 0.0);
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return z;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1999-09-06 21:12:15 +00:00
|
|
|
|
SCM_GPROC (s_imag_part, "imag-part", 1, 0, 0, scm_imag_part, g_imag_part);
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_imag_part (SCM z)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_INUMP (z))
|
|
|
|
|
|
return SCM_INUM0;
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
|
|
|
|
|
SCM_ASRTGO (SCM_NIMP (z), badz);
|
|
|
|
|
|
if (SCM_BIGP (z))
|
|
|
|
|
|
return SCM_INUM0;
|
|
|
|
|
|
if (!(SCM_INEXP (z)))
|
|
|
|
|
|
{
|
|
|
|
|
|
badz:
|
1999-09-06 21:12:15 +00:00
|
|
|
|
SCM_WTA_DISPATCH_1 (g_imag_part, z, SCM_ARG1, s_imag_part);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
#else
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_GASSERT1 (SCM_INEXP (z),
|
1999-09-06 21:12:15 +00:00
|
|
|
|
g_imag_part, z, SCM_ARG1, s_imag_part);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
if (SCM_CPLXP (z))
|
|
|
|
|
|
return scm_makdbl (SCM_IMAG (z), 0.0);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return scm_flo0;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_GPROC (s_magnitude, "magnitude", 1, 0, 0, scm_magnitude, g_magnitude);
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_magnitude (SCM z)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_INUMP (z))
|
|
|
|
|
|
return scm_abs (z);
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
|
|
|
|
|
SCM_ASRTGO (SCM_NIMP (z), badz);
|
|
|
|
|
|
if (SCM_BIGP (z))
|
|
|
|
|
|
return scm_abs (z);
|
|
|
|
|
|
if (!(SCM_INEXP (z)))
|
|
|
|
|
|
{
|
|
|
|
|
|
badz:
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_WTA_DISPATCH_1 (g_magnitude, z, SCM_ARG1, s_magnitude);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
#else
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_GASSERT1 (SCM_INEXP (z),
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
g_magnitude, z, SCM_ARG1, s_magnitude);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
if (SCM_CPLXP (z))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-01-10 07:38:39 +00:00
|
|
|
|
double i = SCM_IMAG (z), r = SCM_REAL (z);
|
|
|
|
|
|
return scm_makdbl (sqrt (i * i + r * r), 0.0);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return scm_makdbl (fabs (SCM_REALPART (z)), 0.0);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_GPROC (s_angle, "angle", 1, 0, 0, scm_angle, g_angle);
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_angle (SCM z)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
double x, y = 0.0;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_INUMP (z))
|
|
|
|
|
|
{
|
|
|
|
|
|
x = (z >= SCM_INUM0) ? 1.0 : -1.0;
|
|
|
|
|
|
goto do_angle;
|
|
|
|
|
|
}
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
|
|
|
|
|
SCM_ASRTGO (SCM_NIMP (z), badz);
|
|
|
|
|
|
if (SCM_BIGP (z))
|
|
|
|
|
|
{
|
|
|
|
|
|
x = (SCM_TYP16 (z) == scm_tc16_bigpos) ? 1.0 : -1.0;
|
|
|
|
|
|
goto do_angle;
|
|
|
|
|
|
}
|
|
|
|
|
|
if (!(SCM_INEXP (z)))
|
|
|
|
|
|
{
|
|
|
|
|
|
badz:
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_WTA_DISPATCH_1 (g_angle, z, SCM_ARG1, s_angle);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
#else
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_GASSERT1 (SCM_INEXP (z), g_angle, z, SCM_ARG1, s_angle);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
if (SCM_REALP (z))
|
|
|
|
|
|
{
|
|
|
|
|
|
x = SCM_REALPART (z);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
goto do_angle;
|
|
|
|
|
|
}
|
1999-01-10 07:38:39 +00:00
|
|
|
|
x = SCM_REAL (z);
|
|
|
|
|
|
y = SCM_IMAG (z);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
do_angle:
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return scm_makdbl (atan2 (y, x), 0.0);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_inexact_to_exact, "inexact->exact", 1, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM z),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_inexact_to_exact
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_INUMP (z))
|
|
|
|
|
|
return z;
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
|
|
|
|
|
SCM_ASRTGO (SCM_NIMP (z), badz);
|
|
|
|
|
|
if (SCM_BIGP (z))
|
|
|
|
|
|
return z;
|
|
|
|
|
|
#ifndef SCM_RECKLESS
|
|
|
|
|
|
if (!(SCM_REALP (z)))
|
|
|
|
|
|
{
|
|
|
|
|
|
badz:
|
1999-12-18 23:24:35 +00:00
|
|
|
|
SCM_WTA (1, z);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
#else
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_VALIDATE_REAL (1,z);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-01-10 07:38:39 +00:00
|
|
|
|
double u = floor (SCM_REALPART (z) + 0.5);
|
|
|
|
|
|
if ((u <= SCM_MOST_POSITIVE_FIXNUM) && (-u <= -SCM_MOST_NEGATIVE_FIXNUM))
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Negation is a workaround for HP700 cc bug */
|
|
|
|
|
|
SCM ans = SCM_MAKINUM ((long) u);
|
|
|
|
|
|
if (SCM_INUM (ans) == (long) u)
|
|
|
|
|
|
return ans;
|
|
|
|
|
|
}
|
1999-03-26 13:45:05 +00:00
|
|
|
|
SCM_ASRTGO (isfinite (u), badz); /* problem? */
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return scm_dbl2big (u);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#else
|
|
|
|
|
|
return SCM_MAKINUM ((long) floor (SCM_REALPART (z) + 0.5));
|
|
|
|
|
|
#endif
|
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#else /* ~SCM_FLOATS */
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_GPROC (s_trunc, "truncate", 1, 0, 0, scm_trunc, g_trunc);
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_trunc (SCM x)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_GASSERT2 (SCM_INUMP (x), g_trunc, x, y, SCM_ARG1, s_truncate);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return x;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif /* SCM_FLOATS */
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#ifdef SCM_FLOATS
|
1996-07-25 22:56:11 +00:00
|
|
|
|
/* d must be integer */
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_dbl2big (double d)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
scm_sizet i = 0;
|
|
|
|
|
|
long c;
|
|
|
|
|
|
SCM_BIGDIG *digits;
|
|
|
|
|
|
SCM ans;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
double u = (d < 0) ? -d : d;
|
|
|
|
|
|
while (0 != floor (u))
|
|
|
|
|
|
{
|
|
|
|
|
|
u /= SCM_BIGRAD;
|
|
|
|
|
|
i++;
|
|
|
|
|
|
}
|
|
|
|
|
|
ans = scm_mkbig (i, d < 0);
|
|
|
|
|
|
digits = SCM_BDIGITS (ans);
|
|
|
|
|
|
while (i--)
|
|
|
|
|
|
{
|
|
|
|
|
|
u *= SCM_BIGRAD;
|
|
|
|
|
|
c = floor (u);
|
|
|
|
|
|
u -= c;
|
|
|
|
|
|
digits[i] = c;
|
|
|
|
|
|
}
|
* (__scm.h, alist.c, eval.c, feature.c, gsubr.c, numbers.c,
options.c): Rename RECKLESS -> SCM_RECKLESS, CAUTIOUS ->
SCM_CAUTIOUS; this way, 1) there's only one version of each flag
to define (we used to have both RECKLESS and SCM_RECKLESS), and 2)
if we want to use them in a header file some day, we can. (Thanks
to Michael Livshin.)
1998-10-14 07:32:13 +00:00
|
|
|
|
#ifndef SCM_RECKLESS
|
1996-09-14 07:47:50 +00:00
|
|
|
|
if (u != 0)
|
* debug.c, unif.c: use scm_out_of_range instead of
wta for range errors (ASSERT still needs work).
* error.c, error.h (scm_out_of_range): new procedure.
* error.c, error.h (scm_out_of_range_key): new key.
* posix.c (scm_sync): #else was missing.
* error.c, error.h: append _key to names scm_num_overflow and
scm_system_error.
* __scm.h (SCM_SYSMISSING, SCM_NUM_OVERFLOW): use SCM_BOOL_F instead
of consing an empty list.
(SCM_SYSERROR etc.): move into error.c, make them procedures instead
of macros, saves code and string space.
error.c, fports.c, numbers.c, posix.c, ioext.c, filesys.c, socket.c,
fdsocket.c, simpos.c: change names of SCM_SYSERROR etc., to
lower case. Rename scm_syserror_m to scm_syserror_msg.
error.h: prototypes for new procedures.
1996-09-15 06:41:31 +00:00
|
|
|
|
scm_num_overflow ("dbl2big");
|
1996-09-14 07:47:50 +00:00
|
|
|
|
#endif
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return ans;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
double
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_big2dbl (SCM b)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
double ans = 0.0;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
scm_sizet i = SCM_NUMDIGS (b);
|
|
|
|
|
|
SCM_BIGDIG *digits = SCM_BDIGITS (b);
|
|
|
|
|
|
while (i--)
|
|
|
|
|
|
ans = digits[i] + SCM_BIGRAD * ans;
|
|
|
|
|
|
if (scm_tc16_bigneg == SCM_TYP16 (b))
|
|
|
|
|
|
return -ans;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return ans;
|
|
|
|
|
|
}
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_long2num (long sl)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (!SCM_FIXABLE (sl))
|
|
|
|
|
|
{
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#ifdef SCM_BIGDIG
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return scm_long2big (sl);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#else
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#ifdef SCM_FLOATS
|
|
|
|
|
|
return scm_makdbl ((double) sl, 0.0);
|
|
|
|
|
|
#else
|
|
|
|
|
|
return SCM_BOOL_F;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
}
|
|
|
|
|
|
return SCM_MAKINUM (sl);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
* configure.in: check for hstrerror.
* socket.c (scm_htons, scm_ntohs, scm_htonl, scm_ntohl): new
functions for network data conversion.
* numbers.c (scm_num2long, scm_num2longlong):
throw out-of-range instead of wrong-type-arg if appropriate.
(scm_iint2str): handle -2^31 correctly.
(scm_num2long): handle -2^31 bignum correctly.
(scm_num2long_long): rewrite the bigdig case: basically copied
from scm_num2long.
numbers.h: (SCM_BITSPERLONGLONG): deleted.
* unif.c (rapr1): use sprintf instead of intprint for unsigned
longs: intprint can't cope with large values.
* numbers.c (scm_num2ulong): check more consistently that the
input is not negative. if it is, throw out-of-range instead of
wrong-type-arg.
* ramap.c (scm_array_fill_int): don't limit fill to INUM for
uvect, ivect or llvect.
Check that fill doesn't overflow short uniform array.
* __scm.h: add another long to the definition of long_long and
ulong_long.
* unif.c (scm_raprin1): use 'l' instead of "long_long" in the
print representation of llvect. read can't handle more than
one character.
(scm_dimensions_to_uniform_array): make "fill" an optional argument
instead of a rest argument.
* tags.h (scm_tc7_llvect): wasn't defined anywhere, so use the free
tag 29 for now.
* __scm.h: don't mention LONGLONGS.
* unif.c, numbers.c, eq.c, gc.c, print.c, eval.c, ramap.c:
replace LONGLONGS with HAVE_LONG_LONGS as set by configure.
* net_db.c (scm_inet_aton): throw errors using the misc-error key
instead of system-error. inet_aton doesn't set errno.
system-error isn't right in gethost either, since it's throwing
the value of h_errno instead of errno. so:
(scm_host_not_found_key, scm_try_again_key,
scm_no_recovery_key, scm_no_data_key): new error keys.
(scm_resolv_error): new procedure, use the new keys.
(scm_gethost): call scm_resolv_error not scm_syserror_msg.
* error.c: (various): use scm_cons instead of scm_listify
to build short lists.
* boot-9.scm (read-hash-extend to set up arrays): add 'l' for
long_long uniform vectors.
* networking.scm (sethostent, setnetent, setprotoent, setservent):
take an optional argument STAYOPEN. default is #f.
* readline.c (scm_init_readline): set rl_readline_name to Guile,
to allow conditionals in .inputrc.
1999-11-18 22:36:28 +00:00
|
|
|
|
#ifdef HAVE_LONG_LONGS
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_long_long2num (long_long sl)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (!SCM_FIXABLE (sl))
|
|
|
|
|
|
{
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#ifdef SCM_BIGDIG
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return scm_long_long2big (sl);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#else
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#ifdef SCM_FLOATS
|
|
|
|
|
|
return scm_makdbl ((double) sl, 0.0);
|
|
|
|
|
|
#else
|
|
|
|
|
|
return SCM_BOOL_F;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
}
|
|
|
|
|
|
return SCM_MAKINUM (sl);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_ulong2num (unsigned long sl)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (!SCM_POSFIXABLE (sl))
|
|
|
|
|
|
{
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#ifdef SCM_BIGDIG
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return scm_ulong2big (sl);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#else
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#ifdef SCM_FLOATS
|
|
|
|
|
|
return scm_makdbl ((double) sl, 0.0);
|
|
|
|
|
|
#else
|
|
|
|
|
|
return SCM_BOOL_F;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
}
|
|
|
|
|
|
return SCM_MAKINUM (sl);
|
1996-07-25 22:56:11 +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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
long
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_num2long (SCM num, char *pos, const char *s_caller)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
long res;
|
* configure.in: check for hstrerror.
* socket.c (scm_htons, scm_ntohs, scm_htonl, scm_ntohl): new
functions for network data conversion.
* numbers.c (scm_num2long, scm_num2longlong):
throw out-of-range instead of wrong-type-arg if appropriate.
(scm_iint2str): handle -2^31 correctly.
(scm_num2long): handle -2^31 bignum correctly.
(scm_num2long_long): rewrite the bigdig case: basically copied
from scm_num2long.
numbers.h: (SCM_BITSPERLONGLONG): deleted.
* unif.c (rapr1): use sprintf instead of intprint for unsigned
longs: intprint can't cope with large values.
* numbers.c (scm_num2ulong): check more consistently that the
input is not negative. if it is, throw out-of-range instead of
wrong-type-arg.
* ramap.c (scm_array_fill_int): don't limit fill to INUM for
uvect, ivect or llvect.
Check that fill doesn't overflow short uniform array.
* __scm.h: add another long to the definition of long_long and
ulong_long.
* unif.c (scm_raprin1): use 'l' instead of "long_long" in the
print representation of llvect. read can't handle more than
one character.
(scm_dimensions_to_uniform_array): make "fill" an optional argument
instead of a rest argument.
* tags.h (scm_tc7_llvect): wasn't defined anywhere, so use the free
tag 29 for now.
* __scm.h: don't mention LONGLONGS.
* unif.c, numbers.c, eq.c, gc.c, print.c, eval.c, ramap.c:
replace LONGLONGS with HAVE_LONG_LONGS as set by configure.
* net_db.c (scm_inet_aton): throw errors using the misc-error key
instead of system-error. inet_aton doesn't set errno.
system-error isn't right in gethost either, since it's throwing
the value of h_errno instead of errno. so:
(scm_host_not_found_key, scm_try_again_key,
scm_no_recovery_key, scm_no_data_key): new error keys.
(scm_resolv_error): new procedure, use the new keys.
(scm_gethost): call scm_resolv_error not scm_syserror_msg.
* error.c: (various): use scm_cons instead of scm_listify
to build short lists.
* boot-9.scm (read-hash-extend to set up arrays): add 'l' for
long_long uniform vectors.
* networking.scm (sethostent, setnetent, setprotoent, setservent):
take an optional argument STAYOPEN. default is #f.
* readline.c (scm_init_readline): set rl_readline_name to Guile,
to allow conditionals in .inputrc.
1999-11-18 22:36:28 +00:00
|
|
|
|
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_INUMP (num))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-01-10 07:38:39 +00:00
|
|
|
|
res = SCM_INUM (num);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return res;
|
|
|
|
|
|
}
|
* configure.in: check for hstrerror.
* socket.c (scm_htons, scm_ntohs, scm_htonl, scm_ntohl): new
functions for network data conversion.
* numbers.c (scm_num2long, scm_num2longlong):
throw out-of-range instead of wrong-type-arg if appropriate.
(scm_iint2str): handle -2^31 correctly.
(scm_num2long): handle -2^31 bignum correctly.
(scm_num2long_long): rewrite the bigdig case: basically copied
from scm_num2long.
numbers.h: (SCM_BITSPERLONGLONG): deleted.
* unif.c (rapr1): use sprintf instead of intprint for unsigned
longs: intprint can't cope with large values.
* numbers.c (scm_num2ulong): check more consistently that the
input is not negative. if it is, throw out-of-range instead of
wrong-type-arg.
* ramap.c (scm_array_fill_int): don't limit fill to INUM for
uvect, ivect or llvect.
Check that fill doesn't overflow short uniform array.
* __scm.h: add another long to the definition of long_long and
ulong_long.
* unif.c (scm_raprin1): use 'l' instead of "long_long" in the
print representation of llvect. read can't handle more than
one character.
(scm_dimensions_to_uniform_array): make "fill" an optional argument
instead of a rest argument.
* tags.h (scm_tc7_llvect): wasn't defined anywhere, so use the free
tag 29 for now.
* __scm.h: don't mention LONGLONGS.
* unif.c, numbers.c, eq.c, gc.c, print.c, eval.c, ramap.c:
replace LONGLONGS with HAVE_LONG_LONGS as set by configure.
* net_db.c (scm_inet_aton): throw errors using the misc-error key
instead of system-error. inet_aton doesn't set errno.
system-error isn't right in gethost either, since it's throwing
the value of h_errno instead of errno. so:
(scm_host_not_found_key, scm_try_again_key,
scm_no_recovery_key, scm_no_data_key): new error keys.
(scm_resolv_error): new procedure, use the new keys.
(scm_gethost): call scm_resolv_error not scm_syserror_msg.
* error.c: (various): use scm_cons instead of scm_listify
to build short lists.
* boot-9.scm (read-hash-extend to set up arrays): add 'l' for
long_long uniform vectors.
* networking.scm (sethostent, setnetent, setprotoent, setservent):
take an optional argument STAYOPEN. default is #f.
* readline.c (scm_init_readline): set rl_readline_name to Guile,
to allow conditionals in .inputrc.
1999-11-18 22:36:28 +00:00
|
|
|
|
SCM_ASRTGO (SCM_NIMP (num), wrong_type_arg);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#ifdef SCM_FLOATS
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_REALP (num))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
* configure.in: check for hstrerror.
* socket.c (scm_htons, scm_ntohs, scm_htonl, scm_ntohl): new
functions for network data conversion.
* numbers.c (scm_num2long, scm_num2longlong):
throw out-of-range instead of wrong-type-arg if appropriate.
(scm_iint2str): handle -2^31 correctly.
(scm_num2long): handle -2^31 bignum correctly.
(scm_num2long_long): rewrite the bigdig case: basically copied
from scm_num2long.
numbers.h: (SCM_BITSPERLONGLONG): deleted.
* unif.c (rapr1): use sprintf instead of intprint for unsigned
longs: intprint can't cope with large values.
* numbers.c (scm_num2ulong): check more consistently that the
input is not negative. if it is, throw out-of-range instead of
wrong-type-arg.
* ramap.c (scm_array_fill_int): don't limit fill to INUM for
uvect, ivect or llvect.
Check that fill doesn't overflow short uniform array.
* __scm.h: add another long to the definition of long_long and
ulong_long.
* unif.c (scm_raprin1): use 'l' instead of "long_long" in the
print representation of llvect. read can't handle more than
one character.
(scm_dimensions_to_uniform_array): make "fill" an optional argument
instead of a rest argument.
* tags.h (scm_tc7_llvect): wasn't defined anywhere, so use the free
tag 29 for now.
* __scm.h: don't mention LONGLONGS.
* unif.c, numbers.c, eq.c, gc.c, print.c, eval.c, ramap.c:
replace LONGLONGS with HAVE_LONG_LONGS as set by configure.
* net_db.c (scm_inet_aton): throw errors using the misc-error key
instead of system-error. inet_aton doesn't set errno.
system-error isn't right in gethost either, since it's throwing
the value of h_errno instead of errno. so:
(scm_host_not_found_key, scm_try_again_key,
scm_no_recovery_key, scm_no_data_key): new error keys.
(scm_resolv_error): new procedure, use the new keys.
(scm_gethost): call scm_resolv_error not scm_syserror_msg.
* error.c: (various): use scm_cons instead of scm_listify
to build short lists.
* boot-9.scm (read-hash-extend to set up arrays): add 'l' for
long_long uniform vectors.
* networking.scm (sethostent, setnetent, setprotoent, setservent):
take an optional argument STAYOPEN. default is #f.
* readline.c (scm_init_readline): set rl_readline_name to Guile,
to allow conditionals in .inputrc.
1999-11-18 22:36:28 +00:00
|
|
|
|
volatile double u = SCM_REALPART (num);
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
res = u;
|
* configure.in: check for hstrerror.
* socket.c (scm_htons, scm_ntohs, scm_htonl, scm_ntohl): new
functions for network data conversion.
* numbers.c (scm_num2long, scm_num2longlong):
throw out-of-range instead of wrong-type-arg if appropriate.
(scm_iint2str): handle -2^31 correctly.
(scm_num2long): handle -2^31 bignum correctly.
(scm_num2long_long): rewrite the bigdig case: basically copied
from scm_num2long.
numbers.h: (SCM_BITSPERLONGLONG): deleted.
* unif.c (rapr1): use sprintf instead of intprint for unsigned
longs: intprint can't cope with large values.
* numbers.c (scm_num2ulong): check more consistently that the
input is not negative. if it is, throw out-of-range instead of
wrong-type-arg.
* ramap.c (scm_array_fill_int): don't limit fill to INUM for
uvect, ivect or llvect.
Check that fill doesn't overflow short uniform array.
* __scm.h: add another long to the definition of long_long and
ulong_long.
* unif.c (scm_raprin1): use 'l' instead of "long_long" in the
print representation of llvect. read can't handle more than
one character.
(scm_dimensions_to_uniform_array): make "fill" an optional argument
instead of a rest argument.
* tags.h (scm_tc7_llvect): wasn't defined anywhere, so use the free
tag 29 for now.
* __scm.h: don't mention LONGLONGS.
* unif.c, numbers.c, eq.c, gc.c, print.c, eval.c, ramap.c:
replace LONGLONGS with HAVE_LONG_LONGS as set by configure.
* net_db.c (scm_inet_aton): throw errors using the misc-error key
instead of system-error. inet_aton doesn't set errno.
system-error isn't right in gethost either, since it's throwing
the value of h_errno instead of errno. so:
(scm_host_not_found_key, scm_try_again_key,
scm_no_recovery_key, scm_no_data_key): new error keys.
(scm_resolv_error): new procedure, use the new keys.
(scm_gethost): call scm_resolv_error not scm_syserror_msg.
* error.c: (various): use scm_cons instead of scm_listify
to build short lists.
* boot-9.scm (read-hash-extend to set up arrays): add 'l' for
long_long uniform vectors.
* networking.scm (sethostent, setnetent, setprotoent, setservent):
take an optional argument STAYOPEN. default is #f.
* readline.c (scm_init_readline): set rl_readline_name to Guile,
to allow conditionals in .inputrc.
1999-11-18 22:36:28 +00:00
|
|
|
|
if (res != u)
|
|
|
|
|
|
goto out_of_range;
|
|
|
|
|
|
return res;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_BIGP (num))
|
|
|
|
|
|
{
|
* configure.in: check for hstrerror.
* socket.c (scm_htons, scm_ntohs, scm_htonl, scm_ntohl): new
functions for network data conversion.
* numbers.c (scm_num2long, scm_num2longlong):
throw out-of-range instead of wrong-type-arg if appropriate.
(scm_iint2str): handle -2^31 correctly.
(scm_num2long): handle -2^31 bignum correctly.
(scm_num2long_long): rewrite the bigdig case: basically copied
from scm_num2long.
numbers.h: (SCM_BITSPERLONGLONG): deleted.
* unif.c (rapr1): use sprintf instead of intprint for unsigned
longs: intprint can't cope with large values.
* numbers.c (scm_num2ulong): check more consistently that the
input is not negative. if it is, throw out-of-range instead of
wrong-type-arg.
* ramap.c (scm_array_fill_int): don't limit fill to INUM for
uvect, ivect or llvect.
Check that fill doesn't overflow short uniform array.
* __scm.h: add another long to the definition of long_long and
ulong_long.
* unif.c (scm_raprin1): use 'l' instead of "long_long" in the
print representation of llvect. read can't handle more than
one character.
(scm_dimensions_to_uniform_array): make "fill" an optional argument
instead of a rest argument.
* tags.h (scm_tc7_llvect): wasn't defined anywhere, so use the free
tag 29 for now.
* __scm.h: don't mention LONGLONGS.
* unif.c, numbers.c, eq.c, gc.c, print.c, eval.c, ramap.c:
replace LONGLONGS with HAVE_LONG_LONGS as set by configure.
* net_db.c (scm_inet_aton): throw errors using the misc-error key
instead of system-error. inet_aton doesn't set errno.
system-error isn't right in gethost either, since it's throwing
the value of h_errno instead of errno. so:
(scm_host_not_found_key, scm_try_again_key,
scm_no_recovery_key, scm_no_data_key): new error keys.
(scm_resolv_error): new procedure, use the new keys.
(scm_gethost): call scm_resolv_error not scm_syserror_msg.
* error.c: (various): use scm_cons instead of scm_listify
to build short lists.
* boot-9.scm (read-hash-extend to set up arrays): add 'l' for
long_long uniform vectors.
* networking.scm (sethostent, setnetent, setprotoent, setservent):
take an optional argument STAYOPEN. default is #f.
* readline.c (scm_init_readline): set rl_readline_name to Guile,
to allow conditionals in .inputrc.
1999-11-18 22:36:28 +00:00
|
|
|
|
unsigned long oldres = 0;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
scm_sizet l;
|
* configure.in: check for hstrerror.
* socket.c (scm_htons, scm_ntohs, scm_htonl, scm_ntohl): new
functions for network data conversion.
* numbers.c (scm_num2long, scm_num2longlong):
throw out-of-range instead of wrong-type-arg if appropriate.
(scm_iint2str): handle -2^31 correctly.
(scm_num2long): handle -2^31 bignum correctly.
(scm_num2long_long): rewrite the bigdig case: basically copied
from scm_num2long.
numbers.h: (SCM_BITSPERLONGLONG): deleted.
* unif.c (rapr1): use sprintf instead of intprint for unsigned
longs: intprint can't cope with large values.
* numbers.c (scm_num2ulong): check more consistently that the
input is not negative. if it is, throw out-of-range instead of
wrong-type-arg.
* ramap.c (scm_array_fill_int): don't limit fill to INUM for
uvect, ivect or llvect.
Check that fill doesn't overflow short uniform array.
* __scm.h: add another long to the definition of long_long and
ulong_long.
* unif.c (scm_raprin1): use 'l' instead of "long_long" in the
print representation of llvect. read can't handle more than
one character.
(scm_dimensions_to_uniform_array): make "fill" an optional argument
instead of a rest argument.
* tags.h (scm_tc7_llvect): wasn't defined anywhere, so use the free
tag 29 for now.
* __scm.h: don't mention LONGLONGS.
* unif.c, numbers.c, eq.c, gc.c, print.c, eval.c, ramap.c:
replace LONGLONGS with HAVE_LONG_LONGS as set by configure.
* net_db.c (scm_inet_aton): throw errors using the misc-error key
instead of system-error. inet_aton doesn't set errno.
system-error isn't right in gethost either, since it's throwing
the value of h_errno instead of errno. so:
(scm_host_not_found_key, scm_try_again_key,
scm_no_recovery_key, scm_no_data_key): new error keys.
(scm_resolv_error): new procedure, use the new keys.
(scm_gethost): call scm_resolv_error not scm_syserror_msg.
* error.c: (various): use scm_cons instead of scm_listify
to build short lists.
* boot-9.scm (read-hash-extend to set up arrays): add 'l' for
long_long uniform vectors.
* networking.scm (sethostent, setnetent, setprotoent, setservent):
take an optional argument STAYOPEN. default is #f.
* readline.c (scm_init_readline): set rl_readline_name to Guile,
to allow conditionals in .inputrc.
1999-11-18 22:36:28 +00:00
|
|
|
|
/* can't use res directly in case num is -2^31. */
|
|
|
|
|
|
unsigned long pos_res = 0;
|
|
|
|
|
|
|
1999-01-10 07:38:39 +00:00
|
|
|
|
for (l = SCM_NUMDIGS (num); l--;)
|
|
|
|
|
|
{
|
* configure.in: check for hstrerror.
* socket.c (scm_htons, scm_ntohs, scm_htonl, scm_ntohl): new
functions for network data conversion.
* numbers.c (scm_num2long, scm_num2longlong):
throw out-of-range instead of wrong-type-arg if appropriate.
(scm_iint2str): handle -2^31 correctly.
(scm_num2long): handle -2^31 bignum correctly.
(scm_num2long_long): rewrite the bigdig case: basically copied
from scm_num2long.
numbers.h: (SCM_BITSPERLONGLONG): deleted.
* unif.c (rapr1): use sprintf instead of intprint for unsigned
longs: intprint can't cope with large values.
* numbers.c (scm_num2ulong): check more consistently that the
input is not negative. if it is, throw out-of-range instead of
wrong-type-arg.
* ramap.c (scm_array_fill_int): don't limit fill to INUM for
uvect, ivect or llvect.
Check that fill doesn't overflow short uniform array.
* __scm.h: add another long to the definition of long_long and
ulong_long.
* unif.c (scm_raprin1): use 'l' instead of "long_long" in the
print representation of llvect. read can't handle more than
one character.
(scm_dimensions_to_uniform_array): make "fill" an optional argument
instead of a rest argument.
* tags.h (scm_tc7_llvect): wasn't defined anywhere, so use the free
tag 29 for now.
* __scm.h: don't mention LONGLONGS.
* unif.c, numbers.c, eq.c, gc.c, print.c, eval.c, ramap.c:
replace LONGLONGS with HAVE_LONG_LONGS as set by configure.
* net_db.c (scm_inet_aton): throw errors using the misc-error key
instead of system-error. inet_aton doesn't set errno.
system-error isn't right in gethost either, since it's throwing
the value of h_errno instead of errno. so:
(scm_host_not_found_key, scm_try_again_key,
scm_no_recovery_key, scm_no_data_key): new error keys.
(scm_resolv_error): new procedure, use the new keys.
(scm_gethost): call scm_resolv_error not scm_syserror_msg.
* error.c: (various): use scm_cons instead of scm_listify
to build short lists.
* boot-9.scm (read-hash-extend to set up arrays): add 'l' for
long_long uniform vectors.
* networking.scm (sethostent, setnetent, setprotoent, setservent):
take an optional argument STAYOPEN. default is #f.
* readline.c (scm_init_readline): set rl_readline_name to Guile,
to allow conditionals in .inputrc.
1999-11-18 22:36:28 +00:00
|
|
|
|
pos_res = SCM_BIGUP (pos_res) + SCM_BDIGITS (num)[l];
|
|
|
|
|
|
/* check for overflow. */
|
|
|
|
|
|
if (pos_res < oldres)
|
|
|
|
|
|
goto out_of_range;
|
|
|
|
|
|
oldres = pos_res;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
if (SCM_TYP16 (num) == scm_tc16_bigpos)
|
* configure.in: check for hstrerror.
* socket.c (scm_htons, scm_ntohs, scm_htonl, scm_ntohl): new
functions for network data conversion.
* numbers.c (scm_num2long, scm_num2longlong):
throw out-of-range instead of wrong-type-arg if appropriate.
(scm_iint2str): handle -2^31 correctly.
(scm_num2long): handle -2^31 bignum correctly.
(scm_num2long_long): rewrite the bigdig case: basically copied
from scm_num2long.
numbers.h: (SCM_BITSPERLONGLONG): deleted.
* unif.c (rapr1): use sprintf instead of intprint for unsigned
longs: intprint can't cope with large values.
* numbers.c (scm_num2ulong): check more consistently that the
input is not negative. if it is, throw out-of-range instead of
wrong-type-arg.
* ramap.c (scm_array_fill_int): don't limit fill to INUM for
uvect, ivect or llvect.
Check that fill doesn't overflow short uniform array.
* __scm.h: add another long to the definition of long_long and
ulong_long.
* unif.c (scm_raprin1): use 'l' instead of "long_long" in the
print representation of llvect. read can't handle more than
one character.
(scm_dimensions_to_uniform_array): make "fill" an optional argument
instead of a rest argument.
* tags.h (scm_tc7_llvect): wasn't defined anywhere, so use the free
tag 29 for now.
* __scm.h: don't mention LONGLONGS.
* unif.c, numbers.c, eq.c, gc.c, print.c, eval.c, ramap.c:
replace LONGLONGS with HAVE_LONG_LONGS as set by configure.
* net_db.c (scm_inet_aton): throw errors using the misc-error key
instead of system-error. inet_aton doesn't set errno.
system-error isn't right in gethost either, since it's throwing
the value of h_errno instead of errno. so:
(scm_host_not_found_key, scm_try_again_key,
scm_no_recovery_key, scm_no_data_key): new error keys.
(scm_resolv_error): new procedure, use the new keys.
(scm_gethost): call scm_resolv_error not scm_syserror_msg.
* error.c: (various): use scm_cons instead of scm_listify
to build short lists.
* boot-9.scm (read-hash-extend to set up arrays): add 'l' for
long_long uniform vectors.
* networking.scm (sethostent, setnetent, setprotoent, setservent):
take an optional argument STAYOPEN. default is #f.
* readline.c (scm_init_readline): set rl_readline_name to Guile,
to allow conditionals in .inputrc.
1999-11-18 22:36:28 +00:00
|
|
|
|
{
|
|
|
|
|
|
res = pos_res;
|
|
|
|
|
|
if (res < 0)
|
|
|
|
|
|
goto out_of_range;
|
|
|
|
|
|
}
|
1999-01-10 07:38:39 +00:00
|
|
|
|
else
|
* configure.in: check for hstrerror.
* socket.c (scm_htons, scm_ntohs, scm_htonl, scm_ntohl): new
functions for network data conversion.
* numbers.c (scm_num2long, scm_num2longlong):
throw out-of-range instead of wrong-type-arg if appropriate.
(scm_iint2str): handle -2^31 correctly.
(scm_num2long): handle -2^31 bignum correctly.
(scm_num2long_long): rewrite the bigdig case: basically copied
from scm_num2long.
numbers.h: (SCM_BITSPERLONGLONG): deleted.
* unif.c (rapr1): use sprintf instead of intprint for unsigned
longs: intprint can't cope with large values.
* numbers.c (scm_num2ulong): check more consistently that the
input is not negative. if it is, throw out-of-range instead of
wrong-type-arg.
* ramap.c (scm_array_fill_int): don't limit fill to INUM for
uvect, ivect or llvect.
Check that fill doesn't overflow short uniform array.
* __scm.h: add another long to the definition of long_long and
ulong_long.
* unif.c (scm_raprin1): use 'l' instead of "long_long" in the
print representation of llvect. read can't handle more than
one character.
(scm_dimensions_to_uniform_array): make "fill" an optional argument
instead of a rest argument.
* tags.h (scm_tc7_llvect): wasn't defined anywhere, so use the free
tag 29 for now.
* __scm.h: don't mention LONGLONGS.
* unif.c, numbers.c, eq.c, gc.c, print.c, eval.c, ramap.c:
replace LONGLONGS with HAVE_LONG_LONGS as set by configure.
* net_db.c (scm_inet_aton): throw errors using the misc-error key
instead of system-error. inet_aton doesn't set errno.
system-error isn't right in gethost either, since it's throwing
the value of h_errno instead of errno. so:
(scm_host_not_found_key, scm_try_again_key,
scm_no_recovery_key, scm_no_data_key): new error keys.
(scm_resolv_error): new procedure, use the new keys.
(scm_gethost): call scm_resolv_error not scm_syserror_msg.
* error.c: (various): use scm_cons instead of scm_listify
to build short lists.
* boot-9.scm (read-hash-extend to set up arrays): add 'l' for
long_long uniform vectors.
* networking.scm (sethostent, setnetent, setprotoent, setservent):
take an optional argument STAYOPEN. default is #f.
* readline.c (scm_init_readline): set rl_readline_name to Guile,
to allow conditionals in .inputrc.
1999-11-18 22:36:28 +00:00
|
|
|
|
{
|
|
|
|
|
|
res = -pos_res;
|
|
|
|
|
|
if (res > 0)
|
|
|
|
|
|
goto out_of_range;
|
|
|
|
|
|
}
|
|
|
|
|
|
return res;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
* configure.in: check for hstrerror.
* socket.c (scm_htons, scm_ntohs, scm_htonl, scm_ntohl): new
functions for network data conversion.
* numbers.c (scm_num2long, scm_num2longlong):
throw out-of-range instead of wrong-type-arg if appropriate.
(scm_iint2str): handle -2^31 correctly.
(scm_num2long): handle -2^31 bignum correctly.
(scm_num2long_long): rewrite the bigdig case: basically copied
from scm_num2long.
numbers.h: (SCM_BITSPERLONGLONG): deleted.
* unif.c (rapr1): use sprintf instead of intprint for unsigned
longs: intprint can't cope with large values.
* numbers.c (scm_num2ulong): check more consistently that the
input is not negative. if it is, throw out-of-range instead of
wrong-type-arg.
* ramap.c (scm_array_fill_int): don't limit fill to INUM for
uvect, ivect or llvect.
Check that fill doesn't overflow short uniform array.
* __scm.h: add another long to the definition of long_long and
ulong_long.
* unif.c (scm_raprin1): use 'l' instead of "long_long" in the
print representation of llvect. read can't handle more than
one character.
(scm_dimensions_to_uniform_array): make "fill" an optional argument
instead of a rest argument.
* tags.h (scm_tc7_llvect): wasn't defined anywhere, so use the free
tag 29 for now.
* __scm.h: don't mention LONGLONGS.
* unif.c, numbers.c, eq.c, gc.c, print.c, eval.c, ramap.c:
replace LONGLONGS with HAVE_LONG_LONGS as set by configure.
* net_db.c (scm_inet_aton): throw errors using the misc-error key
instead of system-error. inet_aton doesn't set errno.
system-error isn't right in gethost either, since it's throwing
the value of h_errno instead of errno. so:
(scm_host_not_found_key, scm_try_again_key,
scm_no_recovery_key, scm_no_data_key): new error keys.
(scm_resolv_error): new procedure, use the new keys.
(scm_gethost): call scm_resolv_error not scm_syserror_msg.
* error.c: (various): use scm_cons instead of scm_listify
to build short lists.
* boot-9.scm (read-hash-extend to set up arrays): add 'l' for
long_long uniform vectors.
* networking.scm (sethostent, setnetent, setprotoent, setservent):
take an optional argument STAYOPEN. default is #f.
* readline.c (scm_init_readline): set rl_readline_name to Guile,
to allow conditionals in .inputrc.
1999-11-18 22:36:28 +00:00
|
|
|
|
wrong_type_arg:
|
|
|
|
|
|
scm_wrong_type_arg (s_caller, (int) pos, num);
|
|
|
|
|
|
out_of_range:
|
|
|
|
|
|
scm_out_of_range (s_caller, num);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* configure.in: check for hstrerror.
* socket.c (scm_htons, scm_ntohs, scm_htonl, scm_ntohl): new
functions for network data conversion.
* numbers.c (scm_num2long, scm_num2longlong):
throw out-of-range instead of wrong-type-arg if appropriate.
(scm_iint2str): handle -2^31 correctly.
(scm_num2long): handle -2^31 bignum correctly.
(scm_num2long_long): rewrite the bigdig case: basically copied
from scm_num2long.
numbers.h: (SCM_BITSPERLONGLONG): deleted.
* unif.c (rapr1): use sprintf instead of intprint for unsigned
longs: intprint can't cope with large values.
* numbers.c (scm_num2ulong): check more consistently that the
input is not negative. if it is, throw out-of-range instead of
wrong-type-arg.
* ramap.c (scm_array_fill_int): don't limit fill to INUM for
uvect, ivect or llvect.
Check that fill doesn't overflow short uniform array.
* __scm.h: add another long to the definition of long_long and
ulong_long.
* unif.c (scm_raprin1): use 'l' instead of "long_long" in the
print representation of llvect. read can't handle more than
one character.
(scm_dimensions_to_uniform_array): make "fill" an optional argument
instead of a rest argument.
* tags.h (scm_tc7_llvect): wasn't defined anywhere, so use the free
tag 29 for now.
* __scm.h: don't mention LONGLONGS.
* unif.c, numbers.c, eq.c, gc.c, print.c, eval.c, ramap.c:
replace LONGLONGS with HAVE_LONG_LONGS as set by configure.
* net_db.c (scm_inet_aton): throw errors using the misc-error key
instead of system-error. inet_aton doesn't set errno.
system-error isn't right in gethost either, since it's throwing
the value of h_errno instead of errno. so:
(scm_host_not_found_key, scm_try_again_key,
scm_no_recovery_key, scm_no_data_key): new error keys.
(scm_resolv_error): new procedure, use the new keys.
(scm_gethost): call scm_resolv_error not scm_syserror_msg.
* error.c: (various): use scm_cons instead of scm_listify
to build short lists.
* boot-9.scm (read-hash-extend to set up arrays): add 'l' for
long_long uniform vectors.
* networking.scm (sethostent, setnetent, setprotoent, setservent):
take an optional argument STAYOPEN. default is #f.
* readline.c (scm_init_readline): set rl_readline_name to Guile,
to allow conditionals in .inputrc.
1999-11-18 22:36:28 +00:00
|
|
|
|
#ifdef HAVE_LONG_LONGS
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
long_long
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_num2long_long (SCM num, char *pos, const char *s_caller)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
long_long res;
|
* configure.in: check for hstrerror.
* socket.c (scm_htons, scm_ntohs, scm_htonl, scm_ntohl): new
functions for network data conversion.
* numbers.c (scm_num2long, scm_num2longlong):
throw out-of-range instead of wrong-type-arg if appropriate.
(scm_iint2str): handle -2^31 correctly.
(scm_num2long): handle -2^31 bignum correctly.
(scm_num2long_long): rewrite the bigdig case: basically copied
from scm_num2long.
numbers.h: (SCM_BITSPERLONGLONG): deleted.
* unif.c (rapr1): use sprintf instead of intprint for unsigned
longs: intprint can't cope with large values.
* numbers.c (scm_num2ulong): check more consistently that the
input is not negative. if it is, throw out-of-range instead of
wrong-type-arg.
* ramap.c (scm_array_fill_int): don't limit fill to INUM for
uvect, ivect or llvect.
Check that fill doesn't overflow short uniform array.
* __scm.h: add another long to the definition of long_long and
ulong_long.
* unif.c (scm_raprin1): use 'l' instead of "long_long" in the
print representation of llvect. read can't handle more than
one character.
(scm_dimensions_to_uniform_array): make "fill" an optional argument
instead of a rest argument.
* tags.h (scm_tc7_llvect): wasn't defined anywhere, so use the free
tag 29 for now.
* __scm.h: don't mention LONGLONGS.
* unif.c, numbers.c, eq.c, gc.c, print.c, eval.c, ramap.c:
replace LONGLONGS with HAVE_LONG_LONGS as set by configure.
* net_db.c (scm_inet_aton): throw errors using the misc-error key
instead of system-error. inet_aton doesn't set errno.
system-error isn't right in gethost either, since it's throwing
the value of h_errno instead of errno. so:
(scm_host_not_found_key, scm_try_again_key,
scm_no_recovery_key, scm_no_data_key): new error keys.
(scm_resolv_error): new procedure, use the new keys.
(scm_gethost): call scm_resolv_error not scm_syserror_msg.
* error.c: (various): use scm_cons instead of scm_listify
to build short lists.
* boot-9.scm (read-hash-extend to set up arrays): add 'l' for
long_long uniform vectors.
* networking.scm (sethostent, setnetent, setprotoent, setservent):
take an optional argument STAYOPEN. default is #f.
* readline.c (scm_init_readline): set rl_readline_name to Guile,
to allow conditionals in .inputrc.
1999-11-18 22:36:28 +00:00
|
|
|
|
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_INUMP (num))
|
|
|
|
|
|
{
|
* configure.in: check for hstrerror.
* socket.c (scm_htons, scm_ntohs, scm_htonl, scm_ntohl): new
functions for network data conversion.
* numbers.c (scm_num2long, scm_num2longlong):
throw out-of-range instead of wrong-type-arg if appropriate.
(scm_iint2str): handle -2^31 correctly.
(scm_num2long): handle -2^31 bignum correctly.
(scm_num2long_long): rewrite the bigdig case: basically copied
from scm_num2long.
numbers.h: (SCM_BITSPERLONGLONG): deleted.
* unif.c (rapr1): use sprintf instead of intprint for unsigned
longs: intprint can't cope with large values.
* numbers.c (scm_num2ulong): check more consistently that the
input is not negative. if it is, throw out-of-range instead of
wrong-type-arg.
* ramap.c (scm_array_fill_int): don't limit fill to INUM for
uvect, ivect or llvect.
Check that fill doesn't overflow short uniform array.
* __scm.h: add another long to the definition of long_long and
ulong_long.
* unif.c (scm_raprin1): use 'l' instead of "long_long" in the
print representation of llvect. read can't handle more than
one character.
(scm_dimensions_to_uniform_array): make "fill" an optional argument
instead of a rest argument.
* tags.h (scm_tc7_llvect): wasn't defined anywhere, so use the free
tag 29 for now.
* __scm.h: don't mention LONGLONGS.
* unif.c, numbers.c, eq.c, gc.c, print.c, eval.c, ramap.c:
replace LONGLONGS with HAVE_LONG_LONGS as set by configure.
* net_db.c (scm_inet_aton): throw errors using the misc-error key
instead of system-error. inet_aton doesn't set errno.
system-error isn't right in gethost either, since it's throwing
the value of h_errno instead of errno. so:
(scm_host_not_found_key, scm_try_again_key,
scm_no_recovery_key, scm_no_data_key): new error keys.
(scm_resolv_error): new procedure, use the new keys.
(scm_gethost): call scm_resolv_error not scm_syserror_msg.
* error.c: (various): use scm_cons instead of scm_listify
to build short lists.
* boot-9.scm (read-hash-extend to set up arrays): add 'l' for
long_long uniform vectors.
* networking.scm (sethostent, setnetent, setprotoent, setservent):
take an optional argument STAYOPEN. default is #f.
* readline.c (scm_init_readline): set rl_readline_name to Guile,
to allow conditionals in .inputrc.
1999-11-18 22:36:28 +00:00
|
|
|
|
res = SCM_INUM (num);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return res;
|
|
|
|
|
|
}
|
* configure.in: check for hstrerror.
* socket.c (scm_htons, scm_ntohs, scm_htonl, scm_ntohl): new
functions for network data conversion.
* numbers.c (scm_num2long, scm_num2longlong):
throw out-of-range instead of wrong-type-arg if appropriate.
(scm_iint2str): handle -2^31 correctly.
(scm_num2long): handle -2^31 bignum correctly.
(scm_num2long_long): rewrite the bigdig case: basically copied
from scm_num2long.
numbers.h: (SCM_BITSPERLONGLONG): deleted.
* unif.c (rapr1): use sprintf instead of intprint for unsigned
longs: intprint can't cope with large values.
* numbers.c (scm_num2ulong): check more consistently that the
input is not negative. if it is, throw out-of-range instead of
wrong-type-arg.
* ramap.c (scm_array_fill_int): don't limit fill to INUM for
uvect, ivect or llvect.
Check that fill doesn't overflow short uniform array.
* __scm.h: add another long to the definition of long_long and
ulong_long.
* unif.c (scm_raprin1): use 'l' instead of "long_long" in the
print representation of llvect. read can't handle more than
one character.
(scm_dimensions_to_uniform_array): make "fill" an optional argument
instead of a rest argument.
* tags.h (scm_tc7_llvect): wasn't defined anywhere, so use the free
tag 29 for now.
* __scm.h: don't mention LONGLONGS.
* unif.c, numbers.c, eq.c, gc.c, print.c, eval.c, ramap.c:
replace LONGLONGS with HAVE_LONG_LONGS as set by configure.
* net_db.c (scm_inet_aton): throw errors using the misc-error key
instead of system-error. inet_aton doesn't set errno.
system-error isn't right in gethost either, since it's throwing
the value of h_errno instead of errno. so:
(scm_host_not_found_key, scm_try_again_key,
scm_no_recovery_key, scm_no_data_key): new error keys.
(scm_resolv_error): new procedure, use the new keys.
(scm_gethost): call scm_resolv_error not scm_syserror_msg.
* error.c: (various): use scm_cons instead of scm_listify
to build short lists.
* boot-9.scm (read-hash-extend to set up arrays): add 'l' for
long_long uniform vectors.
* networking.scm (sethostent, setnetent, setprotoent, setservent):
take an optional argument STAYOPEN. default is #f.
* readline.c (scm_init_readline): set rl_readline_name to Guile,
to allow conditionals in .inputrc.
1999-11-18 22:36:28 +00:00
|
|
|
|
SCM_ASRTGO (SCM_NIMP (num), wrong_type_arg);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#ifdef SCM_FLOATS
|
|
|
|
|
|
if (SCM_REALP (num))
|
|
|
|
|
|
{
|
|
|
|
|
|
double u = SCM_REALPART (num);
|
* configure.in: check for hstrerror.
* socket.c (scm_htons, scm_ntohs, scm_htonl, scm_ntohl): new
functions for network data conversion.
* numbers.c (scm_num2long, scm_num2longlong):
throw out-of-range instead of wrong-type-arg if appropriate.
(scm_iint2str): handle -2^31 correctly.
(scm_num2long): handle -2^31 bignum correctly.
(scm_num2long_long): rewrite the bigdig case: basically copied
from scm_num2long.
numbers.h: (SCM_BITSPERLONGLONG): deleted.
* unif.c (rapr1): use sprintf instead of intprint for unsigned
longs: intprint can't cope with large values.
* numbers.c (scm_num2ulong): check more consistently that the
input is not negative. if it is, throw out-of-range instead of
wrong-type-arg.
* ramap.c (scm_array_fill_int): don't limit fill to INUM for
uvect, ivect or llvect.
Check that fill doesn't overflow short uniform array.
* __scm.h: add another long to the definition of long_long and
ulong_long.
* unif.c (scm_raprin1): use 'l' instead of "long_long" in the
print representation of llvect. read can't handle more than
one character.
(scm_dimensions_to_uniform_array): make "fill" an optional argument
instead of a rest argument.
* tags.h (scm_tc7_llvect): wasn't defined anywhere, so use the free
tag 29 for now.
* __scm.h: don't mention LONGLONGS.
* unif.c, numbers.c, eq.c, gc.c, print.c, eval.c, ramap.c:
replace LONGLONGS with HAVE_LONG_LONGS as set by configure.
* net_db.c (scm_inet_aton): throw errors using the misc-error key
instead of system-error. inet_aton doesn't set errno.
system-error isn't right in gethost either, since it's throwing
the value of h_errno instead of errno. so:
(scm_host_not_found_key, scm_try_again_key,
scm_no_recovery_key, scm_no_data_key): new error keys.
(scm_resolv_error): new procedure, use the new keys.
(scm_gethost): call scm_resolv_error not scm_syserror_msg.
* error.c: (various): use scm_cons instead of scm_listify
to build short lists.
* boot-9.scm (read-hash-extend to set up arrays): add 'l' for
long_long uniform vectors.
* networking.scm (sethostent, setnetent, setprotoent, setservent):
take an optional argument STAYOPEN. default is #f.
* readline.c (scm_init_readline): set rl_readline_name to Guile,
to allow conditionals in .inputrc.
1999-11-18 22:36:28 +00:00
|
|
|
|
|
|
|
|
|
|
res = u;
|
|
|
|
|
|
if ((res < 0 && u > 0) || (res > 0 && u < 0)) /* check for overflow. */
|
|
|
|
|
|
goto out_of_range;
|
|
|
|
|
|
|
|
|
|
|
|
return res;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_BIGP (num))
|
|
|
|
|
|
{
|
* configure.in: check for hstrerror.
* socket.c (scm_htons, scm_ntohs, scm_htonl, scm_ntohl): new
functions for network data conversion.
* numbers.c (scm_num2long, scm_num2longlong):
throw out-of-range instead of wrong-type-arg if appropriate.
(scm_iint2str): handle -2^31 correctly.
(scm_num2long): handle -2^31 bignum correctly.
(scm_num2long_long): rewrite the bigdig case: basically copied
from scm_num2long.
numbers.h: (SCM_BITSPERLONGLONG): deleted.
* unif.c (rapr1): use sprintf instead of intprint for unsigned
longs: intprint can't cope with large values.
* numbers.c (scm_num2ulong): check more consistently that the
input is not negative. if it is, throw out-of-range instead of
wrong-type-arg.
* ramap.c (scm_array_fill_int): don't limit fill to INUM for
uvect, ivect or llvect.
Check that fill doesn't overflow short uniform array.
* __scm.h: add another long to the definition of long_long and
ulong_long.
* unif.c (scm_raprin1): use 'l' instead of "long_long" in the
print representation of llvect. read can't handle more than
one character.
(scm_dimensions_to_uniform_array): make "fill" an optional argument
instead of a rest argument.
* tags.h (scm_tc7_llvect): wasn't defined anywhere, so use the free
tag 29 for now.
* __scm.h: don't mention LONGLONGS.
* unif.c, numbers.c, eq.c, gc.c, print.c, eval.c, ramap.c:
replace LONGLONGS with HAVE_LONG_LONGS as set by configure.
* net_db.c (scm_inet_aton): throw errors using the misc-error key
instead of system-error. inet_aton doesn't set errno.
system-error isn't right in gethost either, since it's throwing
the value of h_errno instead of errno. so:
(scm_host_not_found_key, scm_try_again_key,
scm_no_recovery_key, scm_no_data_key): new error keys.
(scm_resolv_error): new procedure, use the new keys.
(scm_gethost): call scm_resolv_error not scm_syserror_msg.
* error.c: (various): use scm_cons instead of scm_listify
to build short lists.
* boot-9.scm (read-hash-extend to set up arrays): add 'l' for
long_long uniform vectors.
* networking.scm (sethostent, setnetent, setprotoent, setservent):
take an optional argument STAYOPEN. default is #f.
* readline.c (scm_init_readline): set rl_readline_name to Guile,
to allow conditionals in .inputrc.
1999-11-18 22:36:28 +00:00
|
|
|
|
unsigned long long oldres = 0;
|
|
|
|
|
|
scm_sizet l;
|
|
|
|
|
|
/* can't use res directly in case num is -2^63. */
|
|
|
|
|
|
unsigned long long pos_res = 0;
|
|
|
|
|
|
|
|
|
|
|
|
for (l = SCM_NUMDIGS (num); l--;)
|
|
|
|
|
|
{
|
|
|
|
|
|
pos_res = SCM_LONGLONGBIGUP (pos_res) + SCM_BDIGITS (num)[l];
|
|
|
|
|
|
/* check for overflow. */
|
|
|
|
|
|
if (pos_res < oldres)
|
|
|
|
|
|
goto out_of_range;
|
|
|
|
|
|
oldres = pos_res;
|
|
|
|
|
|
}
|
|
|
|
|
|
if (SCM_TYP16 (num) == scm_tc16_bigpos)
|
|
|
|
|
|
{
|
|
|
|
|
|
res = pos_res;
|
|
|
|
|
|
if (res < 0)
|
|
|
|
|
|
goto out_of_range;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
res = -pos_res;
|
|
|
|
|
|
if (res > 0)
|
|
|
|
|
|
goto out_of_range;
|
|
|
|
|
|
}
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return res;
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
* configure.in: check for hstrerror.
* socket.c (scm_htons, scm_ntohs, scm_htonl, scm_ntohl): new
functions for network data conversion.
* numbers.c (scm_num2long, scm_num2longlong):
throw out-of-range instead of wrong-type-arg if appropriate.
(scm_iint2str): handle -2^31 correctly.
(scm_num2long): handle -2^31 bignum correctly.
(scm_num2long_long): rewrite the bigdig case: basically copied
from scm_num2long.
numbers.h: (SCM_BITSPERLONGLONG): deleted.
* unif.c (rapr1): use sprintf instead of intprint for unsigned
longs: intprint can't cope with large values.
* numbers.c (scm_num2ulong): check more consistently that the
input is not negative. if it is, throw out-of-range instead of
wrong-type-arg.
* ramap.c (scm_array_fill_int): don't limit fill to INUM for
uvect, ivect or llvect.
Check that fill doesn't overflow short uniform array.
* __scm.h: add another long to the definition of long_long and
ulong_long.
* unif.c (scm_raprin1): use 'l' instead of "long_long" in the
print representation of llvect. read can't handle more than
one character.
(scm_dimensions_to_uniform_array): make "fill" an optional argument
instead of a rest argument.
* tags.h (scm_tc7_llvect): wasn't defined anywhere, so use the free
tag 29 for now.
* __scm.h: don't mention LONGLONGS.
* unif.c, numbers.c, eq.c, gc.c, print.c, eval.c, ramap.c:
replace LONGLONGS with HAVE_LONG_LONGS as set by configure.
* net_db.c (scm_inet_aton): throw errors using the misc-error key
instead of system-error. inet_aton doesn't set errno.
system-error isn't right in gethost either, since it's throwing
the value of h_errno instead of errno. so:
(scm_host_not_found_key, scm_try_again_key,
scm_no_recovery_key, scm_no_data_key): new error keys.
(scm_resolv_error): new procedure, use the new keys.
(scm_gethost): call scm_resolv_error not scm_syserror_msg.
* error.c: (various): use scm_cons instead of scm_listify
to build short lists.
* boot-9.scm (read-hash-extend to set up arrays): add 'l' for
long_long uniform vectors.
* networking.scm (sethostent, setnetent, setprotoent, setservent):
take an optional argument STAYOPEN. default is #f.
* readline.c (scm_init_readline): set rl_readline_name to Guile,
to allow conditionals in .inputrc.
1999-11-18 22:36:28 +00:00
|
|
|
|
wrong_type_arg:
|
|
|
|
|
|
scm_wrong_type_arg (s_caller, (int) pos, num);
|
|
|
|
|
|
out_of_range:
|
|
|
|
|
|
scm_out_of_range (s_caller, num);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
unsigned long
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_num2ulong (SCM num, char *pos, const char *s_caller)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
unsigned long res;
|
* configure.in: check for hstrerror.
* socket.c (scm_htons, scm_ntohs, scm_htonl, scm_ntohl): new
functions for network data conversion.
* numbers.c (scm_num2long, scm_num2longlong):
throw out-of-range instead of wrong-type-arg if appropriate.
(scm_iint2str): handle -2^31 correctly.
(scm_num2long): handle -2^31 bignum correctly.
(scm_num2long_long): rewrite the bigdig case: basically copied
from scm_num2long.
numbers.h: (SCM_BITSPERLONGLONG): deleted.
* unif.c (rapr1): use sprintf instead of intprint for unsigned
longs: intprint can't cope with large values.
* numbers.c (scm_num2ulong): check more consistently that the
input is not negative. if it is, throw out-of-range instead of
wrong-type-arg.
* ramap.c (scm_array_fill_int): don't limit fill to INUM for
uvect, ivect or llvect.
Check that fill doesn't overflow short uniform array.
* __scm.h: add another long to the definition of long_long and
ulong_long.
* unif.c (scm_raprin1): use 'l' instead of "long_long" in the
print representation of llvect. read can't handle more than
one character.
(scm_dimensions_to_uniform_array): make "fill" an optional argument
instead of a rest argument.
* tags.h (scm_tc7_llvect): wasn't defined anywhere, so use the free
tag 29 for now.
* __scm.h: don't mention LONGLONGS.
* unif.c, numbers.c, eq.c, gc.c, print.c, eval.c, ramap.c:
replace LONGLONGS with HAVE_LONG_LONGS as set by configure.
* net_db.c (scm_inet_aton): throw errors using the misc-error key
instead of system-error. inet_aton doesn't set errno.
system-error isn't right in gethost either, since it's throwing
the value of h_errno instead of errno. so:
(scm_host_not_found_key, scm_try_again_key,
scm_no_recovery_key, scm_no_data_key): new error keys.
(scm_resolv_error): new procedure, use the new keys.
(scm_gethost): call scm_resolv_error not scm_syserror_msg.
* error.c: (various): use scm_cons instead of scm_listify
to build short lists.
* boot-9.scm (read-hash-extend to set up arrays): add 'l' for
long_long uniform vectors.
* networking.scm (sethostent, setnetent, setprotoent, setservent):
take an optional argument STAYOPEN. default is #f.
* readline.c (scm_init_readline): set rl_readline_name to Guile,
to allow conditionals in .inputrc.
1999-11-18 22:36:28 +00:00
|
|
|
|
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_INUMP (num))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
* configure.in: check for hstrerror.
* socket.c (scm_htons, scm_ntohs, scm_htonl, scm_ntohl): new
functions for network data conversion.
* numbers.c (scm_num2long, scm_num2longlong):
throw out-of-range instead of wrong-type-arg if appropriate.
(scm_iint2str): handle -2^31 correctly.
(scm_num2long): handle -2^31 bignum correctly.
(scm_num2long_long): rewrite the bigdig case: basically copied
from scm_num2long.
numbers.h: (SCM_BITSPERLONGLONG): deleted.
* unif.c (rapr1): use sprintf instead of intprint for unsigned
longs: intprint can't cope with large values.
* numbers.c (scm_num2ulong): check more consistently that the
input is not negative. if it is, throw out-of-range instead of
wrong-type-arg.
* ramap.c (scm_array_fill_int): don't limit fill to INUM for
uvect, ivect or llvect.
Check that fill doesn't overflow short uniform array.
* __scm.h: add another long to the definition of long_long and
ulong_long.
* unif.c (scm_raprin1): use 'l' instead of "long_long" in the
print representation of llvect. read can't handle more than
one character.
(scm_dimensions_to_uniform_array): make "fill" an optional argument
instead of a rest argument.
* tags.h (scm_tc7_llvect): wasn't defined anywhere, so use the free
tag 29 for now.
* __scm.h: don't mention LONGLONGS.
* unif.c, numbers.c, eq.c, gc.c, print.c, eval.c, ramap.c:
replace LONGLONGS with HAVE_LONG_LONGS as set by configure.
* net_db.c (scm_inet_aton): throw errors using the misc-error key
instead of system-error. inet_aton doesn't set errno.
system-error isn't right in gethost either, since it's throwing
the value of h_errno instead of errno. so:
(scm_host_not_found_key, scm_try_again_key,
scm_no_recovery_key, scm_no_data_key): new error keys.
(scm_resolv_error): new procedure, use the new keys.
(scm_gethost): call scm_resolv_error not scm_syserror_msg.
* error.c: (various): use scm_cons instead of scm_listify
to build short lists.
* boot-9.scm (read-hash-extend to set up arrays): add 'l' for
long_long uniform vectors.
* networking.scm (sethostent, setnetent, setprotoent, setservent):
take an optional argument STAYOPEN. default is #f.
* readline.c (scm_init_readline): set rl_readline_name to Guile,
to allow conditionals in .inputrc.
1999-11-18 22:36:28 +00:00
|
|
|
|
if (SCM_INUM (num) < 0)
|
|
|
|
|
|
goto out_of_range;
|
|
|
|
|
|
res = SCM_INUM (num);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return res;
|
|
|
|
|
|
}
|
* configure.in: check for hstrerror.
* socket.c (scm_htons, scm_ntohs, scm_htonl, scm_ntohl): new
functions for network data conversion.
* numbers.c (scm_num2long, scm_num2longlong):
throw out-of-range instead of wrong-type-arg if appropriate.
(scm_iint2str): handle -2^31 correctly.
(scm_num2long): handle -2^31 bignum correctly.
(scm_num2long_long): rewrite the bigdig case: basically copied
from scm_num2long.
numbers.h: (SCM_BITSPERLONGLONG): deleted.
* unif.c (rapr1): use sprintf instead of intprint for unsigned
longs: intprint can't cope with large values.
* numbers.c (scm_num2ulong): check more consistently that the
input is not negative. if it is, throw out-of-range instead of
wrong-type-arg.
* ramap.c (scm_array_fill_int): don't limit fill to INUM for
uvect, ivect or llvect.
Check that fill doesn't overflow short uniform array.
* __scm.h: add another long to the definition of long_long and
ulong_long.
* unif.c (scm_raprin1): use 'l' instead of "long_long" in the
print representation of llvect. read can't handle more than
one character.
(scm_dimensions_to_uniform_array): make "fill" an optional argument
instead of a rest argument.
* tags.h (scm_tc7_llvect): wasn't defined anywhere, so use the free
tag 29 for now.
* __scm.h: don't mention LONGLONGS.
* unif.c, numbers.c, eq.c, gc.c, print.c, eval.c, ramap.c:
replace LONGLONGS with HAVE_LONG_LONGS as set by configure.
* net_db.c (scm_inet_aton): throw errors using the misc-error key
instead of system-error. inet_aton doesn't set errno.
system-error isn't right in gethost either, since it's throwing
the value of h_errno instead of errno. so:
(scm_host_not_found_key, scm_try_again_key,
scm_no_recovery_key, scm_no_data_key): new error keys.
(scm_resolv_error): new procedure, use the new keys.
(scm_gethost): call scm_resolv_error not scm_syserror_msg.
* error.c: (various): use scm_cons instead of scm_listify
to build short lists.
* boot-9.scm (read-hash-extend to set up arrays): add 'l' for
long_long uniform vectors.
* networking.scm (sethostent, setnetent, setprotoent, setservent):
take an optional argument STAYOPEN. default is #f.
* readline.c (scm_init_readline): set rl_readline_name to Guile,
to allow conditionals in .inputrc.
1999-11-18 22:36:28 +00:00
|
|
|
|
SCM_ASRTGO (SCM_NIMP (num), wrong_type_arg);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#ifdef SCM_FLOATS
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_REALP (num))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-01-10 07:38:39 +00:00
|
|
|
|
double u = SCM_REALPART (num);
|
* configure.in: check for hstrerror.
* socket.c (scm_htons, scm_ntohs, scm_htonl, scm_ntohl): new
functions for network data conversion.
* numbers.c (scm_num2long, scm_num2longlong):
throw out-of-range instead of wrong-type-arg if appropriate.
(scm_iint2str): handle -2^31 correctly.
(scm_num2long): handle -2^31 bignum correctly.
(scm_num2long_long): rewrite the bigdig case: basically copied
from scm_num2long.
numbers.h: (SCM_BITSPERLONGLONG): deleted.
* unif.c (rapr1): use sprintf instead of intprint for unsigned
longs: intprint can't cope with large values.
* numbers.c (scm_num2ulong): check more consistently that the
input is not negative. if it is, throw out-of-range instead of
wrong-type-arg.
* ramap.c (scm_array_fill_int): don't limit fill to INUM for
uvect, ivect or llvect.
Check that fill doesn't overflow short uniform array.
* __scm.h: add another long to the definition of long_long and
ulong_long.
* unif.c (scm_raprin1): use 'l' instead of "long_long" in the
print representation of llvect. read can't handle more than
one character.
(scm_dimensions_to_uniform_array): make "fill" an optional argument
instead of a rest argument.
* tags.h (scm_tc7_llvect): wasn't defined anywhere, so use the free
tag 29 for now.
* __scm.h: don't mention LONGLONGS.
* unif.c, numbers.c, eq.c, gc.c, print.c, eval.c, ramap.c:
replace LONGLONGS with HAVE_LONG_LONGS as set by configure.
* net_db.c (scm_inet_aton): throw errors using the misc-error key
instead of system-error. inet_aton doesn't set errno.
system-error isn't right in gethost either, since it's throwing
the value of h_errno instead of errno. so:
(scm_host_not_found_key, scm_try_again_key,
scm_no_recovery_key, scm_no_data_key): new error keys.
(scm_resolv_error): new procedure, use the new keys.
(scm_gethost): call scm_resolv_error not scm_syserror_msg.
* error.c: (various): use scm_cons instead of scm_listify
to build short lists.
* boot-9.scm (read-hash-extend to set up arrays): add 'l' for
long_long uniform vectors.
* networking.scm (sethostent, setnetent, setprotoent, setservent):
take an optional argument STAYOPEN. default is #f.
* readline.c (scm_init_readline): set rl_readline_name to Guile,
to allow conditionals in .inputrc.
1999-11-18 22:36:28 +00:00
|
|
|
|
|
|
|
|
|
|
res = u;
|
|
|
|
|
|
if (res != u)
|
|
|
|
|
|
goto out_of_range;
|
|
|
|
|
|
return res;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (SCM_BIGP (num))
|
|
|
|
|
|
{
|
* configure.in: check for hstrerror.
* socket.c (scm_htons, scm_ntohs, scm_htonl, scm_ntohl): new
functions for network data conversion.
* numbers.c (scm_num2long, scm_num2longlong):
throw out-of-range instead of wrong-type-arg if appropriate.
(scm_iint2str): handle -2^31 correctly.
(scm_num2long): handle -2^31 bignum correctly.
(scm_num2long_long): rewrite the bigdig case: basically copied
from scm_num2long.
numbers.h: (SCM_BITSPERLONGLONG): deleted.
* unif.c (rapr1): use sprintf instead of intprint for unsigned
longs: intprint can't cope with large values.
* numbers.c (scm_num2ulong): check more consistently that the
input is not negative. if it is, throw out-of-range instead of
wrong-type-arg.
* ramap.c (scm_array_fill_int): don't limit fill to INUM for
uvect, ivect or llvect.
Check that fill doesn't overflow short uniform array.
* __scm.h: add another long to the definition of long_long and
ulong_long.
* unif.c (scm_raprin1): use 'l' instead of "long_long" in the
print representation of llvect. read can't handle more than
one character.
(scm_dimensions_to_uniform_array): make "fill" an optional argument
instead of a rest argument.
* tags.h (scm_tc7_llvect): wasn't defined anywhere, so use the free
tag 29 for now.
* __scm.h: don't mention LONGLONGS.
* unif.c, numbers.c, eq.c, gc.c, print.c, eval.c, ramap.c:
replace LONGLONGS with HAVE_LONG_LONGS as set by configure.
* net_db.c (scm_inet_aton): throw errors using the misc-error key
instead of system-error. inet_aton doesn't set errno.
system-error isn't right in gethost either, since it's throwing
the value of h_errno instead of errno. so:
(scm_host_not_found_key, scm_try_again_key,
scm_no_recovery_key, scm_no_data_key): new error keys.
(scm_resolv_error): new procedure, use the new keys.
(scm_gethost): call scm_resolv_error not scm_syserror_msg.
* error.c: (various): use scm_cons instead of scm_listify
to build short lists.
* boot-9.scm (read-hash-extend to set up arrays): add 'l' for
long_long uniform vectors.
* networking.scm (sethostent, setnetent, setprotoent, setservent):
take an optional argument STAYOPEN. default is #f.
* readline.c (scm_init_readline): set rl_readline_name to Guile,
to allow conditionals in .inputrc.
1999-11-18 22:36:28 +00:00
|
|
|
|
unsigned long oldres = 0;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
scm_sizet l;
|
* configure.in: check for hstrerror.
* socket.c (scm_htons, scm_ntohs, scm_htonl, scm_ntohl): new
functions for network data conversion.
* numbers.c (scm_num2long, scm_num2longlong):
throw out-of-range instead of wrong-type-arg if appropriate.
(scm_iint2str): handle -2^31 correctly.
(scm_num2long): handle -2^31 bignum correctly.
(scm_num2long_long): rewrite the bigdig case: basically copied
from scm_num2long.
numbers.h: (SCM_BITSPERLONGLONG): deleted.
* unif.c (rapr1): use sprintf instead of intprint for unsigned
longs: intprint can't cope with large values.
* numbers.c (scm_num2ulong): check more consistently that the
input is not negative. if it is, throw out-of-range instead of
wrong-type-arg.
* ramap.c (scm_array_fill_int): don't limit fill to INUM for
uvect, ivect or llvect.
Check that fill doesn't overflow short uniform array.
* __scm.h: add another long to the definition of long_long and
ulong_long.
* unif.c (scm_raprin1): use 'l' instead of "long_long" in the
print representation of llvect. read can't handle more than
one character.
(scm_dimensions_to_uniform_array): make "fill" an optional argument
instead of a rest argument.
* tags.h (scm_tc7_llvect): wasn't defined anywhere, so use the free
tag 29 for now.
* __scm.h: don't mention LONGLONGS.
* unif.c, numbers.c, eq.c, gc.c, print.c, eval.c, ramap.c:
replace LONGLONGS with HAVE_LONG_LONGS as set by configure.
* net_db.c (scm_inet_aton): throw errors using the misc-error key
instead of system-error. inet_aton doesn't set errno.
system-error isn't right in gethost either, since it's throwing
the value of h_errno instead of errno. so:
(scm_host_not_found_key, scm_try_again_key,
scm_no_recovery_key, scm_no_data_key): new error keys.
(scm_resolv_error): new procedure, use the new keys.
(scm_gethost): call scm_resolv_error not scm_syserror_msg.
* error.c: (various): use scm_cons instead of scm_listify
to build short lists.
* boot-9.scm (read-hash-extend to set up arrays): add 'l' for
long_long uniform vectors.
* networking.scm (sethostent, setnetent, setprotoent, setservent):
take an optional argument STAYOPEN. default is #f.
* readline.c (scm_init_readline): set rl_readline_name to Guile,
to allow conditionals in .inputrc.
1999-11-18 22:36:28 +00:00
|
|
|
|
|
1999-01-10 07:38:39 +00:00
|
|
|
|
res = 0;
|
|
|
|
|
|
for (l = SCM_NUMDIGS (num); l--;)
|
|
|
|
|
|
{
|
|
|
|
|
|
res = SCM_BIGUP (res) + SCM_BDIGITS (num)[l];
|
|
|
|
|
|
if (res < oldres)
|
* configure.in: check for hstrerror.
* socket.c (scm_htons, scm_ntohs, scm_htonl, scm_ntohl): new
functions for network data conversion.
* numbers.c (scm_num2long, scm_num2longlong):
throw out-of-range instead of wrong-type-arg if appropriate.
(scm_iint2str): handle -2^31 correctly.
(scm_num2long): handle -2^31 bignum correctly.
(scm_num2long_long): rewrite the bigdig case: basically copied
from scm_num2long.
numbers.h: (SCM_BITSPERLONGLONG): deleted.
* unif.c (rapr1): use sprintf instead of intprint for unsigned
longs: intprint can't cope with large values.
* numbers.c (scm_num2ulong): check more consistently that the
input is not negative. if it is, throw out-of-range instead of
wrong-type-arg.
* ramap.c (scm_array_fill_int): don't limit fill to INUM for
uvect, ivect or llvect.
Check that fill doesn't overflow short uniform array.
* __scm.h: add another long to the definition of long_long and
ulong_long.
* unif.c (scm_raprin1): use 'l' instead of "long_long" in the
print representation of llvect. read can't handle more than
one character.
(scm_dimensions_to_uniform_array): make "fill" an optional argument
instead of a rest argument.
* tags.h (scm_tc7_llvect): wasn't defined anywhere, so use the free
tag 29 for now.
* __scm.h: don't mention LONGLONGS.
* unif.c, numbers.c, eq.c, gc.c, print.c, eval.c, ramap.c:
replace LONGLONGS with HAVE_LONG_LONGS as set by configure.
* net_db.c (scm_inet_aton): throw errors using the misc-error key
instead of system-error. inet_aton doesn't set errno.
system-error isn't right in gethost either, since it's throwing
the value of h_errno instead of errno. so:
(scm_host_not_found_key, scm_try_again_key,
scm_no_recovery_key, scm_no_data_key): new error keys.
(scm_resolv_error): new procedure, use the new keys.
(scm_gethost): call scm_resolv_error not scm_syserror_msg.
* error.c: (various): use scm_cons instead of scm_listify
to build short lists.
* boot-9.scm (read-hash-extend to set up arrays): add 'l' for
long_long uniform vectors.
* networking.scm (sethostent, setnetent, setprotoent, setservent):
take an optional argument STAYOPEN. default is #f.
* readline.c (scm_init_readline): set rl_readline_name to Guile,
to allow conditionals in .inputrc.
1999-11-18 22:36:28 +00:00
|
|
|
|
goto out_of_range;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
oldres = res;
|
|
|
|
|
|
}
|
|
|
|
|
|
return res;
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
* configure.in: check for hstrerror.
* socket.c (scm_htons, scm_ntohs, scm_htonl, scm_ntohl): new
functions for network data conversion.
* numbers.c (scm_num2long, scm_num2longlong):
throw out-of-range instead of wrong-type-arg if appropriate.
(scm_iint2str): handle -2^31 correctly.
(scm_num2long): handle -2^31 bignum correctly.
(scm_num2long_long): rewrite the bigdig case: basically copied
from scm_num2long.
numbers.h: (SCM_BITSPERLONGLONG): deleted.
* unif.c (rapr1): use sprintf instead of intprint for unsigned
longs: intprint can't cope with large values.
* numbers.c (scm_num2ulong): check more consistently that the
input is not negative. if it is, throw out-of-range instead of
wrong-type-arg.
* ramap.c (scm_array_fill_int): don't limit fill to INUM for
uvect, ivect or llvect.
Check that fill doesn't overflow short uniform array.
* __scm.h: add another long to the definition of long_long and
ulong_long.
* unif.c (scm_raprin1): use 'l' instead of "long_long" in the
print representation of llvect. read can't handle more than
one character.
(scm_dimensions_to_uniform_array): make "fill" an optional argument
instead of a rest argument.
* tags.h (scm_tc7_llvect): wasn't defined anywhere, so use the free
tag 29 for now.
* __scm.h: don't mention LONGLONGS.
* unif.c, numbers.c, eq.c, gc.c, print.c, eval.c, ramap.c:
replace LONGLONGS with HAVE_LONG_LONGS as set by configure.
* net_db.c (scm_inet_aton): throw errors using the misc-error key
instead of system-error. inet_aton doesn't set errno.
system-error isn't right in gethost either, since it's throwing
the value of h_errno instead of errno. so:
(scm_host_not_found_key, scm_try_again_key,
scm_no_recovery_key, scm_no_data_key): new error keys.
(scm_resolv_error): new procedure, use the new keys.
(scm_gethost): call scm_resolv_error not scm_syserror_msg.
* error.c: (various): use scm_cons instead of scm_listify
to build short lists.
* boot-9.scm (read-hash-extend to set up arrays): add 'l' for
long_long uniform vectors.
* networking.scm (sethostent, setnetent, setprotoent, setservent):
take an optional argument STAYOPEN. default is #f.
* readline.c (scm_init_readline): set rl_readline_name to Guile,
to allow conditionals in .inputrc.
1999-11-18 22:36:28 +00:00
|
|
|
|
wrong_type_arg:
|
|
|
|
|
|
scm_wrong_type_arg (s_caller, (int) pos, num);
|
|
|
|
|
|
out_of_range:
|
|
|
|
|
|
scm_out_of_range (s_caller, num);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef SCM_FLOATS
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#ifndef DBL_DIG
|
|
|
|
|
|
static void
|
1999-12-12 20:35:02 +00:00
|
|
|
|
add1 (double f, double *fsum)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
*fsum = f + 1.0;
|
|
|
|
|
|
}
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
* __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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
void
|
|
|
|
|
|
scm_init_numbers ()
|
|
|
|
|
|
{
|
1999-08-31 13:37:28 +00:00
|
|
|
|
scm_add_feature("complex");
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#ifdef SCM_FLOATS
|
1999-05-02 17:22:39 +00:00
|
|
|
|
scm_add_feature("inexact");
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#ifdef SCM_SINGLES
|
1999-07-07 09:44:01 +00:00
|
|
|
|
SCM_NEWSMOB(scm_flo0,scm_tc_flo,NULL);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#else
|
1999-07-07 09:44:01 +00:00
|
|
|
|
SCM_NEWSMOB(scm_flo0,scm_tc_dblr,scm_must_malloc (1L * sizeof (double), "real"));
|
1999-01-10 07:38:39 +00:00
|
|
|
|
SCM_REAL (scm_flo0) = 0.0;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef DBL_DIG
|
1996-07-25 22:56:11 +00:00
|
|
|
|
scm_dblprec = (DBL_DIG > 20) ? 20 : DBL_DIG;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#else
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{ /* determine floating point precision */
|
|
|
|
|
|
double f = 0.1;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
double fsum = 1.0 + f;
|
|
|
|
|
|
while (fsum != 1.0)
|
|
|
|
|
|
{
|
|
|
|
|
|
f /= 10.0;
|
|
|
|
|
|
if (++scm_dblprec > 20)
|
|
|
|
|
|
break;
|
|
|
|
|
|
add1 (f, &fsum);
|
|
|
|
|
|
}
|
|
|
|
|
|
scm_dblprec = scm_dblprec - 1;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif /* DBL_DIG */
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
#include "numbers.x"
|
|
|
|
|
|
}
|