* validate.h

[bpt/guile.git] / libguile / values.c

diff --git a/libguile/values.c b/libguile/values.c
index 5963817..2fbfaaa 100644 (file)
--- a/libguile/values.c
+++ b/libguile/values.c
@@ -52,10 +52,7 @@
 
 #include "libguile/values.h"
 
-static SCM values_vtable;
-
-#define SCM_VALUESP(x) (SCM_STRUCTP (x)\
-                        && SCM_EQ_P (scm_struct_vtable (x), values_vtable))
+SCM scm_values_vtable;
 
 static SCM
 print_values (SCM obj, SCM pwps)
@@ -64,13 +61,10 @@ print_values (SCM obj, SCM pwps)
   SCM port = SCM_PORT_WITH_PS_PORT (pwps);
   scm_print_state *ps = SCM_PRINT_STATE (SCM_PORT_WITH_PS_PS (pwps));
 
-  while (SCM_CONSP (values))
-    {
-      scm_iprin1 (SCM_CAR (values), port, ps);
-      values = SCM_CDR (values);
-      if (SCM_CONSP (values))
-       scm_newline (port);
-    }
+  scm_puts ("#<values ", port);
+  scm_iprin1 (values, port, ps);
+  scm_puts (">", port);
+
   return SCM_UNSPECIFIED;
 }
 
@@ -83,7 +77,7 @@ SCM_DEFINE (scm_values, "values", 0, 0, 1,
            "were not created by @code{call-with-values} is unspecified.")
 #define FUNC_NAME s_scm_values
 {
-  long n;
+  scm_bits_t n;
   SCM result;
 
   SCM_VALIDATE_LIST_COPYLEN (1, args, n);
@@ -91,7 +85,7 @@ SCM_DEFINE (scm_values, "values", 0, 0, 1,
     result = SCM_CAR (args);
   else
     {
-      result = scm_make_struct (values_vtable, SCM_INUM0,
+      result = scm_make_struct (scm_values_vtable, SCM_INUM0,
                                scm_cons (args, SCM_EOL));
     }
 
@@ -99,46 +93,16 @@ SCM_DEFINE (scm_values, "values", 0, 0, 1,
 }
 #undef FUNC_NAME
 
-SCM_DEFINE (scm_call_with_values, "call-with-values", 2, 0, 0,
-           (SCM producer, SCM consumer),
-           "Calls its @var{producer} argument with no values and a\n"
-           "continuation that, when passed some values, calls the\n"
-           "@var{consumer} procedure with those values as arguments.  The\n"
-           "continuation for the call to @var{consumer} is the continuation\n"
-           "of the call to @code{call-with-values}.\n\n"
-           "@example\n"
-           "(call-with-values (lambda () (values 4 5))\n"
-           "                  (lambda (a b) b))\n"
-           "                                             ==>  5\n\n"
-           "@end example\n"
-           "@example\n"
-           "(call-with-values * -)                             ==>  -1\n"
-           "@end example")
-#define FUNC_NAME s_scm_call_with_values
-{
-  SCM product;
-
-  SCM_VALIDATE_PROC (1, producer);
-  SCM_VALIDATE_PROC (2, consumer);
-
-  product = scm_apply (producer, SCM_EOL, SCM_EOL);
-  if (SCM_VALUESP (product))
-    product = scm_struct_ref (product, SCM_INUM0);
-  else
-    product = scm_cons (product, SCM_EOL);
-  return scm_apply (consumer, product, SCM_EOL);
-}
-#undef FUNC_NAME
-
 void
 scm_init_values (void)
 {
-  SCM print = scm_make_subr ("%print-values", scm_tc7_subr_2, print_values);
+  SCM print = scm_c_define_subr ("%print-values", scm_tc7_subr_2,
+                                print_values);
 
-  values_vtable 
+  scm_values_vtable 
     = scm_permanent_object (scm_make_vtable_vtable (scm_makfrom0str ("pr"),
                                                    SCM_INUM0, SCM_EOL));
-  SCM_SET_STRUCT_PRINTER (values_vtable, print);
+  SCM_SET_STRUCT_PRINTER (scm_values_vtable, print);
 
   scm_add_feature ("values");