X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=perl_c.c;h=7f3bdddd7f17f31a81ab6b823c41ec66e0ef5ac9;hb=7ff8ec09f0edb4a9048d7da8d63ee882bdfd97d2;hp=690b14572df218a152af0e064ae1212cfa570a59;hpb=dafc0bde0b51d76c41b2d646af3699730e31dfbb;p=perl4caml.git

diff --git a/perl_c.c b/perl_c.c
index 690b145..7f3bddd 100644
--- 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.3 2003-10-12 11:56:26 rich Exp $
+ * $Id: perl_c.c,v 1.11 2003-10-26 12:57:11 rich Exp $
  */
 
 #include <stdio.h>
@@ -40,12 +40,34 @@ static value unoption (value option, value deflt);
 #define Perl_val(plv) (Voidptr_val (PerlInterpreter, (plv)))
 #define Val_sv(sv) (Val_voidptr ((sv)))
 #define Sv_val(svv) (Voidptr_val (SV, (svv)))
+#define Val_av(av) (Val_voidptr ((av)))
+#define Av_val(avv) (Voidptr_val (AV, (avv)))
+#define Val_hv(hv) (Val_voidptr ((hv)))
+#define Hv_val(hvv) (Voidptr_val (HV, (hvv)))
 
 CAMLprim value
 perl4caml_init (value unit)
 {
+  CAMLparam1 (unit);
   PERL_SYS_INIT3 (NULL, NULL, NULL);
-  return Val_unit;
+  CAMLreturn (Val_unit);
+}
+
+CAMLprim value
+perl4caml_current_interpreter (value unit)
+{
+  CAMLparam1 (unit);
+  if (my_perl == 0) raise_not_found ();
+  CAMLreturn (Val_perl (my_perl));
+}
+
+static void
+xs_init (pTHX)
+{
+  char *file = __FILE__;
+  EXTERN_C void boot_DynaLoader (pTHX_ CV* cv);
+
+  newXS("DynaLoader::boot_DynaLoader", boot_DynaLoader, file);
 }
 
 CAMLprim value
@@ -55,12 +77,12 @@ perl4caml_create (value optargs, value unit)
   CAMLlocal1 (args);
   int argc, i;
   char **argv;
-  static char *no_args[] = { "", "-e", "0" };
+  static char *no_args[] = { "", "-w", "-e", "0" };
 
   /* Arguments given? */
   if (optargs == Val_int (0))	/* "None" */
     {
-      argc = 3;
+      argc = 4;
       argv = no_args;
     }
   else				/* "Some args" where args is a string array. */
@@ -74,8 +96,8 @@ perl4caml_create (value optargs, value unit)
   my_perl = perl_alloc ();
   perl_construct (my_perl);
   PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
-  perl_parse (my_perl, NULL, argc, argv, NULL);
-  perl_run (my_perl);
+  perl_parse (my_perl, xs_init, argc, argv, NULL);
+  /*perl_run (my_perl);*/
 
   CAMLreturn (Val_perl (my_perl));
 }
@@ -89,6 +111,9 @@ perl4caml_destroy (value plv)
   perl_destruct (pl);
   perl_free (pl);
 
+  /* Current interpreter? */
+  if (my_perl == pl) my_perl = 0;
+
   CAMLreturn (Val_unit);
 }
 
@@ -166,32 +191,340 @@ perl4caml_sv_is_true (value svv)
 }
 
 CAMLprim value
-perl4caml_sv_is_undef (value svv)
+perl4caml_sv_undef (value unit)
+{
+  CAMLparam1 (unit);
+  CAMLreturn (Val_sv (newSV (0)));
+}
+
+CAMLprim value
+perl4caml_sv_yes (value unit)
+{
+  CAMLparam1 (unit);
+  CAMLreturn (Val_sv (&PL_sv_yes));
+}
+
+CAMLprim value
+perl4caml_sv_no (value unit)
+{
+  CAMLparam1 (unit);
+  CAMLreturn (Val_sv (&PL_sv_no));
+}
+
+CAMLprim value
+perl4caml_sv_type (value svv)
 {
   CAMLparam1 (svv);
   SV *sv = Sv_val (svv);
-  CAMLreturn (sv == &PL_sv_undef ? Val_true : Val_false);
+
+  switch (SvTYPE (sv))
+    {
+    case SVt_IV: CAMLreturn (Val_int (1));
+    case SVt_NV: CAMLreturn (Val_int (2));
+    case SVt_PV: CAMLreturn (Val_int (3));
+    case SVt_RV: CAMLreturn (Val_int (4));
+    case SVt_PVAV: CAMLreturn (Val_int (5));
+    case SVt_PVHV: CAMLreturn (Val_int (6));
+    case SVt_PVCV: CAMLreturn (Val_int (7));
+    case SVt_PVGV: CAMLreturn (Val_int (8));
+    case SVt_PVMG: CAMLreturn (Val_int (9));
+    default: CAMLreturn (Val_int (0));
+    }
 }
 
 CAMLprim value
-perl4caml_sv_get_undef (value unit)
+perl4caml_scalarref (value svv)
 {
-  CAMLparam1 (unit);
-  CAMLreturn (Val_sv (&PL_sv_undef));
+  CAMLparam1 (svv);
+  CAMLlocal1 (rsvv);
+  SV *sv = Sv_val (svv);
+  rsvv = Val_sv (newRV_inc (sv));
+  CAMLreturn (rsvv);
+}
+
+CAMLprim value
+perl4caml_arrayref (value avv)
+{
+  CAMLparam1 (avv);
+  CAMLlocal1 (rsvv);
+  AV *av = Av_val (avv);
+  rsvv = Val_sv (newRV_inc ((SV *) av));
+  CAMLreturn (rsvv);
+}
+
+CAMLprim value
+perl4caml_hashref (value hvv)
+{
+  CAMLparam1 (hvv);
+  CAMLlocal1 (rsvv);
+  HV *hv = Hv_val (hvv);
+  rsvv = Val_sv (newRV_inc ((SV *) hv));
+  CAMLreturn (rsvv);
 }
 
 CAMLprim value
-perl4caml_sv_get_yes (value unit)
+perl4caml_deref (value svv)
+{
+  CAMLparam1 (svv);
+  CAMLlocal1 (rsvv);
+  SV *sv = Sv_val (svv);
+
+  if (SvTYPE (sv) != SVt_RV)
+    invalid_argument ("deref: SV is not a reference");
+  switch (SvTYPE (SvRV (sv))) {
+  case SVt_IV:
+  case SVt_NV:
+  case SVt_PV:
+  case SVt_RV:
+  case SVt_PVMG:
+    break;
+  default:
+    invalid_argument ("deref: SV is not a reference to a scalar");
+  }
+  rsvv = Val_sv (SvRV (sv));
+  CAMLreturn (rsvv);
+}
+
+CAMLprim value
+perl4caml_deref_array (value svv)
+{
+  CAMLparam1 (svv);
+  CAMLlocal1 (ravv);
+  SV *sv = Sv_val (svv);
+
+  if (SvTYPE (sv) != SVt_RV)
+    invalid_argument ("deref_array: SV is not a reference");
+  switch (SvTYPE (SvRV (sv))) {
+  case SVt_PVAV:
+    break;
+  default:
+    invalid_argument ("deref_array: SV is not a reference to an array");
+  }
+  ravv = Val_av ((AV *) SvRV (sv));
+  CAMLreturn (ravv);
+}
+
+CAMLprim value
+perl4caml_deref_hash (value svv)
+{
+  CAMLparam1 (svv);
+  CAMLlocal1 (rhvv);
+  SV *sv = Sv_val (svv);
+
+  if (SvTYPE (sv) != SVt_RV)
+    invalid_argument ("deref_array: 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");
+  }
+  rhvv = Val_hv ((HV *) SvRV (sv));
+  CAMLreturn (rhvv);
+}
+
+CAMLprim value
+perl4caml_av_empty (value unit)
 {
   CAMLparam1 (unit);
-  CAMLreturn (Val_sv (&PL_sv_yes));
+  AV *av = newAV ();
+  CAMLreturn (Val_av (av));
 }
 
+/* We don't know in advance how long the list will be, which makes this
+ * a little harder.
+ */
 CAMLprim value
-perl4caml_sv_get_no (value unit)
+perl4caml_av_of_sv_list (value svlistv)
+{
+  CAMLparam1 (svlistv);
+  CAMLlocal1 (svv);
+  SV *sv, **svlist = 0;
+  int alloc = 0, size = 0;
+  AV *av;
+
+  for (; svlistv != Val_int (0); svlistv = Field (svlistv, 1))
+    {
+      svv = Field (svlistv, 0);
+      sv = Sv_val (svv);
+      if (size >= alloc) {
+	alloc = alloc == 0 ? 1 : alloc * 2;
+	svlist = realloc (svlist, alloc * sizeof (SV *));
+      }
+      svlist[size++] = sv;
+    }
+
+  av = av_make (size, svlist);
+
+  if (alloc > 0) free (svlist);	/* Free memory allocated to SV list. */
+
+  CAMLreturn (Val_av (av));
+}
+
+/* XXX av_map would be faster if we also had sv_list_of_av. */
+
+CAMLprim value
+perl4caml_av_push (value avv, value svv)
+{
+  CAMLparam2 (avv, svv);
+  AV *av = Av_val (avv);
+  SV *sv = Sv_val (svv);
+  av_push (av, sv);
+  CAMLreturn (Val_unit);
+}
+
+CAMLprim value
+perl4caml_av_pop (value avv)
+{
+  CAMLparam1 (avv);
+  AV *av = Av_val (avv);
+  SV *sv = av_pop (av);
+  CAMLreturn (Val_sv (sv));
+}
+
+CAMLprim value
+perl4caml_av_unshift (value avv, value svv)
+{
+  CAMLparam2 (avv, svv);
+  AV *av = Av_val (avv);
+  SV *sv = Sv_val (svv);
+  av_unshift (av, 1);
+  SvREFCNT_inc (sv);
+  if (av_store (av, 0, sv) == 0)
+    SvREFCNT_dec (sv);
+  CAMLreturn (Val_unit);
+}
+
+CAMLprim value
+perl4caml_av_shift (value avv)
+{
+  CAMLparam1 (avv);
+  AV *av = Av_val (avv);
+  SV *sv = av_shift (av);
+  CAMLreturn (Val_sv (sv));
+}
+
+CAMLprim value
+perl4caml_av_length (value avv)
+{
+  CAMLparam1 (avv);
+  AV *av = Av_val (avv);
+  CAMLreturn (Val_int (av_len (av) + 1));
+}
+
+CAMLprim value
+perl4caml_av_set (value avv, value i, value svv)
+{
+  CAMLparam3 (avv, i, svv);
+  AV *av = Av_val (avv);
+  SV *sv = Sv_val (svv);
+  SvREFCNT_inc (sv);
+  if (av_store (av, Int_val (i), sv) == 0)
+    SvREFCNT_dec (sv);
+  CAMLreturn (Val_unit);
+}
+
+CAMLprim value
+perl4caml_av_get (value avv, value i)
+{
+  CAMLparam2 (avv, i);
+  AV *av = Av_val (avv);
+  SV **svp = av_fetch (av, Int_val (i), 0);
+  if (svp == 0) invalid_argument ("av_get: index out of bounds");
+  CAMLreturn (Val_sv (*svp));
+}
+
+CAMLprim value
+perl4caml_av_clear (value avv)
+{
+  CAMLparam1 (avv);
+  AV *av = Av_val (avv);
+  av_clear (av);
+  CAMLreturn (Val_unit);
+}
+
+CAMLprim value
+perl4caml_av_undef (value avv)
+{
+  CAMLparam1 (avv);
+  AV *av = Av_val (avv);
+  av_undef (av);
+  CAMLreturn (Val_unit);
+}
+
+CAMLprim value
+perl4caml_av_extend (value avv, value i)
+{
+  CAMLparam2 (avv, i);
+  AV *av = Av_val (avv);
+  av_extend (av, Int_val (i));
+  CAMLreturn (Val_unit);
+}
+
+CAMLprim value
+perl4caml_hv_empty (value unit)
 {
   CAMLparam1 (unit);
-  CAMLreturn (Val_sv (&PL_sv_no));
+  HV *hv = newHV ();
+  CAMLreturn (Val_hv (hv));
+}
+
+CAMLprim value
+perl4caml_hv_set (value hvv, value key, value svv)
+{
+  CAMLparam3 (hvv, key, svv);
+  HV *hv = Hv_val (hvv);
+  SV *sv = Sv_val (svv);
+  SvREFCNT_inc (sv);
+  if (hv_store (hv, String_val (key), string_length (key), sv, 0) == 0)
+    SvREFCNT_dec (sv);
+  CAMLreturn (Val_unit);
+}
+
+CAMLprim value
+perl4caml_hv_get (value hvv, value key)
+{
+  CAMLparam2 (hvv, key);
+  HV *hv = Hv_val (hvv);
+  SV **svp = hv_fetch (hv, String_val (key), string_length (key), 0);
+  if (svp == 0) raise_not_found ();
+  CAMLreturn (Val_sv (*svp));
+}
+
+CAMLprim value
+perl4caml_hv_exists (value hvv, value key)
+{
+  CAMLparam2 (hvv, key);
+  HV *hv = Hv_val (hvv);
+  bool r = hv_exists (hv, String_val (key), string_length (key));
+  CAMLreturn (r ? Val_true : Val_false);
+}
+
+CAMLprim value
+perl4caml_hv_delete (value hvv, value key)
+{
+  CAMLparam2 (hvv, key);
+  HV *hv = Hv_val (hvv);
+  hv_delete (hv, String_val (key), string_length (key), G_DISCARD);
+  CAMLreturn (Val_unit);
+}
+
+CAMLprim value
+perl4caml_hv_clear (value hvv)
+{
+  CAMLparam1 (hvv);
+  HV *hv = Hv_val (hvv);
+  hv_clear (hv);
+  CAMLreturn (Val_unit);
+}
+
+CAMLprim value
+perl4caml_hv_undef (value hvv)
+{
+  CAMLparam1 (hvv);
+  HV *hv = Hv_val (hvv);
+  hv_undef (hv);
+  CAMLreturn (Val_unit);
 }
 
 CAMLprim value
@@ -209,6 +542,51 @@ perl4caml_get_sv (value optcreate, value name)
 }
 
 CAMLprim value
+perl4caml_get_av (value optcreate, value name)
+{
+  CAMLparam2 (optcreate, name);
+  CAMLlocal1 (create);
+  AV *av;
+
+  create = unoption (optcreate, Val_false);
+  av = get_av (String_val (name), create == Val_true ? TRUE : FALSE);
+  if (av == NULL) raise_not_found ();
+
+  CAMLreturn (Val_av (av));
+}
+
+CAMLprim value
+perl4caml_get_hv (value optcreate, value name)
+{
+  CAMLparam2 (optcreate, name);
+  CAMLlocal1 (create);
+  HV *hv;
+
+  create = unoption (optcreate, Val_false);
+  hv = get_hv (String_val (name), create == Val_true ? TRUE : FALSE);
+  if (hv == NULL) raise_not_found ();
+
+  CAMLreturn (Val_hv (hv));
+}
+
+static inline void
+check_perl_failure ()
+{
+  SV *errsv = get_sv ("@", TRUE);
+
+  if (SvTRUE (errsv))		/* Equivalent of $@ in Perl. */
+    {
+      CAMLlocal1 (errv);
+      STRLEN n_a;
+      const char *err = SvPV (errsv, n_a);
+
+      errv = copy_string (err);
+
+      raise_with_arg (*caml_named_value ("perl4caml_perl_failure"), errv);
+    }
+}
+
+CAMLprim value
 perl4caml_call (value optsv, value optfnname, value arglist)
 {
   CAMLparam3 (optsv, optfnname, arglist);
@@ -263,23 +641,10 @@ perl4caml_call (value optsv, value optfnname, value arglist)
   FREETMPS;
   LEAVE;
 
-  /* Died with an error?
-   * XXX Actually this doesn't work for some reason.
-   */
-  if (SvTRUE (ERRSV))
-    {
-      STRLEN n_a;
-      const char *err = SvPV (ERRSV, n_a); /* Equivalent of $@ in Perl. */
-
-      errv = copy_string (err);
+  check_perl_failure ();
 
-      raise_with_arg (*caml_named_value ("perl4caml_perl_failure"), errv);
-    }
-  else
-    {
-      svv = Val_sv (sv);
-      CAMLreturn (svv);
-    }
+  svv = Val_sv (sv);
+  CAMLreturn (svv);
 }
 
 CAMLprim value
@@ -343,20 +708,9 @@ perl4caml_call_array (value optsv, value optfnname, value arglist)
   FREETMPS;
   LEAVE;
 
-  /* Died with an error?
-   * XXX Actually this doesn't work for some reason.
-   */
-  if (SvTRUE (ERRSV))
-    {
-      STRLEN n_a;
-      const char *err = SvPV (ERRSV, n_a); /* Equivalent of $@ in Perl. */
-
-      errv = copy_string (err);
+  check_perl_failure ();
 
-      raise_with_arg (*caml_named_value ("perl4caml_perl_failure"), errv);
-    }
-  else
-    CAMLreturn (list);
+  CAMLreturn (list);
 }
 
 CAMLprim value
@@ -393,7 +747,7 @@ perl4caml_call_void (value optsv, value optfnname, value arglist)
   else if (optfnname != Val_int (0))
     {
       fnname = unoption (optfnname, Val_false);
-      count = call_pv (String_val (fnname), G_EVAL|G_VOID);
+      count = call_pv (String_val (fnname), G_EVAL|G_VOID|G_DISCARD);
     }
   else
     {
@@ -404,27 +758,16 @@ perl4caml_call_void (value optsv, value optfnname, value arglist)
 
   SPAGAIN;
 
-  assert (count == 0); /* Pretty sure it should never be anything else. */
+  assert (count == 0);
 
   /* Restore the stack. */
   PUTBACK;
   FREETMPS;
   LEAVE;
 
-  /* Died with an error?
-   * XXX Actually this doesn't work for some reason.
-   */
-  if (SvTRUE (ERRSV))
-    {
-      STRLEN n_a;
-      const char *err = SvPV (ERRSV, n_a); /* Equivalent of $@ in Perl. */
-
-      errv = copy_string (err);
+  check_perl_failure ();
 
-      raise_with_arg (*caml_named_value ("perl4caml_perl_failure"), errv);
-    }
-  else
-    CAMLreturn (Val_unit);
+  CAMLreturn (Val_unit);
 }
 
 CAMLprim value
@@ -435,35 +778,12 @@ perl4caml_eval (value expr)
   SV *sv;
   CAMLlocal2 (errv, svv);
 
-  ENTER;
-  SAVETMPS;
-
-  PUSHMARK (SP);
-  eval_pv (String_val (expr), G_SCALAR);
+  sv = eval_pv (String_val (expr), G_SCALAR);
 
-  SPAGAIN;
-  sv = newSVsv (POPs);
-  PUTBACK;
-  FREETMPS;
-  LEAVE;
+  check_perl_failure ();
 
-  /* Died with an error?
-   * XXX Actually this doesn't work for some reason.
-   */
-  if (SvTRUE (ERRSV))
-    {
-      STRLEN n_a;
-      const char *err = SvPV (ERRSV, n_a); /* Equivalent of $@ in Perl. */
-
-      errv = copy_string (err);
-
-      raise_with_arg (*caml_named_value ("perl4caml_perl_failure"), errv);
-    }
-  else
-    {
-      svv = Val_sv (sv);
-      CAMLreturn (svv);
-    }
+  svv = Val_sv (sv);
+  CAMLreturn (svv);
 }
 
 CAMLprim value
@@ -508,23 +828,10 @@ perl4caml_call_method (value ref, value name, value arglist)
   FREETMPS;
   LEAVE;
 
-  /* Died with an error?
-   * XXX Actually this doesn't work for some reason.
-   */
-  if (SvTRUE (ERRSV))
-    {
-      STRLEN n_a;
-      const char *err = SvPV (ERRSV, n_a); /* Equivalent of $@ in Perl. */
-
-      errv = copy_string (err);
+  check_perl_failure ();
 
-      raise_with_arg (*caml_named_value ("perl4caml_perl_failure"), errv);
-    }
-  else
-    {
-      svv = Val_sv (sv);
-      CAMLreturn (svv);
-    }
+  svv = Val_sv (sv);
+  CAMLreturn (svv);
 }
 
 CAMLprim value
@@ -575,20 +882,9 @@ perl4caml_call_method_array (value ref, value name, value arglist)
   FREETMPS;
   LEAVE;
 
-  /* Died with an error?
-   * XXX Actually this doesn't work for some reason.
-   */
-  if (SvTRUE (ERRSV))
-    {
-      STRLEN n_a;
-      const char *err = SvPV (ERRSV, n_a); /* Equivalent of $@ in Perl. */
+  check_perl_failure ();
 
-      errv = copy_string (err);
-
-      raise_with_arg (*caml_named_value ("perl4caml_perl_failure"), errv);
-    }
-  else
-    CAMLreturn (list);
+  CAMLreturn (list);
 }
 
 CAMLprim value
@@ -619,31 +915,20 @@ perl4caml_call_method_void (value ref, value name, value arglist)
 
   PUTBACK;
 
-  count = call_method (String_val (name), G_EVAL|G_VOID);
+  count = call_method (String_val (name), G_EVAL|G_VOID|G_DISCARD);
 
   SPAGAIN;
 
-  assert (count == 0); /* Pretty sure it should never be anything else. */
+  assert (count == 0);
 
   /* Restore the stack. */
   PUTBACK;
   FREETMPS;
   LEAVE;
 
-  /* Died with an error?
-   * XXX Actually this doesn't work for some reason.
-   */
-  if (SvTRUE (ERRSV))
-    {
-      STRLEN n_a;
-      const char *err = SvPV (ERRSV, n_a); /* Equivalent of $@ in Perl. */
-
-      errv = copy_string (err);
+  check_perl_failure ();
 
-      raise_with_arg (*caml_named_value ("perl4caml_perl_failure"), errv);
-    }
-  else
-    CAMLreturn (Val_unit);
+  CAMLreturn (Val_unit);
 }
 
 CAMLprim value
@@ -687,23 +972,10 @@ perl4caml_call_class_method (value classname, value name, value arglist)
   FREETMPS;
   LEAVE;
 
-  /* Died with an error?
-   * XXX Actually this doesn't work for some reason.
-   */
-  if (SvTRUE (ERRSV))
-    {
-      STRLEN n_a;
-      const char *err = SvPV (ERRSV, n_a); /* Equivalent of $@ in Perl. */
-
-      errv = copy_string (err);
+  check_perl_failure ();
 
-      raise_with_arg (*caml_named_value ("perl4caml_perl_failure"), errv);
-    }
-  else
-    {
-      svv = Val_sv (sv);
-      CAMLreturn (svv);
-    }
+  svv = Val_sv (sv);
+  CAMLreturn (svv);
 }
 
 CAMLprim value
@@ -753,20 +1025,9 @@ perl4caml_call_class_method_array (value classname, value name, value arglist)
   FREETMPS;
   LEAVE;
 
-  /* Died with an error?
-   * XXX Actually this doesn't work for some reason.
-   */
-  if (SvTRUE (ERRSV))
-    {
-      STRLEN n_a;
-      const char *err = SvPV (ERRSV, n_a); /* Equivalent of $@ in Perl. */
+  check_perl_failure ();
 
-      errv = copy_string (err);
-
-      raise_with_arg (*caml_named_value ("perl4caml_perl_failure"), errv);
-    }
-  else
-    CAMLreturn (list);
+  CAMLreturn (list);
 }
 
 CAMLprim value
@@ -796,31 +1057,20 @@ perl4caml_call_class_method_void (value classname, value name, value arglist)
 
   PUTBACK;
 
-  count = call_method (String_val (name), G_EVAL|G_VOID);
+  count = call_method (String_val (name), G_EVAL|G_VOID|G_DISCARD);
 
   SPAGAIN;
 
-  assert (count == 0); /* Pretty sure it should never be anything else. */
+  assert (count == 0);
 
   /* Restore the stack. */
   PUTBACK;
   FREETMPS;
   LEAVE;
 
-  /* Died with an error?
-   * XXX Actually this doesn't work for some reason.
-   */
-  if (SvTRUE (ERRSV))
-    {
-      STRLEN n_a;
-      const char *err = SvPV (ERRSV, n_a); /* Equivalent of $@ in Perl. */
-
-      errv = copy_string (err);
+  check_perl_failure ();
 
-      raise_with_arg (*caml_named_value ("perl4caml_perl_failure"), errv);
-    }
-  else
-    CAMLreturn (Val_unit);
+  CAMLreturn (Val_unit);
 }
 
 static value