mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-25 20:50:31 +02:00
Code Activity

Rename scm_call_varargs -> scm_call

Browse source 
* libguile/eval.c, libguile/eval.h, doc/ref/api-evaluation.texi,
  test-suite/standalone/test-loose-ends.c, NEWS: Rename
  scm_call_varargs -> scm_call

Suggested by Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Mark H Weaver 2012-01-30 11:02:29 -05:00
parent 741b8a2300
commit 07c2ca0f0d
5 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
NEWS
View file

@ -136,7 +136,7 @@ Reflection", "Syntax Transformer Helpers", and "Local Inclusion".
** New print option: `escape-newlines', defaults to #t. ** New print option: `escape-newlines', defaults to #t.
** (ice-9 ftw): `file-system-fold', `file-system-tree', `scandir' ** (ice-9 ftw): `file-system-fold', `file-system-tree', `scandir'
** `scm_c_value_ref': access to multiple returned values from C ** `scm_c_value_ref': access to multiple returned values from C
** scm_call_7, scm_call_8, scm_call_9, and scm_call_varargs ** scm_call (a varargs version), scm_call_7, scm_call_8, scm_call_9
** Some new syntax helpers in (system syntax) ** Some new syntax helpers in (system syntax)
Search the manual for these identifiers and modules, for more. Search the manual for these identifiers and modules, for more.

10
doc/ref/api-evaluation.texi
View file

@ -539,15 +539,15 @@ then there's no @var{arg1}@dots{}@var{argN} and @var{arg} is the
Call @var{proc} with the given arguments. Call @var{proc} with the given arguments.
@end deffn @end deffn
@deffn {C Function} scm_call_varargs (proc, ...) @deffn {C Function} scm_call (proc, ...)
Call @var{proc} with any number of arguments. The argument list must be Call @var{proc} with any number of arguments. The argument list must be
terminated by @code{SCM_UNDEFINED}. For example: terminated by @code{SCM_UNDEFINED}. For example:
@example @example
scm_call_varargs (scm_c_public_ref ("guile", "+"), scm_call (scm_c_public_ref ("guile", "+"),
scm_from_int (1), scm_from_int (1),
scm_from_int (2), scm_from_int (2),
SCM_UNDEFINED); SCM_UNDEFINED);
@end example @end example
@end deffn @end deffn

2
libguile/eval.c
View file

@ -553,7 +553,7 @@ scm_call_n (SCM proc, SCM *argv, size_t nargs)
} }
SCM SCM
scm_call_varargs (SCM proc, ...) scm_call (SCM proc, ...)
{ {
va_list argp; va_list argp;
SCM *argv = NULL; SCM *argv = NULL;

2
libguile/eval.h
View file

@ -79,7 +79,7 @@ SCM_API SCM scm_call_8 (SCM proc, SCM arg1, SCM arg2, SCM arg3, SCM arg4,
SCM_API SCM scm_call_9 (SCM proc, SCM arg1, SCM arg2, SCM arg3, SCM arg4, SCM_API SCM scm_call_9 (SCM proc, SCM arg1, SCM arg2, SCM arg3, SCM arg4,
SCM arg5, SCM arg6, SCM arg7, SCM arg8, SCM arg9); SCM arg5, SCM arg6, SCM arg7, SCM arg8, SCM arg9);
SCM_API SCM scm_call_n (SCM proc, SCM *argv, size_t nargs); SCM_API SCM scm_call_n (SCM proc, SCM *argv, size_t nargs);
SCM_API SCM scm_call_varargs (SCM proc, ...); SCM_API SCM scm_call (SCM proc, ...);
SCM_API SCM scm_apply_0 (SCM proc, SCM args); SCM_API SCM scm_apply_0 (SCM proc, SCM args);
SCM_API SCM scm_apply_1 (SCM proc, SCM arg1, SCM args); SCM_API SCM scm_apply_1 (SCM proc, SCM arg1, SCM args);
SCM_API SCM scm_apply_2 (SCM proc, SCM arg1, SCM arg2, SCM args); SCM_API SCM scm_apply_2 (SCM proc, SCM arg1, SCM arg2, SCM args);

16
test-suite/standalone/test-loose-ends.c
View file

@ -59,18 +59,18 @@ test_scm_local_eval ()
} }
static void static void
test_scm_call_varargs () test_scm_call ()
{ {
SCM result; SCM result;
result = scm_call_varargs (scm_c_public_ref ("guile", "+"), result = scm_call (scm_c_public_ref ("guile", "+"),
scm_from_int (1), scm_from_int (1),
scm_from_int (2), scm_from_int (2),
SCM_UNDEFINED); SCM_UNDEFINED);
assert (scm_is_true (scm_equal_p (result, scm_from_int (3)))); assert (scm_is_true (scm_equal_p (result, scm_from_int (3))));
result = scm_call_varargs (scm_c_public_ref ("guile", "list"), result = scm_call (scm_c_public_ref ("guile", "list"),
SCM_UNDEFINED); SCM_UNDEFINED);
assert (scm_is_eq (result, SCM_EOL)); assert (scm_is_eq (result, SCM_EOL));
} }
@ -79,7 +79,7 @@ tests (void *data, int argc, char **argv)
{ {
test_scm_from_locale_keywordn (); test_scm_from_locale_keywordn ();
test_scm_local_eval (); test_scm_local_eval ();
test_scm_call_varargs (); test_scm_call ();
} }
int int