More wrapping paper.

[perl4caml.git] / perl_c.c

diff --git a/perl_c.c b/perl_c.c
index 772bae2..4241534 100644 (file)
--- a/perl_c.c
+++ b/perl_c.c
@@ -1,6 +1,6 @@
 /* Interface to Perl from OCaml.
  * Copyright (C) 2003 Merjis Ltd.
- * $Id: perl_c.c,v 1.13 2003-12-11 17:41:52 rich Exp $
+ * $Id: perl_c.c,v 1.17 2004-11-25 22:16:17 rich Exp $
  */
 
 #include <stdio.h>
@@ -31,22 +31,31 @@
 /* Perl requires the interpreter to be called literally 'my_perl'! */
 static PerlInterpreter *my_perl;
 
+/* Get the concrete value from an optional field. */
+static value unoption (value option, value deflt);
+
 /* Wrap up an arbitrary void pointer in an opaque OCaml object. */
 static value Val_voidptr (void *ptr);
 
+/* Unwrap an arbitrary void pointer from an opaque OCaml object. */
+#define Voidptr_val(type,rv) ((type *) Field ((rv), 0))
+
+#if PERL4CAML_REFCOUNTING_EXPERIMENTAL
+
+/* Unwrap a custom block. */
+#define Xv_val(rv) (*((void **)Data_custom_val(rv)))
+
 /* Wrap up an SV, AV or HV in a custom OCaml object which will decrement
  * the reference count on finalization.
  */
 static value Val_xv (SV *sv);
 
-/* Get the concrete value from an optional field. */
-static value unoption (value option, value deflt);
+#else
 
-/* Unwrap an arbitrary void pointer from an opaque OCaml object. */
-#define Voidptr_val(type,rv) ((type *) Field ((rv), 0))
+#define Xv_val(rv) Voidptr_val (SV, (rv))
+#define Val_xv(sv) Val_voidptr ((sv))
 
-/* Unwrap a custom block. */
-#define Xv_val(rv) (*((void **)Data_custom_val(rv)))
+#endif
 
 /* Hide Perl types in opaque OCaml objects. */
 #define Val_perl(pl) (Val_voidptr ((pl)))
@@ -149,7 +158,17 @@ CAMLprim value
 perl4caml_sv_undef (value unit)
 {
   CAMLparam1 (unit);
-  CAMLreturn (Val_sv (newSV (0)));
+  /*CAMLreturn (Val_sv (newSV (0)));*/
+  CAMLreturn (Val_sv (&PL_sv_undef));
+}
+
+CAMLprim value
+perl4caml_sv_is_undef (value svv)
+{
+  CAMLparam1 (svv);
+  SV *sv = Sv_val (svv);
+  CAMLreturn (!SvPOK (sv) && !SvIOK (sv) && SvTYPE (sv) == SVt_NULL
+             ? Val_true : Val_false);
 }
 
 CAMLprim value
@@ -224,7 +243,7 @@ perl4caml_deref (value svv)
   CAMLlocal1 (rsvv);
   SV *sv = Sv_val (svv);
 
-  if (SvTYPE (sv) != SVt_RV)
+  if (!SvROK (sv))
     invalid_argument ("deref: SV is not a reference");
   switch (SvTYPE (SvRV (sv))) {
   case SVt_IV:
@@ -247,7 +266,7 @@ perl4caml_deref_array (value svv)
   CAMLlocal1 (ravv);
   SV *sv = Sv_val (svv);
 
-  if (SvTYPE (sv) != SVt_RV)
+  if (!SvROK (sv))
     invalid_argument ("deref_array: SV is not a reference");
   switch (SvTYPE (SvRV (sv))) {
   case SVt_PVAV:
@@ -266,13 +285,13 @@ perl4caml_deref_hash (value svv)
   CAMLlocal1 (rhvv);
   SV *sv = Sv_val (svv);
 
-  if (SvTYPE (sv) != SVt_RV)
-    invalid_argument ("deref_array: SV is not a reference");
+  if (!SvROK (sv))
+    invalid_argument ("deref_hash: SV is not a reference");
   switch (SvTYPE (SvRV (sv))) {
   case SVt_PVHV:
     break;
   default:
-    invalid_argument ("deref_array: SV is not a reference to a hash");
+    invalid_argument ("deref_hash: SV is not a reference to a hash");
   }
   rhvv = Val_hv ((HV *) SvRV (sv));
   CAMLreturn (rhvv);
@@ -1044,6 +1063,8 @@ Val_voidptr (void *ptr)
   CAMLreturn (rv);
 }
 
+#if PERL4CAML_REFCOUNTING_EXPERIMENTAL
+
 static void
 xv_finalize (value v)
 {
@@ -1069,6 +1090,8 @@ Val_xv (SV *sv)
   CAMLreturn (rv);
 }
 
+#endif /* PERL4CAML_REFCOUNTING_EXPERIMENTAL */
+
 static value
 unoption (value option, value deflt)
 {