X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=perl.ml;h=95d1629a53247ff488dc782dd8910b4fee50abef;hb=0b407a0c622e181699f5d3984332c5c76f21cdd1;hp=5812a618c0fbd5b1e066b308548264ab985a7aca;hpb=5e86bfad5637289608ed35b439bb5247f96e8453;p=perl4caml.git

diff --git a/perl.ml b/perl.ml
index 5812a61..95d1629 100644
--- a/perl.ml
+++ b/perl.ml
@@ -1,19 +1,14 @@
 (* Interface to Perl from OCaml.
  * Copyright (C) 2003 Merjis Ltd.
- * $Id: perl.ml,v 1.9 2003-10-26 11:22:38 rich Exp $
+ * $Id: perl.ml,v 1.14 2005-01-29 12:22:49 rich Exp $
  *)
 
-type t
-
 type sv
 type av
 type hv
 
 exception Perl_failure of string
 
-external create : ?args:string array -> unit -> t
-  = "perl4caml_create"
-
 (* Initialization. This must happen first, otherwise other parts of the
  * program will segfault because of a missing interpreter.
  *)
@@ -21,19 +16,8 @@ external c_init : unit -> unit = "perl4caml_init"
 let () =
   Callback.register_exception "perl4caml_perl_failure" (Perl_failure "");
   c_init ();				(* Initialise C code. *)
-  (* Create the default interpreter. *)
-  create ~args:[| ""; "-w"; "-e"; "0" |] ();
   ()
 
-external current_interpreter : unit -> t
-  = "perl4caml_current_interpreter"
-
-external destroy : t -> unit
-  = "perl4caml_destroy"
-
-external set_context : t -> unit
-  = "perl4caml_set_context"
-
 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 -> float = "perl4caml_float_of_sv"
@@ -41,8 +25,8 @@ 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_is_undef : sv -> bool = "perl4caml_sv_is_undef"
 external sv_yes : unit -> sv = "perl4caml_sv_yes"
 external sv_no : unit -> sv = "perl4caml_sv_no"
 
@@ -77,6 +61,10 @@ let string_of_sv_t = function
   | SVt_PVGV  -> "SVt_PVGV"
   | SVt_PVMG  -> "SVt_PVMG"
 
+external address_of_sv : sv -> Nativeint.t = "perl4caml_address_of_sv"
+external address_of_av : av -> Nativeint.t = "perl4caml_address_of_av"
+external address_of_hv : hv -> Nativeint.t = "perl4caml_address_of_hv"
+
 external scalarref : sv -> sv = "perl4caml_scalarref"
 external arrayref : av -> sv = "perl4caml_arrayref"
 external hashref : hv -> sv = "perl4caml_hashref"
@@ -123,6 +111,53 @@ 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"
 
+type he
+external hv_iterinit : hv -> Int32.t = "perl4caml_hv_iterinit"
+external hv_iternext : hv -> he = "perl4caml_hv_iternext"
+external hv_iterkey : he -> string = "perl4caml_hv_iterkey"
+external hv_iterval : hv -> he -> sv = "perl4caml_hv_iterval"
+external hv_iternextsv : hv -> string * sv = "perl4caml_hv_iternextsv"
+
+let hv_of_assoc xs =
+  let hv = hv_empty () in
+  List.iter (fun (k, v) -> hv_set hv k v) xs;
+  hv
+let assoc_of_hv hv =
+  ignore (hv_iterinit hv);
+  (* Someone please rewrite this to make it tail-rec! - Rich. XXX *)
+  let rec loop acc =
+    try
+      let k, v = hv_iternextsv hv in
+      loop ((k, v) :: acc)
+    with
+	Not_found -> acc
+  in
+  loop []
+let hv_keys hv =
+  ignore (hv_iterinit hv);
+  (* Someone please rewrite this to make it tail-rec! - Rich. XXX *)
+  let rec loop acc =
+    try
+      let he = hv_iternext hv in
+      let k = hv_iterkey he in
+      loop (k :: acc)
+    with
+	Not_found -> acc
+  in
+  loop []
+let hv_values hv =
+  ignore (hv_iterinit hv);
+  (* Someone please rewrite this to make it tail-rec! - Rich. XXX *)
+  let rec loop acc =
+    try
+      let he = hv_iternext hv in
+      let v = hv_iterval hv he in
+      loop (v :: acc)
+    with
+	Not_found -> acc
+  in
+  loop []
+
 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"