/* Interface to Perl from OCaml.
* Copyright (C) 2003 Merjis Ltd.
- * $Id: perl_c.c,v 1.5 2003-10-14 16:05:21 rich Exp $
+ * $Id: perl_c.c,v 1.6 2003-10-15 16:51:12 rich Exp $
*/
#include <stdio.h>
#define Val_av(av) (Val_voidptr ((av)))
#define Av_val(avv) (Voidptr_val (AV, (avv)))
-static void
-xs_init (pTHX)
+CAMLprim value
+perl4caml_init (value unit)
{
- char *file = __FILE__;
- EXTERN_C void boot_DynaLoader (pTHX_ CV* cv);
-
- newXS("DynaLoader::boot_DynaLoader", boot_DynaLoader, file);
+ CAMLparam1 (unit);
+ PERL_SYS_INIT3 (NULL, NULL, NULL);
+ return Val_unit;
}
CAMLprim value
-perl4caml_init (value unit)
+perl4caml_current_interpreter (value unit)
{
- static char *argv[] = { "", "-w", "-e", "0" };
- int argc = sizeof argv / sizeof argv[0];
-
- PERL_SYS_INIT3 (NULL, NULL, NULL);
+ CAMLparam1 (unit);
+ if (my_perl == 0) raise_not_found ();
+ return Val_perl (my_perl);
+}
- /* Create a default interpreter. */
- 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_run (my_perl);*/
+static void
+xs_init (pTHX)
+{
+ char *file = __FILE__;
+ EXTERN_C void boot_DynaLoader (pTHX_ CV* cv);
- return Val_unit;
+ newXS("DynaLoader::boot_DynaLoader", boot_DynaLoader, file);
}
CAMLprim value
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. */
}
CAMLprim value
-perl4caml_destroy (value unit)
+perl4caml_destroy (value plv)
{
- CAMLparam1 (unit);
+ CAMLparam1 (plv);
+ PerlInterpreter *pl = Perl_val (plv);
- perl_destruct (my_perl);
- perl_free (my_perl);
+ perl_destruct (pl);
+ perl_free (pl);
- /* Force a segfault if someone tries to use a Perl function without
- * creating another interpreter first.
- */
- my_perl = 0;
+ /* Current interpreter? */
+ if (my_perl == pl) my_perl = 0;
CAMLreturn (Val_unit);
}