summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2012-01-30 11:02:29 -0500
committerMark H Weaver <mhw@netris.org>2012-01-30 11:02:29 -0500
commit07c2ca0f0d56ebe515cb4ee9f1c3f4b3e824ca7b (patch)
tree119fbc9dca52f063b6376d55e6fd780eded56fc2
parent741b8a2300ef329cf5691a3c35b920df68f093e2 (diff)
downloadguile-07c2ca0f0d56ebe515cb4ee9f1c3f4b3e824ca7b.tar.gz
Rename scm_call_varargs -> scm_call
* 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>
-rw-r--r--NEWS2
-rw-r--r--doc/ref/api-evaluation.texi10
-rw-r--r--libguile/eval.c2
-rw-r--r--libguile/eval.h2
-rw-r--r--test-suite/standalone/test-loose-ends.c16
5 files changed, 16 insertions, 16 deletions
diff --git a/NEWS b/NEWS
index df5a4f8b0..0edcef75c 100644
--- a/NEWS
+++ b/NEWS
@@ -136,7 +136,7 @@ Reflection", "Syntax Transformer Helpers", and "Local Inclusion".
** New print option: `escape-newlines', defaults to #t.
** (ice-9 ftw): `file-system-fold', `file-system-tree', `scandir'
** `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)
Search the manual for these identifiers and modules, for more.
diff --git a/doc/ref/api-evaluation.texi b/doc/ref/api-evaluation.texi
index de541943e..8c41d1efd 100644
--- a/doc/ref/api-evaluation.texi
+++ b/doc/ref/api-evaluation.texi
@@ -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.
@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
terminated by @code{SCM_UNDEFINED}. For example:
@example
-scm_call_varargs (scm_c_public_ref ("guile", "+"),
- scm_from_int (1),
- scm_from_int (2),
- SCM_UNDEFINED);
+scm_call (scm_c_public_ref ("guile", "+"),
+ scm_from_int (1),
+ scm_from_int (2),
+ SCM_UNDEFINED);
@end example
@end deffn
diff --git a/libguile/eval.c b/libguile/eval.c
index 70e303ab1..e52fa48e4 100644
--- a/libguile/eval.c
+++ b/libguile/eval.c
@@ -553,7 +553,7 @@ scm_call_n (SCM proc, SCM *argv, size_t nargs)
}
SCM
-scm_call_varargs (SCM proc, ...)
+scm_call (SCM proc, ...)
{
va_list argp;
SCM *argv = NULL;
diff --git a/libguile/eval.h b/libguile/eval.h
index dca0b4119..014f0dec5 100644
--- a/libguile/eval.h
+++ b/libguile/eval.h
@@ -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 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_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_1 (SCM proc, SCM arg1, SCM args);
SCM_API SCM scm_apply_2 (SCM proc, SCM arg1, SCM arg2, SCM args);
diff --git a/test-suite/standalone/test-loose-ends.c b/test-suite/standalone/test-loose-ends.c
index 253c9a68f..ee0fcf3f3 100644
--- a/test-suite/standalone/test-loose-ends.c
+++ b/test-suite/standalone/test-loose-ends.c
@@ -59,18 +59,18 @@ test_scm_local_eval ()
}
static void
-test_scm_call_varargs ()
+test_scm_call ()
{
SCM result;
- result = scm_call_varargs (scm_c_public_ref ("guile", "+"),
- scm_from_int (1),
- scm_from_int (2),
- SCM_UNDEFINED);
+ result = scm_call (scm_c_public_ref ("guile", "+"),
+ scm_from_int (1),
+ scm_from_int (2),
+ SCM_UNDEFINED);
assert (scm_is_true (scm_equal_p (result, scm_from_int (3))));
- result = scm_call_varargs (scm_c_public_ref ("guile", "list"),
- SCM_UNDEFINED);
+ result = scm_call (scm_c_public_ref ("guile", "list"),
+ SCM_UNDEFINED);
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_local_eval ();
- test_scm_call_varargs ();
+ test_scm_call ();
}
int