summaryrefslogtreecommitdiff
path: root/libguile/error.c
diff options
context:
space:
mode:
authorGary Houston <ghouston@arglist.com>1999-11-18 22:36:28 +0000
committerGary Houston <ghouston@arglist.com>1999-11-18 22:36:28 +0000
commit5c11cc9deb3962c0a7b4603327b9414579efe2bf (patch)
treea0635558e053bd1d54716f4f6e3dd4082510e431 /libguile/error.c
parent93a6b6f5a75f3387fae66f815c794f8fcfbdebaf (diff)
downloadguile-5c11cc9deb3962c0a7b4603327b9414579efe2bf.tar.gz
* 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.
Diffstat (limited to 'libguile/error.c')
-rw-r--r--libguile/error.c30
1 files changed, 14 insertions, 16 deletions
diff --git a/libguile/error.c b/libguile/error.c
index 0c043b49e..7fe02fb85 100644
--- a/libguile/error.c
+++ b/libguile/error.c
@@ -78,9 +78,11 @@ scm_error (key, subr, message, args, rest)
scm_ithrow (key, arg_list, 1);
/* No return, but just in case: */
+ {
+ const char msg[] = "guile:scm_error:scm_ithrow returned!\n";
- write (2, "unhandled system error\n",
- sizeof ("unhandled system error\n") - 1);
+ write (2, msg, (sizeof msg) - 1);
+ }
exit (1);
}
@@ -127,9 +129,8 @@ scm_syserror (subr)
scm_error (scm_system_error_key,
subr,
"%s",
- scm_listify (scm_makfrom0str (strerror (errno)),
- SCM_UNDEFINED),
- scm_listify (SCM_MAKINUM (errno), SCM_UNDEFINED));
+ scm_cons (scm_makfrom0str (strerror (errno)), SCM_EOL),
+ scm_cons (SCM_MAKINUM (errno), SCM_EOL));
}
void
@@ -143,7 +144,7 @@ scm_syserror_msg (subr, message, args, eno)
subr,
message,
args,
- scm_listify (SCM_MAKINUM (eno), SCM_UNDEFINED));
+ scm_cons (SCM_MAKINUM (eno), SCM_EOL));
}
void
@@ -154,14 +155,14 @@ scm_sysmissing (subr)
scm_error (scm_system_error_key,
subr,
"%s",
- scm_listify (scm_makfrom0str (strerror (ENOSYS)), SCM_UNDEFINED),
- scm_listify (SCM_MAKINUM (ENOSYS), SCM_UNDEFINED));
+ scm_cons (scm_makfrom0str (strerror (ENOSYS)), SCM_EOL),
+ scm_cons (SCM_MAKINUM (ENOSYS), SCM_EOL));
#else
scm_error (scm_system_error_key,
subr,
"Missing function",
SCM_BOOL_F,
- scm_listify (SCM_MAKINUM (0), SCM_UNDEFINED));
+ scm_cons (SCM_MAKINUM (0), SCM_EOL));
#endif
}
@@ -186,7 +187,7 @@ scm_out_of_range (subr, bad_value)
scm_error (scm_out_of_range_key,
subr,
"Argument out of range: %S",
- scm_listify (bad_value, SCM_UNDEFINED),
+ scm_cons (bad_value, SCM_EOL),
SCM_BOOL_F);
}
@@ -198,7 +199,7 @@ scm_wrong_num_args (proc)
scm_error (scm_args_number_key,
NULL,
"Wrong number of arguments to %s",
- scm_listify (proc, SCM_UNDEFINED),
+ scm_cons (proc, SCM_EOL),
SCM_BOOL_F);
}
@@ -213,8 +214,8 @@ scm_wrong_type_arg (subr, pos, bad_value)
subr,
(pos == 0) ? "Wrong type argument: %S"
: "Wrong type argument in position %s: %S",
- (pos == 0) ? scm_listify (bad_value, SCM_UNDEFINED)
- : scm_listify (SCM_MAKINUM (pos), bad_value, SCM_UNDEFINED),
+ (pos == 0) ? scm_cons (bad_value, SCM_EOL)
+ : scm_cons (SCM_MAKINUM (pos), scm_cons (bad_value, SCM_EOL)),
SCM_BOOL_F);
}
@@ -291,9 +292,6 @@ scm_wta (arg, pos, s_subr)
return SCM_UNSPECIFIED;
}
-/* obsolete interface: scm_everr (exp, env, arg, pos, s_subr)
- was equivalent to scm_wta (arg, pos, s_subr) */
-
void
scm_init_error ()
{