summaryrefslogtreecommitdiff
path: root/libguile/error.c
diff options
context:
space:
mode:
authorKeisuke Nishida <kxn30@po.cwru.edu>2001-06-28 01:11:59 +0000
committerKeisuke Nishida <kxn30@po.cwru.edu>2001-06-28 01:11:59 +0000
commit1afff620541041a7b680a85fee6d641092091b7c (patch)
tree02eb8dd8e195a47339873520221b04dfc46a13b9 /libguile/error.c
parent02d9f388177fc440ad7648544cfd1034ca0bbd13 (diff)
downloadguile-1afff620541041a7b680a85fee6d641092091b7c.tar.gz
* list.h (scm_list_1, scm_list_2, scm_list_3, scm_list_4, scm_list_5,
scm_list_n): New functions. (SCM_LIST0, SCM_LIST1, SCM_LIST2, SCM_LIST3, SCM_LIST4, SCM_LIST5, SCM_LIST6, SCM_LIST7, SCM_LIST8, SCM_LIST9, scm_listify): Deprecated. (lots of files): Use the new functions. * goops.c (CALL_GF1, CALL_GF2, CALL_GF3, CALL_GF4): Use scm_call_N. * strings.c: #include "libguile/deprecation.h".
Diffstat (limited to 'libguile/error.c')
-rw-r--r--libguile/error.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/libguile/error.c b/libguile/error.c
index b37db72a5..0fd20718a 100644
--- a/libguile/error.c
+++ b/libguile/error.c
@@ -81,10 +81,10 @@ scm_error (SCM key, const char *subr, const char *message, SCM args, SCM rest)
message ? message : "<empty message>");
abort ();
}
- arg_list = SCM_LIST4 (subr ? scm_makfrom0str (subr) : SCM_BOOL_F,
- message ? scm_makfrom0str (message) : SCM_BOOL_F,
- args,
- rest);
+ arg_list = scm_list_4 (subr ? scm_makfrom0str (subr) : SCM_BOOL_F,
+ message ? scm_makfrom0str (message) : SCM_BOOL_F,
+ args,
+ rest);
scm_ithrow (key, arg_list, 1);
/* No return, but just in case: */
@@ -202,7 +202,7 @@ scm_out_of_range (const char *subr, SCM bad_value)
scm_error (scm_out_of_range_key,
subr,
"Argument out of range: ~S",
- SCM_LIST1(bad_value),
+ scm_list_1 (bad_value),
SCM_BOOL_F);
}
@@ -212,7 +212,7 @@ scm_out_of_range_pos (const char *subr, SCM bad_value, SCM pos)
scm_error (scm_out_of_range_key,
subr,
"Argument ~S out of range: ~S",
- SCM_LIST2(pos,bad_value),
+ scm_list_2 (pos,bad_value),
SCM_BOOL_F);
}
@@ -224,7 +224,7 @@ scm_wrong_num_args (SCM proc)
scm_error (scm_args_number_key,
NULL,
"Wrong number of arguments to ~A",
- SCM_LIST1(proc),
+ scm_list_1 (proc),
SCM_BOOL_F);
}
@@ -235,7 +235,7 @@ scm_error_num_args_subr (const char *subr)
scm_error (scm_args_number_key,
NULL,
"Wrong number of arguments to ~A",
- SCM_LIST1 (scm_makfrom0str (subr)),
+ scm_list_1 (scm_makfrom0str (subr)),
SCM_BOOL_F);
}
@@ -248,8 +248,8 @@ scm_wrong_type_arg (const char *subr, int pos, SCM bad_value)
subr,
(pos == 0) ? "Wrong type argument: ~S"
: "Wrong type argument in position ~A: ~S",
- (pos == 0) ? SCM_LIST1(bad_value)
- : SCM_LIST2(SCM_MAKINUM(pos), bad_value),
+ (pos == 0) ? scm_list_1 (bad_value)
+ : scm_list_2 (SCM_MAKINUM (pos), bad_value),
SCM_BOOL_F);
}
@@ -260,13 +260,13 @@ scm_wrong_type_arg_msg (const char *subr, int pos, SCM bad_value, const char *sz
if (pos == 0) {
scm_error (scm_arg_type_key,
subr, "Wrong type argument (expecting ~A): ~S",
- SCM_LIST2(msg,bad_value),
+ scm_list_2 (msg, bad_value),
SCM_BOOL_F);
} else {
scm_error (scm_arg_type_key,
subr,
"Wrong type argument in position ~A (expecting ~A): ~S",
- SCM_LIST3(SCM_MAKINUM(pos),msg,bad_value),
+ scm_list_3 (SCM_MAKINUM (pos), msg, bad_value),
SCM_BOOL_F);
}
}
@@ -300,7 +300,7 @@ scm_wta (SCM arg, const char *pos, const char *s_subr)
if ((~0x1fL) & (long) pos)
{
/* error string supplied. */
- scm_misc_error (s_subr, pos, SCM_LIST1 (arg));
+ scm_misc_error (s_subr, pos, scm_list_1 (arg));
}
else
{