diff options
author | Jim Blandy <jimb@red-bean.com> | 1997-04-14 06:42:27 +0000 |
---|---|---|
committer | Jim Blandy <jimb@red-bean.com> | 1997-04-14 06:42:27 +0000 |
commit | ee2a8b9bdd1d548e5530f4f132aa436167154a00 (patch) | |
tree | 752b54578b9f14e466cc3e8c712e47b4bf4a9c78 /libguile/gh_eval.c | |
parent | f4d7dfb69da543557bfca4b63e992868e0e37110 (diff) | |
download | guile-ee2a8b9bdd1d548e5530f4f132aa436167154a00.tar.gz |
* gh_init.c (gh_standard_handler): Return SCM_BOOL_F, not garbage.
Merge GH interface library into libguile.
* gh.h, gh_data.c, gh_eval.c, gh_funcs.c, gh_init.c, gh_io.c,
gh_list.c, gh_predicates.c, gh_test_c, gh_test_c.c, gh_test_repl,
gh_test_repl.c: New files.
* Makefile.am (libguile_la_SOURCES): Add gh_data.c, gh_eval.c,
gh_funcs.c, gh_init.c, gh_io.c, gh_list.c, gh_predicates.c. Move
_scm.h to ...
(EXTRA_libguile_la_SOURCES): ... here.
(pkginclude_HEADERS): Add variable, to get gh.h installed.
(THREAD_LIBS, check_ldadd, check_PROGRAMS, gh_test_c_SOURCES,
gh_test_c_LDADD, gh_test_repl_SOURCES, gh_test_repl_LDADD):
New variables, describing how to build the gh test programs.
* configure.in: Check for -lm, -lsocket, -lnsl; we need this to
build the test programs, and we probably should have been linking
libguile.la against them all along, to support AIX shared libs.
Add cflags for threads to CFLAGS; add libs for threads to new
variable THREAD_LIBS, used in Makefile.am.
* ChangeLog-gh: log from old `gh' subdirectory.
* Makefile.in, configure, scmconfig.h.in: Rebuilt.
Diffstat (limited to 'libguile/gh_eval.c')
-rw-r--r-- | libguile/gh_eval.c | 180 |
1 files changed, 180 insertions, 0 deletions
diff --git a/libguile/gh_eval.c b/libguile/gh_eval.c new file mode 100644 index 000000000..bad70ed13 --- /dev/null +++ b/libguile/gh_eval.c @@ -0,0 +1,180 @@ +/* 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, 675 Mass Ave, Cambridge, MA 02139, 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. + */ + + +/* routines to evaluate Scheme code */ + +#include <stdio.h> + +#include <gh.h> + +typedef SCM (*gh_eval_t) (void *data, SCM jmpbuf); + +struct cwss_data + { + SCM tag; + scm_catch_body_t body; + void *data; + }; + +/* Evaluate the string; toss the value. */ +#if 0 +void +gh_eval_str (char *scheme_code) +{ + /* Create a port that reads characters from SCHEME_CODE. */ + SCM port = scm_mkstrport (SCM_MAKINUM (0), + scm_makfrom0str (scheme_code), + SCM_OPN | SCM_RDNG, + "guile_main"); + SCM form; + + /* Read expressions from that port; ignore the values. */ + while ((form = scm_read (port, SCM_BOOL_F, SCM_BOOL_F)) != SCM_EOF_VAL) + scm_eval_x (form); + + /* Dispose of the port when done. (Oh icky.) */ + scm_close_port (port); +} +#endif /* 0 */ + +SCM +gh_eval_str (char *scheme_code) +{ + return scm_eval_0str (scheme_code); +} + +/* evaluate the file by passing it to the lower level scm_primitive_load() */ +SCM +gh_eval_file (char *fname) +{ + return scm_primitive_load (gh_str02scm (fname)); +} + +static SCM +eval_str_wrapper (void *data, SCM jmpbuf) +{ +/* gh_eval_t real_eval_proc = (gh_eval_t) (* ((gh_eval_t *) data)); */ + + char *scheme_code = (char *) data; + return gh_eval_str (scheme_code); +} + +SCM +gh_eval_str_with_catch (char *scheme_code, scm_catch_handler_t handler) +{ + /* FIXME: not there yet */ + return gh_catch (SCM_BOOL_T, (scm_catch_body_t) eval_str_wrapper, scheme_code, + (scm_catch_handler_t) gh_standard_handler, scheme_code); +} + +SCM +gh_eval_str_with_standard_handler (char *scheme_code) +{ + return gh_eval_str_with_catch (scheme_code, gh_standard_handler); +} + + +SCM +ss_handler (void *data, SCM tag, SCM throw_args) +{ + /* Save the stack */ + SCM_SETCDR (scm_the_last_stack_var, + scm_make_stack (scm_cons (SCM_BOOL_T, SCM_EOL))); + /* Throw the error */ + return scm_throw (tag, throw_args); +} + +static SCM +cwss_body (void *data, SCM jmpbuf) +{ + struct cwss_data *d = data; + return scm_internal_lazy_catch (d->tag, d->body, d->data, ss_handler, NULL); +} +/* FIXME: should catch_with_saved_stack() be in the gh_ API? */ +static SCM +catch_with_saved_stack (SCM tag, + scm_catch_body_t body, + void *body_data, + scm_catch_handler_t handler, + void *handler_data) +{ + struct cwss_data d; + d.tag = tag; + d.body = body; + d.data = body_data; + return scm_internal_catch (tag, cwss_body, &d, handler, handler_data); +} + +SCM +gh_eval_str_with_stack_saving_handler (char *scheme_code) +{ + return catch_with_saved_stack (SCM_BOOL_T, + (scm_catch_body_t) eval_str_wrapper, + scheme_code, + (scm_catch_handler_t) + gh_standard_handler, + scheme_code); +} + +static SCM +eval_file_wrapper (void *data, SCM jmpbuf) +{ +/* gh_eval_t real_eval_proc = (gh_eval_t) (* ((gh_eval_t *) data)); */ + + char *scheme_code = (char *) data; + return gh_eval_file (scheme_code); +} + +SCM +gh_eval_file_with_catch (char *scheme_code, scm_catch_handler_t handler) +{ + /* FIXME: not there yet */ + return gh_catch (SCM_BOOL_T, (scm_catch_body_t) eval_file_wrapper, + scheme_code, (scm_catch_handler_t) gh_standard_handler, + scheme_code); +} + +SCM +gh_eval_file_with_standard_handler (char *scheme_code) +{ + return gh_eval_file_with_catch (scheme_code, gh_standard_handler); +} |