Updated MANIFEST and bumped version.

[perl4caml.git] / perl.ml

diff --git a/perl.ml b/perl.ml
index b8c1012..a82755b 100644 (file)
--- a/perl.ml
+++ b/perl.ml
@@ -1,25 +1,26 @@
 (* Interface to Perl from OCaml.
  * Copyright (C) 2003 Merjis Ltd.
- * $Id: perl.ml,v 1.3 2003-10-12 11:56:26 rich Exp $
+ * $Id: perl.ml,v 1.5 2003-10-14 16:05:21 rich Exp $
  *)
 
 type t
 
 type sv
+type av
 
 exception Perl_failure of string
 
-external init : unit -> unit = "perl4caml_init"
-let () =
+external c_init : unit -> unit = "perl4caml_init"
+let init () =
   Callback.register_exception "perl4caml_perl_failure" (Perl_failure "");
-  init ()                              (* Initialise C code. *)
+  c_init ()                            (* Initialise C code. *)
+
+external destroy : unit -> unit
+  = "perl4caml_destroy"
 
 external create : ?args:string array -> unit -> t
   = "perl4caml_create"
 
-external destroy : t -> unit
-  = "perl4caml_destroy"
-
 external set_context : t -> unit
   = "perl4caml_set_context"
 
@@ -31,15 +32,66 @@ external string_of_sv : sv -> string = "perl4caml_string_of_sv"
 external sv_of_string : string -> sv = "perl4caml_sv_of_string"
 external sv_is_true : sv -> bool = "perl4caml_sv_is_true"
 external sv_is_undef : sv -> bool = "perl4caml_sv_is_undef"
-external sv_get_undef : unit -> sv = "perl4caml_sv_get_undef"
-external sv_get_yes : unit -> sv = "perl4caml_sv_get_yes"
-external sv_get_no : unit -> sv = "perl4caml_sv_get_no"
+external sv_undef : unit -> sv = "perl4caml_sv_undef"
+external sv_yes : unit -> sv = "perl4caml_sv_yes"
+external sv_no : unit -> sv = "perl4caml_sv_no"
+
+let sv_true () = sv_of_int 1
+let sv_false () = sv_of_int 0
+
+let bool_of_sv = sv_is_true
+let sv_of_bool b = if b then sv_true () else sv_false ()
+
+type sv_t    = SVt_NULL
+             | SVt_IV
+            | SVt_NV
+            | SVt_PV
+            | SVt_RV
+            | SVt_PVAV
+            | SVt_PVHV
+            | SVt_PVCV
+            | SVt_PVGV
+            | SVt_PVMG
+
+external sv_type : sv -> sv_t = "perl4caml_sv_type"
+
+let string_of_sv_t = function
+    SVt_NULL  -> "SVt_NULL"
+  | SVt_IV    -> "SVt_IV"
+  | SVt_NV    -> "SVt_NV"
+  | SVt_PV    -> "SVt_PV"
+  | SVt_RV    -> "SVt_RV"
+  | SVt_PVAV  -> "SVt_PVAV"
+  | SVt_PVHV  -> "SVt_PVHV"
+  | SVt_PVCV  -> "SVt_PVCV"
+  | SVt_PVGV  -> "SVt_PVGV"
+  | SVt_PVMG  -> "SVt_PVMG"
+
+external deref : sv -> sv = "perl4caml_deref"
+external deref_array : sv -> av = "perl4caml_deref_array"
+
+external av_empty : unit -> av = "perl4caml_av_empty"
+external av_of_sv_list : sv list -> av = "perl4caml_av_of_sv_list"
+external av_push : av -> sv -> unit = "perl4caml_av_push"
+external av_pop : av -> sv = "perl4caml_av_pop"
+external av_shift : av -> sv = "perl4caml_av_shift"
+external av_unshift : av -> sv -> unit = "perl4caml_av_unshift"
+external av_length : av -> int = "perl4caml_av_length"
+external av_set : av -> int -> sv -> unit = "perl4caml_av_set"
+external av_get : av -> int -> sv = "perl4caml_av_get"
+external av_clear : av -> unit = "perl4caml_av_clear"
+external av_undef : av -> unit = "perl4caml_av_undef"
+external av_extend : av -> int -> unit = "perl4caml_av_extend"
 
-let sv_undef = sv_get_undef ()
-let sv_true = sv_get_yes ()
-let sv_false = sv_get_no ()
+let av_map f av =
+  let list = ref [] in
+  for i = 0 to av_length av - 1 do
+    list := f (av_get av i) :: !list
+  done;
+  List.rev !list
 
 external get_sv : ?create:bool -> string -> sv = "perl4caml_get_sv"
+external get_av : ?create:bool -> string -> av = "perl4caml_get_av"
 
 external call : ?sv:sv -> ?fn:string -> sv list -> sv
   = "perl4caml_call"