mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 03:40:34 +02:00
Code Activity

* list.h (scm_list_1, scm_list_2, scm_list_3, scm_list_4, scm_list_5,

Browse source 
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".
This commit is contained in:
Keisuke Nishida 2001-06-28 01:11:59 +00:00
parent 02d9f38817
commit 1afff62054
38 changed files with 368 additions and 300 deletions
Download patch file Download diff file Expand all files Collapse all files

26
libguile/error.c
View file

@ -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
{