-/* Copyright (C) 1995,1996 Free Software Foundation, Inc.
+/* 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
*
* 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.
+ * 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.
*
* 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.
- */
+ * If you do not wish that, delete this exception notice. */
\f
#include <stdio.h>
*/
-/* True between SCM_DEFER_INTS and SCM_ALLOW_INTS, and
- * when the interpreter is not running at all.
- */
-int scm_ints_disabled = 1;
-
extern int errno;
-static void
-err_head (str)
- char *str;
-{
- int oerrno = errno;
- if (SCM_NIMP (scm_cur_outp))
- scm_fflush (scm_cur_outp);
- scm_gen_putc ('\n', scm_cur_errp);
-#if 0
- if (SCM_BOOL_F != *scm_loc_loadpath)
- {
- scm_prin1 (*scm_loc_loadpath, scm_cur_errp, 1);
- scm_gen_puts (scm_regular_string, ", line ", scm_cur_errp);
- scm_intprint ((long) scm_linum, 10, scm_cur_errp);
- scm_gen_puts (scm_regular_string, ": ", scm_cur_errp);
- }
-#endif
- scm_fflush (scm_cur_errp);
- errno = oerrno;
- if (scm_cur_errp == scm_def_errp)
- {
- if (errno > 0)
- perror (str);
- fflush (stderr);
- return;
- }
-}
-
-
-SCM_PROC(s_errno, "errno", 0, 1, 0, scm_errno);
-SCM
-scm_errno (arg)
- SCM arg;
-{
- int old = errno;
- if (!SCM_UNBNDP (arg))
- {
- if (SCM_FALSEP (arg))
- errno = 0;
- else
- errno = SCM_INUM (arg);
- }
- return SCM_MAKINUM (old);
-}
-
-SCM_PROC(s_perror, "perror", 1, 0, 0, scm_perror);
-SCM
-scm_perror (arg)
- SCM arg;
-{
- SCM_ASSERT (SCM_NIMP (arg) && SCM_STRINGP (arg), arg, SCM_ARG1, s_perror);
- err_head (SCM_CHARS (arg));
- return SCM_UNSPECIFIED;
-}
-
-void (*scm_error_callback) () = 0;
-
-/* all errors thrown from C should pass through here. */
-/* also known as lgh_error. */
+/* All errors should pass through here. */
void
scm_error (key, subr, message, args, rest)
SCM key;
SCM rest;
{
SCM arg_list;
- if (scm_error_callback)
- (*scm_error_callback) (key, subr, message, args, rest);
-
arg_list = scm_listify (subr ? scm_makfrom0str (subr) : SCM_BOOL_F,
- scm_makfrom0str (message),
+ message ? scm_makfrom0str (message) : SCM_BOOL_F,
args,
rest,
SCM_UNDEFINED);
/* No return, but just in case: */
- write (2, "unhandled system error", sizeof ("unhandled system error") - 1);
+ write (2, "unhandled system error\n",
+ sizeof ("unhandled system error\n") - 1);
exit (1);
}
-/* error keys: defined here, initialized below, prototyped in error.h,
- associated with handler procedures in boot-9.scm. */
-SCM scm_system_error_key;
-SCM scm_num_overflow_key;
-SCM scm_out_of_range_key;
-SCM scm_arg_type_key;
-SCM scm_args_number_key;
-SCM scm_memory_alloc_key;
-SCM scm_stack_overflow_key;
-SCM scm_misc_error_key;
+/* Scheme interface to scm_error. */
+SCM_PROC(s_error_scm, "scm-error", 5, 0, 0, scm_error_scm);
+SCM
+scm_error_scm (key, subr, message, args, rest)
+ SCM key;
+ SCM subr;
+ SCM message;
+ SCM args;
+ SCM rest;
+{
+ SCM_ASSERT (SCM_NIMP (key) && SCM_SYMBOLP (key), key, SCM_ARG1, s_error_scm);
+ SCM_ASSERT (SCM_FALSEP (subr) || (SCM_NIMP (subr) && SCM_ROSTRINGP (subr)),
+ subr, SCM_ARG2, s_error_scm);
+ SCM_ASSERT (SCM_FALSEP (message)
+ || (SCM_NIMP (message) && SCM_ROSTRINGP (message)),
+ message, SCM_ARG3, s_error_scm);
+
+ SCM_COERCE_SUBSTR (message);
+
+ scm_error (key,
+ (SCM_FALSEP (subr)) ? NULL : SCM_ROCHARS (subr),
+ (SCM_FALSEP (message)) ? NULL : SCM_ROCHARS (message),
+ args,
+ rest);
+ /* not reached. */
+}
+SCM_PROC (s_strerror, "strerror", 1, 0, 0, scm_strerror);
+SCM
+scm_strerror (SCM err)
+{
+ SCM_ASSERT (SCM_INUMP (err), err, SCM_ARG1, s_strerror);
+ return scm_makfrom0str (strerror (SCM_INUM (err)));
+}
+
+SCM_SYMBOL (scm_system_error_key, "system-error");
void
scm_syserror (subr)
char *subr;
{
- lgh_error (scm_system_error_key,
+ scm_error (scm_system_error_key,
subr,
"%s",
scm_listify (scm_makfrom0str (strerror (errno)),
}
void
-scm_syserror_msg (subr, message, args)
+scm_syserror_msg (subr, message, args, eno)
char *subr;
char *message;
SCM args;
+ int eno;
{
- lgh_error (scm_system_error_key,
+ scm_error (scm_system_error_key,
subr,
message,
args,
- scm_listify (SCM_MAKINUM (errno), SCM_UNDEFINED));
+ scm_listify (SCM_MAKINUM (eno), SCM_UNDEFINED));
}
void
char *subr;
{
#ifdef ENOSYS
- lgh_error (scm_system_error_key,
+ scm_error (scm_system_error_key,
subr,
"%s",
scm_listify (scm_makfrom0str (strerror (ENOSYS)), SCM_UNDEFINED),
scm_listify (SCM_MAKINUM (ENOSYS), SCM_UNDEFINED));
#else
- lgh_error (scm_system_error_key,
+ scm_error (scm_system_error_key,
subr,
"Missing function",
SCM_BOOL_F,
#endif
}
+SCM_SYMBOL (scm_num_overflow_key, "numerical-overflow");
void
scm_num_overflow (subr)
char *subr;
{
- lgh_error (scm_num_overflow_key,
+ scm_error (scm_num_overflow_key,
subr,
"Numerical overflow",
SCM_BOOL_F,
SCM_BOOL_F);
}
+SCM_SYMBOL (scm_out_of_range_key, "out-of-range");
void
scm_out_of_range (subr, bad_value)
char *subr;
SCM bad_value;
{
- lgh_error (scm_out_of_range_key,
+ scm_error (scm_out_of_range_key,
subr,
"Argument out of range: %S",
scm_listify (bad_value, SCM_UNDEFINED),
SCM_BOOL_F);
}
+SCM_SYMBOL (scm_args_number_key, "wrong-number-of-args");
void
scm_wrong_num_args (proc)
SCM proc;
{
- lgh_error (scm_args_number_key,
+ scm_error (scm_args_number_key,
NULL,
"Wrong number of arguments to %s",
scm_listify (proc, SCM_UNDEFINED),
SCM_BOOL_F);
}
+SCM_SYMBOL (scm_arg_type_key, "wrong-type-arg");
void
scm_wrong_type_arg (subr, pos, bad_value)
char *subr;
int pos;
SCM bad_value;
{
- lgh_error (scm_arg_type_key,
+ scm_error (scm_arg_type_key,
subr,
(pos == 0) ? "Wrong type argument: %S"
: "Wrong type argument in position %s: %S",
SCM_BOOL_F);
}
+SCM_SYMBOL (scm_memory_alloc_key, "memory-allocation-error");
void
scm_memory_error (subr)
char *subr;
{
- lgh_error (scm_memory_alloc_key,
+ scm_error (scm_memory_alloc_key,
subr,
"Memory allocation error",
SCM_BOOL_F,
SCM_BOOL_F);
}
+SCM_SYMBOL (scm_misc_error_key, "misc-error");
+void
+scm_misc_error (subr, message, args)
+ char *subr;
+ char *message;
+ SCM args;
+{
+ scm_error (scm_misc_error_key, subr, message, args, SCM_BOOL_F);
+}
+
/* implements the SCM_ASSERT interface. */
SCM
scm_wta (arg, pos, s_subr)
if ((~0x1fL) & (long) pos)
{
/* error string supplied. */
- lgh_error (scm_misc_error_key,
- s_subr,
- pos,
- SCM_BOOL_F,
- SCM_BOOL_F);
+ scm_misc_error (s_subr, pos, SCM_EOL);
}
else
{
scm_memory_error (s_subr);
default:
/* this shouldn't happen. */
- lgh_error (scm_misc_error_key,
- s_subr,
- "Unknown error",
- SCM_BOOL_F,
- SCM_BOOL_F);
+ scm_misc_error (s_subr, "Unknown error", SCM_EOL);
}
}
return SCM_UNSPECIFIED;
void
scm_init_error ()
{
- scm_system_error_key
- = scm_permanent_object (SCM_CAR (scm_intern0 ("system-error")));
- scm_num_overflow_key
- = scm_permanent_object (SCM_CAR (scm_intern0 ("numerical-overflow")));
- scm_out_of_range_key
- = scm_permanent_object (SCM_CAR (scm_intern0 ("out-of-range")));
- scm_arg_type_key
- = scm_permanent_object (SCM_CAR (scm_intern0 ("wrong-type-arg")));
- scm_args_number_key
- = scm_permanent_object (SCM_CAR (scm_intern0 ("wrong-number-of-args")));
- scm_memory_alloc_key
- = scm_permanent_object (SCM_CAR (scm_intern0 ("memory-allocation-error")));
- scm_stack_overflow_key
- = scm_permanent_object (SCM_CAR (scm_intern0 ("stack-overflow")));
- scm_misc_error_key
- = scm_permanent_object (SCM_CAR (scm_intern0 ("misc-error")));
+#include "cpp_err_symbols.c"
#include "error.x"
}
HCoop / bpt / guile.git / blobdiff