/* Interface to Perl from OCaml.
* Copyright (C) 2003 Merjis Ltd.
- * $Id: perl_c.c,v 1.16 2004-11-03 14:15:18 rich Exp $
+ * $Id: perl_c.c,v 1.22 2005-02-13 16:33:27 rich Exp $
*/
#include <stdio.h>
#include <unistd.h>
#include <alloca.h>
+#define CAML_NAME_SPACE 1
+
#include <caml/alloc.h>
#include <caml/callback.h>
#include <caml/custom.h>
#include <caml/memory.h>
#include <caml/mlvalues.h>
-/* XXX This was required to avoid an error on my machine when loading the Perl
- * headers. Not clear why this is missing.
- */
-#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 Av_val(avv) ((AV *) Xv_val (avv))
#define Val_hv(hv) (Val_xv ((SV *)(hv)))
#define Hv_val(hvv) ((HV *) Xv_val (hvv))
+#define Val_he(he) (Val_voidptr ((he)))
+#define He_val(hev) (Voidptr_val (HE, (hev)))
static void
xs_init (pTHX)
{
CAMLparam1 (unit);
int argc = 4;
- static char *argv[] = { "", "-w", "-e", "0" };
+ static char *argv[] = { "", "-w", "-e", "0", NULL };
- PERL_SYS_INIT3 (NULL, NULL, NULL);
+ PERL_SYS_INIT (&argc, &argv);
my_perl = perl_alloc ();
perl_construct (my_perl);
PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
- perl_parse (my_perl, xs_init, argc, argv, NULL);
+ perl_parse (my_perl, xs_init, argc, argv, (char **) NULL);
/*perl_run (my_perl);*/
CAMLreturn (Val_unit);
CAMLparam1 (svv);
SV *sv = Sv_val (svv);
CAMLlocal1 (f);
- f = copy_double (SvNV (sv));
+ f = caml_copy_double (SvNV (sv));
CAMLreturn (f);
}
STRLEN len;
CAMLlocal1 (strv);
str = SvPV (sv, len);
- /* XXX This won't work if the string contains NUL. */
- strv = copy_string (str);
+ strv = caml_alloc_string (len);
+ memcpy (String_val (strv), str, len);
CAMLreturn (strv);
}
perl4caml_sv_of_string (value strv)
{
CAMLparam1 (strv);
- CAMLreturn (Val_sv (newSVpv (String_val (strv), string_length (strv))));
+ CAMLreturn (Val_sv (newSVpv (String_val (strv), caml_string_length (strv))));
}
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
}
CAMLprim value
+perl4caml_address_of_sv (value svv)
+{
+ CAMLparam1 (svv);
+ SV *sv = Sv_val (svv);
+ CAMLreturn (caml_copy_nativeint ((long) sv));
+}
+
+CAMLprim value
+perl4caml_address_of_av (value avv)
+{
+ CAMLparam1 (avv);
+ AV *av = Av_val (avv);
+ CAMLreturn (caml_copy_nativeint ((long) av));
+}
+
+CAMLprim value
+perl4caml_address_of_hv (value hvv)
+{
+ CAMLparam1 (hvv);
+ HV *hv = Hv_val (hvv);
+ CAMLreturn (caml_copy_nativeint ((long) hv));
+}
+
+CAMLprim value
perl4caml_scalarref (value svv)
{
CAMLparam1 (svv);
SV *sv = Sv_val (svv);
if (!SvROK (sv))
- invalid_argument ("deref: SV is not a reference");
+ caml_invalid_argument ("deref: SV is not a reference");
switch (SvTYPE (SvRV (sv))) {
case SVt_IV:
case SVt_NV:
case SVt_PVMG:
break;
default:
- invalid_argument ("deref: SV is not a reference to a scalar");
+ caml_invalid_argument ("deref: SV is not a reference to a scalar");
}
- rsvv = Val_sv (SvRV (sv));
+ sv = SvRV (sv);
+ /* Increment the reference count because we're creating another
+ * value pointing at the referenced SV.
+ */
+ sv = SvREFCNT_inc (sv);
+ rsvv = Val_sv (sv);
CAMLreturn (rsvv);
}
SV *sv = Sv_val (svv);
if (!SvROK (sv))
- invalid_argument ("deref_array: SV is not a reference");
+ caml_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");
+ caml_invalid_argument ("deref_array: SV is not a reference to an array");
}
- ravv = Val_av ((AV *) SvRV (sv));
+ sv = SvRV (sv);
+ /* Increment the reference count because we're creating another
+ * value pointing at the referenced AV.
+ */
+ sv = SvREFCNT_inc (sv);
+ ravv = Val_av ((AV *) sv);
CAMLreturn (ravv);
}
SV *sv = Sv_val (svv);
if (!SvROK (sv))
- invalid_argument ("deref_hash: SV is not a reference");
+ caml_invalid_argument ("deref_hash: SV is not a reference");
switch (SvTYPE (SvRV (sv))) {
case SVt_PVHV:
break;
default:
- invalid_argument ("deref_hash: SV is not a reference to a hash");
+ caml_invalid_argument ("deref_hash: SV is not a reference to a hash");
}
- rhvv = Val_hv ((HV *) SvRV (sv));
+ sv = SvRV (sv);
+ /* Increment the reference count because we're creating another
+ * value pointing at the referenced HV.
+ */
+ sv = SvREFCNT_inc (sv);
+ rhvv = Val_hv ((HV *) sv);
CAMLreturn (rhvv);
}
CAMLparam1 (avv);
AV *av = Av_val (avv);
SV *sv = av_pop (av);
+ /* Increment the reference count because we're creating another
+ * value pointing at the referenced AV.
+ */
+ sv = SvREFCNT_inc (sv);
CAMLreturn (Val_sv (sv));
}
CAMLparam1 (avv);
AV *av = Av_val (avv);
SV *sv = av_shift (av);
+ /* Increment the reference count because we're creating another
+ * value pointing at the referenced AV.
+ */
+ sv = SvREFCNT_inc (sv);
CAMLreturn (Val_sv (sv));
}
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");
+ if (svp == 0) caml_invalid_argument ("av_get: index out of bounds");
+ /* Increment the reference count because we're creating another
+ * value pointing at the referenced AV.
+ */
+ *svp = SvREFCNT_inc (*svp);
CAMLreturn (Val_sv (*svp));
}
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)
+ if (hv_store (hv, String_val (key), caml_string_length (key), sv, 0) == 0)
SvREFCNT_dec (sv);
CAMLreturn (Val_unit);
}
{
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 ();
+ SV **svp = hv_fetch (hv, String_val (key), caml_string_length (key), 0);
+ if (svp == 0) caml_raise_not_found ();
+ /* Increment the reference count because we're creating another
+ * value pointing at the referenced SV.
+ */
+ SvREFCNT_inc (*svp);
CAMLreturn (Val_sv (*svp));
}
{
CAMLparam2 (hvv, key);
HV *hv = Hv_val (hvv);
- bool r = hv_exists (hv, String_val (key), string_length (key));
+ bool r = hv_exists (hv, String_val (key), caml_string_length (key));
CAMLreturn (r ? Val_true : Val_false);
}
{
CAMLparam2 (hvv, key);
HV *hv = Hv_val (hvv);
- hv_delete (hv, String_val (key), string_length (key), G_DISCARD);
+ hv_delete (hv, String_val (key), caml_string_length (key), G_DISCARD);
CAMLreturn (Val_unit);
}
}
CAMLprim value
+perl4caml_hv_iterinit (value hvv)
+{
+ CAMLparam1 (hvv);
+ HV *hv = Hv_val (hvv);
+ int i = hv_iterinit (hv);
+ CAMLreturn (caml_copy_int32 (i));
+}
+
+CAMLprim value
+perl4caml_hv_iternext (value hvv)
+{
+ CAMLparam1 (hvv);
+ CAMLlocal1 (hev);
+ HV *hv = Hv_val (hvv);
+ HE *he = hv_iternext (hv);
+ if (he == NULL) caml_raise_not_found ();
+ hev = Val_he (he);
+ CAMLreturn (hev);
+}
+
+CAMLprim value
+perl4caml_hv_iterkey (value hev)
+{
+ CAMLparam1 (hev);
+ CAMLlocal1 (strv);
+ HE *he = He_val (hev);
+ I32 len;
+ char *str = hv_iterkey (he, &len);
+ strv = caml_alloc_string (len);
+ memcpy (String_val (strv), str, len);
+ CAMLreturn (strv);
+}
+
+CAMLprim value
+perl4caml_hv_iterval (value hvv, value hev)
+{
+ CAMLparam2 (hvv, hev);
+ CAMLlocal1 (svv);
+ HV *hv = Hv_val (hvv);
+ HE *he = He_val (hev);
+ SV *sv = hv_iterval (hv, he);
+ SvREFCNT_inc (sv);
+ svv = Val_sv (sv);
+ CAMLreturn (svv);
+}
+
+CAMLprim value
+perl4caml_hv_iternextsv (value hvv)
+{
+ CAMLparam1 (hvv);
+ CAMLlocal3 (strv, svv, rv);
+ HV *hv = Hv_val (hvv);
+ char *str; I32 len;
+ SV *sv = hv_iternextsv (hv, &str, &len);
+ if (sv == NULL) caml_raise_not_found ();
+ SvREFCNT_inc (sv);
+ svv = Val_sv (sv);
+ strv = caml_alloc_string (len);
+ memcpy (String_val (strv), str, len);
+ /* Construct a tuple (strv, svv). */
+ rv = caml_alloc_tuple (2);
+ Field (rv, 0) = strv;
+ Field (rv, 1) = svv;
+ CAMLreturn (rv);
+}
+
+CAMLprim value
perl4caml_get_sv (value optcreate, value name)
{
CAMLparam2 (optcreate, name);
create = unoption (optcreate, Val_false);
sv = get_sv (String_val (name), create == Val_true ? TRUE : FALSE);
- if (sv == NULL) raise_not_found ();
+ if (sv == NULL) caml_raise_not_found ();
+
+ /* Increment the reference count because we're creating another
+ * value pointing at the referenced SV.
+ */
+ SvREFCNT_inc (sv);
CAMLreturn (Val_sv (sv));
}
create = unoption (optcreate, Val_false);
av = get_av (String_val (name), create == Val_true ? TRUE : FALSE);
- if (av == NULL) raise_not_found ();
+ if (av == NULL) caml_raise_not_found ();
+
+ /* Increment the reference count because we're creating another
+ * value pointing at the AV.
+ */
+ SvREFCNT_inc (av);
CAMLreturn (Val_av (av));
}
create = unoption (optcreate, Val_false);
hv = get_hv (String_val (name), create == Val_true ? TRUE : FALSE);
- if (hv == NULL) raise_not_found ();
+ if (hv == NULL) caml_raise_not_found ();
+
+ /* Increment the reference count because we're creating another
+ * value pointing at the HV.
+ */
+ SvREFCNT_inc (hv);
CAMLreturn (Val_hv (hv));
}
STRLEN n_a;
const char *err = SvPV (errsv, n_a);
- errv = copy_string (err);
+ errv = caml_copy_string (err);
- raise_with_arg (*caml_named_value ("perl4caml_perl_failure"), errv);
+ caml_raise_with_arg (*caml_named_value ("perl4caml_perl_failure"), errv);
}
}
for (i = 0; i < count; ++i) {
SV *sv;
- cons = alloc (2, 0);
+ cons = caml_alloc (2, 0);
Field (cons, 1) = list;
list = cons;
sv = newSVsv (POPs);
for (i = 0; i < count; ++i) {
SV *sv;
- cons = alloc (2, 0);
+ cons = caml_alloc (2, 0);
Field (cons, 1) = list;
list = cons;
sv = newSVsv (POPs);
*/
list = Val_int (0);
for (i = 0; i < count; ++i) {
- cons = alloc (2, 0);
+ cons = caml_alloc (2, 0);
Field (cons, 1) = list;
list = cons;
Field (cons, 0) = Val_sv (newSVsv (POPs));
{
CAMLparam0 ();
CAMLlocal1 (rv);
- rv = alloc (1, Abstract_tag);
+ rv = caml_alloc (1, Abstract_tag);
Field(rv, 0) = (value) ptr;
CAMLreturn (rv);
}
static void
xv_finalize (value v)
{
+ /*fprintf (stderr, "about to decrement %p\n", Xv_val (v));*/
SvREFCNT_dec ((SV *) Xv_val (v));
}
{
CAMLparam0 ();
CAMLlocal1 (rv);
- rv = alloc_custom (&xv_custom_operations, sizeof (void *), 0, 1);
+ rv = caml_alloc_custom (&xv_custom_operations, sizeof (void *), 0, 1);
Xv_val (rv) = sv;
CAMLreturn (rv);
}
git.annexia.org / perl4caml.git / blobdiff