X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=perl.ml;h=770e59a3a7195be8121762808435e24245ea86e2;hb=95d760554441dac36fb77011c0c875490f873d68;hp=6110c20e939dfeff71b22e33f767fbb3e13589c3;hpb=56934c148220f0c06916f0cadf5052a71e8e1541;p=perl4caml.git

diff --git a/perl.ml b/perl.ml
index 6110c20..770e59a 100644
--- a/perl.ml
+++ b/perl.ml
@@ -1,9 +1,24 @@
 (* Interface to Perl from OCaml.
- * Copyright (C) 2003 Merjis Ltd.
- * $Id: perl.ml,v 1.10 2003-10-26 12:57:11 rich Exp $
- *)
 
-type t
+   Copyright (C) 2003 Merjis Ltd.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this library; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   $Id: perl.ml,v 1.16 2008-03-01 13:02:21 rich Exp $
+ *)
 
 type sv
 type av
@@ -11,9 +26,6 @@ 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 +33,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"
@@ -42,6 +43,7 @@ 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_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"
 
@@ -63,8 +65,6 @@ 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"
@@ -78,6 +78,12 @@ let string_of_sv_t = function
   | SVt_PVGV  -> "SVt_PVGV"
   | SVt_PVMG  -> "SVt_PVMG"
 
+external reftype : sv -> sv_t = "perl4caml_reftype"
+
+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"
@@ -124,6 +130,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"