mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 03:40:34 +02:00
* Makefile.am (libguile_la_SOURCES): Removed extchrs.c, mbstrings.c. (modinclude_HEADERS): Removed extchrs.h, mbstrings.h. * unif.c (scm_vector_set_length_x): Don't handle multibyte strings. * tag.c (scm_utag_mb_string, scm_utag_mb_substring): Removed. (scm_tag): Don't handle multibyte strings. * read.c: Don't include mbstrings.h. (scm_lreadr): Don't handle multibyte ports. * kw.c: Don't include mbstrings.h. * init.c: Don't include mbstrings.h. (scm_boot_guile_1): Don't init mbstrings module. * hash.c (scm_hasher): Don't handle mbstrings. * gscm.c (gscm_run_scm): Don't init mbstrings module. * gc.c (scm_gc_mark): Don't handle mbstrings. (scm_gc_sweep): Likewise. * eval.c (SCM_CEVAL): Don't handle mbstrings. * eq.c (scm_equal_p): Use SCM_TYP7S, not SCM_TYP7SD. * tags.h (SCM_TYP7SD): Removed. (SCM_TYP7D): Removed. (scm_tc7_mb_string): Removed. (scm_tc7_mb_substring): Removed. * print.c (scm_iprin1): Handle char printing directly. Don't handle mbstrings. Don't include "mbstrings.h". * symbols.c (scm_intern_obarray_soft, scm_string_to_symbol, scm_string_to_obarray_symbol, msymbolize): Don't set symbol's multi-byte flag. Don't include "mbstrings.h". * symbols.h (SCM_SYMBOL_MULTI_BYTE_STRINGP): Removed. (SCM_SYMBOL_SLOTS): Define as 4. (SCM_ROSTRINGP): Use SCM_TYP7S, not SCM_TYP7SD. * arbiters.c, backtrace.c, debug.c, dynl.c, eval.c, fluids.c, gc.c, gsubr.c, ioext.c, kw.c, mallocs.c, numbers.c, ports.c, print.c, read.c, regex-posix.c, root.c, srcprop.c, stackchk.c, struct.c, threads.c, throw.c, unif.c, variable.c: Use new ("gen"-less) I/O function names. * ports.c (scm_add_to_port_table): Don't set port's representation. * ports.h (scm_port_representation_type): Removed. (scm_string_representation_type): Removed. (struct scm_port_table ): Removed representation field. (SCM_PORT_REPRESENTATION): Removed. (SCM_SET_PORT_REPRESENTATION): Removed. * genio.h: Use new function names. * genio.c: Don't include "extchrs.h". (scm_gen_putc, scm_gen_puts, scm_gen_write, scm_get_getc): Removed. (scm_putc, scm_puts, scm_lfwrite): No longer static. (scm_getc): No longer static; handle line and column changes. (scm_ungetc): Renamed from scm_gen_ungetc. (scm_do_read_line): Renamed from scm_gen_read_line. * libguile.h: Don't include "extchrs.h" or "mbstrings.h" * extchrs.h, extchrs.c, mbstrings.h, mbstrings.c: Removed.
201 lines
6.6 KiB
C
201 lines
6.6 KiB
C
/* Copyright (C) 1995,1996, 1997 Free Software Foundation, Inc.
|
||
*
|
||
* This program is free software; you can redistribute it and/or modify
|
||
* it under the terms of the GNU General Public License as published by
|
||
* the Free Software Foundation; either version 2, or (at your option)
|
||
* any later version.
|
||
*
|
||
* This program is distributed in the hope that it will be useful,
|
||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||
* GNU General Public License for more details.
|
||
*
|
||
* You should have received a copy of the GNU General Public License
|
||
* along with this software; see the file COPYING. If not, write to
|
||
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
|
||
* Boston, MA 02111-1307 USA
|
||
*
|
||
* As a special exception, the Free Software Foundation gives permission
|
||
* for additional uses of the text contained in its release of GUILE.
|
||
*
|
||
* The exception is that, if you link the GUILE library with other files
|
||
* to produce an executable, this does not by itself cause the
|
||
* resulting executable to be covered by the GNU General Public License.
|
||
* Your use of that executable is in no way restricted on account of
|
||
* linking the GUILE library code into it.
|
||
*
|
||
* This exception does not however invalidate any other reasons why
|
||
* the executable file might be covered by the GNU General Public License.
|
||
*
|
||
* This exception applies only to the code released by the
|
||
* Free Software Foundation under the name GUILE. If you copy
|
||
* code from other Free Software Foundation releases into a copy of
|
||
* GUILE, as the General Public License permits, the exception does
|
||
* not apply to the code that you add in this way. To avoid misleading
|
||
* anyone as to the status of such modified files, you must delete
|
||
* this exception notice from them.
|
||
*
|
||
* If you write modifications of your own for GUILE, it is your choice
|
||
* whether to permit this exception to apply to your modifications.
|
||
* If you do not wish that, delete this exception notice. */
|
||
|
||
|
||
#include <stdio.h>
|
||
#include "_scm.h"
|
||
#include "genio.h"
|
||
#include "procprop.h"
|
||
|
||
#include "gsubr.h"
|
||
|
||
/*
|
||
* gsubr.c
|
||
* Provide `gsubrs' -- subrs taking a prescribed number of required, optional,
|
||
* and rest arguments.
|
||
*/
|
||
|
||
#include "gsubr.h"
|
||
|
||
#define GSUBR_TEST 1
|
||
|
||
#define GSUBR_MAKTYPE(req, opt, rst) ((req)|((opt)<<4)|((rst)<<8))
|
||
#define GSUBR_REQ(x) ((int)(x)&0xf)
|
||
#define GSUBR_OPT(x) (((int)(x)&0xf0)>>4)
|
||
#define GSUBR_REST(x) ((int)(x)>>8)
|
||
|
||
#define GSUBR_MAX 10
|
||
#define GSUBR_TYPE(cclo) (SCM_VELTS(cclo)[1])
|
||
#define GSUBR_PROC(cclo) (SCM_VELTS(cclo)[2])
|
||
|
||
SCM scm_i_name;
|
||
SCM scm_i_inner_name;
|
||
static SCM f_gsubr_apply;
|
||
|
||
SCM
|
||
scm_make_gsubr(name, req, opt, rst, fcn)
|
||
char *name;
|
||
int req;
|
||
int opt;
|
||
int rst;
|
||
SCM (*fcn)();
|
||
{
|
||
switch GSUBR_MAKTYPE(req, opt, rst) {
|
||
case GSUBR_MAKTYPE(0, 0, 0): return scm_make_subr(name, scm_tc7_subr_0, fcn);
|
||
case GSUBR_MAKTYPE(1, 0, 0): return scm_make_subr(name, scm_tc7_subr_1, fcn);
|
||
case GSUBR_MAKTYPE(0, 1, 0): return scm_make_subr(name, scm_tc7_subr_1o, fcn);
|
||
case GSUBR_MAKTYPE(1, 1, 0): return scm_make_subr(name, scm_tc7_subr_2o, fcn);
|
||
case GSUBR_MAKTYPE(2, 0, 0): return scm_make_subr(name, scm_tc7_subr_2, fcn);
|
||
case GSUBR_MAKTYPE(3, 0, 0): return scm_make_subr(name, scm_tc7_subr_3, fcn);
|
||
case GSUBR_MAKTYPE(0, 0, 1): return scm_make_subr(name, scm_tc7_lsubr, fcn);
|
||
case GSUBR_MAKTYPE(2, 0, 1): return scm_make_subr(name, scm_tc7_lsubr_2, fcn);
|
||
default:
|
||
{
|
||
SCM symcell = scm_sysintern(name, SCM_UNDEFINED);
|
||
SCM z, cclo = scm_makcclo(f_gsubr_apply, 3L);
|
||
long tmp = ((((SCM_CELLPTR)(SCM_CAR(symcell)))-scm_heap_org)<<8);
|
||
if (GSUBR_MAX < req + opt + rst) {
|
||
fputs("ERROR in scm_make_gsubr: too many args\n", stderr);
|
||
exit (1);
|
||
}
|
||
if ((tmp>>8) != ((SCM_CELLPTR)(SCM_CAR(symcell))-scm_heap_org))
|
||
tmp = 0;
|
||
SCM_NEWCELL(z);
|
||
SCM_SUBRF(z) = fcn;
|
||
SCM_SETCAR (z, tmp + scm_tc7_subr_0);
|
||
GSUBR_PROC(cclo) = z;
|
||
GSUBR_TYPE(cclo) = SCM_MAKINUM(GSUBR_MAKTYPE(req, opt, rst));
|
||
SCM_SETCDR (symcell, cclo);
|
||
#ifdef DEBUG_EXTENSIONS
|
||
if (SCM_REC_PROCNAMES_P)
|
||
scm_set_procedure_property_x (cclo, scm_i_name, SCM_CAR (symcell));
|
||
#endif
|
||
return cclo;
|
||
}
|
||
}
|
||
}
|
||
|
||
|
||
SCM_PROC(s_gsubr_apply, "gsubr-apply", 0, 0, 1, scm_gsubr_apply);
|
||
|
||
SCM
|
||
scm_gsubr_apply(args)
|
||
SCM args;
|
||
{
|
||
SCM self = SCM_CAR(args);
|
||
SCM (*fcn)() = SCM_SUBRF(GSUBR_PROC(self));
|
||
SCM v[10]; /* must agree with greatest supported arity */
|
||
int typ = SCM_INUM(GSUBR_TYPE(self));
|
||
int i, n = GSUBR_REQ(typ) + GSUBR_OPT(typ) + GSUBR_REST(typ);
|
||
#if 0
|
||
SCM_ASSERT(n <= sizeof(v)/sizeof(SCM),
|
||
self, "internal programming error", s_gsubr_apply);
|
||
#endif
|
||
args = SCM_CDR(args);
|
||
for (i = 0; i < GSUBR_REQ(typ); i++) {
|
||
#ifndef RECKLESS
|
||
if (SCM_IMP(args))
|
||
wnargs: scm_wrong_num_args (SCM_SNAME(GSUBR_PROC(self)));
|
||
#endif
|
||
v[i] = SCM_CAR(args);
|
||
args = SCM_CDR(args);
|
||
}
|
||
for (; i < GSUBR_REQ(typ) + GSUBR_OPT(typ); i++) {
|
||
if (SCM_NIMP(args)) {
|
||
v[i] = SCM_CAR(args);
|
||
args = SCM_CDR(args);
|
||
}
|
||
else
|
||
v[i] = SCM_UNDEFINED;
|
||
}
|
||
if (GSUBR_REST(typ))
|
||
v[i] = args;
|
||
else
|
||
SCM_ASRTGO(SCM_NULLP(args), wnargs);
|
||
switch (n) {
|
||
case 2: return (*fcn)(v[0], v[1]);
|
||
case 3: return (*fcn)(v[0], v[1], v[2]);
|
||
case 4: return (*fcn)(v[0], v[1], v[2], v[3]);
|
||
case 5: return (*fcn)(v[0], v[1], v[2], v[3], v[4]);
|
||
case 6: return (*fcn)(v[0], v[1], v[2], v[3], v[4], v[5]);
|
||
case 7: return (*fcn)(v[0], v[1], v[2], v[3], v[4], v[5], v[6]);
|
||
case 8: return (*fcn)(v[0], v[1], v[2], v[3], v[4], v[5], v[6], v[7]);
|
||
case 9: return (*fcn)(v[0], v[1], v[2], v[3], v[4], v[5], v[6], v[7], v[8]);
|
||
case 10: return (*fcn)(v[0], v[1], v[2], v[3], v[4], v[5], v[6], v[7], v[8], v[9]);
|
||
}
|
||
}
|
||
|
||
|
||
#ifdef GSUBR_TEST
|
||
/* A silly example, taking 2 required args, 1 optional, and
|
||
a scm_list of rest args
|
||
*/
|
||
SCM
|
||
gsubr_21l(req1, req2, opt, rst)
|
||
SCM req1, req2, opt, rst;
|
||
{
|
||
scm_puts ("gsubr-2-1-l:\n req1: ", scm_cur_outp);
|
||
scm_display(req1, scm_cur_outp);
|
||
scm_puts ("\n req2: ", scm_cur_outp);
|
||
scm_display(req2, scm_cur_outp);
|
||
scm_puts ("\n opt: ", scm_cur_outp);
|
||
scm_display(opt, scm_cur_outp);
|
||
scm_puts ("\n rest: ", scm_cur_outp);
|
||
scm_display(rst, scm_cur_outp);
|
||
scm_newline(scm_cur_outp);
|
||
return SCM_UNSPECIFIED;
|
||
}
|
||
#endif
|
||
|
||
|
||
|
||
void
|
||
scm_init_gsubr()
|
||
{
|
||
f_gsubr_apply = scm_make_subr(s_gsubr_apply, scm_tc7_lsubr, scm_gsubr_apply);
|
||
scm_i_name = SCM_CAR (scm_sysintern ("name", SCM_UNDEFINED));
|
||
scm_permanent_object (scm_i_name);
|
||
scm_i_inner_name = SCM_CAR (scm_sysintern ("inner-name", SCM_UNDEFINED));
|
||
scm_permanent_object (scm_i_inner_name);
|
||
#ifdef GSUBR_TEST
|
||
scm_make_gsubr("gsubr-2-1-l", 2, 1, 1, gsubr_21l); /* example */
|
||
#endif
|
||
}
|