X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=perl.ml;h=a193446151554315a33b61c7edc7dcb303c5fa97;hb=e9cc6835fd3d69f062f6e5f5e389e63cbc43477b;hp=a82755b0cec9d1ac28ed8a748c573d75c907f2ae;hpb=9e543055271a1ec799d56f507ab048c78d3d7a88;p=perl4caml.git

diff --git a/perl.ml b/perl.ml
index a82755b..a193446 100644
--- a/perl.ml
+++ b/perl.ml
@@ -1,37 +1,30 @@
 (* Interface to Perl from OCaml.
  * Copyright (C) 2003 Merjis Ltd.
- * $Id: perl.ml,v 1.5 2003-10-14 16:05:21 rich Exp $
+ * $Id: perl.ml,v 1.11 2003-12-11 17:41:52 rich Exp $
  *)
 
-type t
-
 type sv
 type av
+type hv
 
 exception Perl_failure of string
 
+(* Initialization. This must happen first, otherwise other parts of the
+ * program will segfault because of a missing interpreter.
+ *)
 external c_init : unit -> unit = "perl4caml_init"
-let init () =
+let () =
   Callback.register_exception "perl4caml_perl_failure" (Perl_failure "");
-  c_init ()				(* Initialise C code. *)
-
-external destroy : unit -> unit
-  = "perl4caml_destroy"
-
-external create : ?args:string array -> unit -> t
-  = "perl4caml_create"
-
-external set_context : t -> unit
-  = "perl4caml_set_context"
+  c_init ();				(* Initialise C code. *)
+  ()
 
 external int_of_sv : sv -> int = "perl4caml_int_of_sv"
 external sv_of_int : int -> sv = "perl4caml_sv_of_int"
-external float_of_sv : sv -> int = "perl4caml_float_of_sv"
-external sv_of_float : int -> sv = "perl4caml_sv_of_float"
+external float_of_sv : sv -> float = "perl4caml_float_of_sv"
+external sv_of_float : float -> sv = "perl4caml_sv_of_float"
 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_undef : unit -> sv = "perl4caml_sv_undef"
 external sv_yes : unit -> sv = "perl4caml_sv_yes"
 external sv_no : unit -> sv = "perl4caml_sv_no"
@@ -54,6 +47,8 @@ type sv_t    = SVt_NULL
 	     | SVt_PVMG
 
 external sv_type : sv -> sv_t = "perl4caml_sv_type"
+let sv_is_undef sv =
+  SVt_NULL = sv_type sv
 
 let string_of_sv_t = function
     SVt_NULL  -> "SVt_NULL"
@@ -67,8 +62,13 @@ let string_of_sv_t = function
   | SVt_PVGV  -> "SVt_PVGV"
   | SVt_PVMG  -> "SVt_PVMG"
 
+external scalarref : sv -> sv = "perl4caml_scalarref"
+external arrayref : av -> sv = "perl4caml_arrayref"
+external hashref : hv -> sv = "perl4caml_hashref"
+
 external deref : sv -> sv = "perl4caml_deref"
 external deref_array : sv -> av = "perl4caml_deref_array"
+external deref_hash : sv -> hv = "perl4caml_deref_hash"
 
 external av_empty : unit -> av = "perl4caml_av_empty"
 external av_of_sv_list : sv list -> av = "perl4caml_av_of_sv_list"
@@ -90,8 +90,27 @@ let av_map f av =
   done;
   List.rev !list
 
+let list_of_av av =
+  let list = ref [] in
+  for i = 0 to av_length av - 1 do
+    list := av_get av i :: !list
+  done;
+  List.rev !list
+
+let av_of_string_list strs =
+  av_of_sv_list (List.map sv_of_string strs)
+
+external hv_empty : unit -> hv = "perl4caml_hv_empty"
+external hv_set : hv -> string -> sv -> unit = "perl4caml_hv_set"
+external hv_get : hv -> string -> sv = "perl4caml_hv_get"
+external hv_exists : hv -> string -> bool = "perl4caml_hv_exists"
+external hv_delete : hv -> string -> unit = "perl4caml_hv_delete"
+external hv_clear : hv -> unit = "perl4caml_hv_clear"
+external hv_undef : hv -> unit = "perl4caml_hv_undef"
+
 external get_sv : ?create:bool -> string -> sv = "perl4caml_get_sv"
 external get_av : ?create:bool -> string -> av = "perl4caml_get_av"
+external get_hv : ?create:bool -> string -> hv = "perl4caml_get_hv"
 
 external call : ?sv:sv -> ?fn:string -> sv list -> sv
   = "perl4caml_call"