/* Interface to Perl from OCaml.
* Copyright (C) 2003 Merjis Ltd.
- * $Id: perl_c.c,v 1.6 2003-10-15 16:51:12 rich Exp $
+ * $Id: perl_c.c,v 1.12 2003-11-19 16:28:22 rich Exp $
*/
#include <stdio.h>
*/
#define off64_t __off64_t
+/* XXX This is required by Perl >= 5.8.2. */
+#define __USE_GNU
+#include <crypt.h>
+
#include <EXTERN.h>
#include <perl.h>
#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
{
CAMLparam1 (unit);
if (my_perl == 0) raise_not_found ();
- return Val_perl (my_perl);
+ CAMLreturn (Val_perl (my_perl));
}
static void
}
CAMLprim value
-perl4caml_sv_is_undef (value svv)
-{
- CAMLparam1 (svv);
- SV *sv = Sv_val (svv);
- CAMLreturn (sv == &PL_sv_undef ? Val_true : Val_false);
-}
-
-CAMLprim value
perl4caml_sv_undef (value unit)
{
CAMLparam1 (unit);
- CAMLreturn (Val_sv (&PL_sv_undef));
+ CAMLreturn (Val_sv (newSV (0)));
}
CAMLprim value
}
CAMLprim value
+perl4caml_scalarref (value svv)
+{
+ 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_deref (value svv)
{
CAMLparam1 (svv);
}
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);
}
CAMLprim value
+perl4caml_hv_empty (value unit)
+{
+ CAMLparam1 (unit);
+ 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
perl4caml_get_sv (value optcreate, value name)
{
CAMLparam2 (optcreate, name);
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 ()
{
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
{
SPAGAIN;
- assert (count == 0); /* Pretty sure it should never be anything else. */
+ assert (count == 0);
/* Restore the stack. */
PUTBACK;
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;
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;