Merge pull request #229 from glondu/fix-obsolete-libraries

Fix obsolete libraries

Author: balat

Makefile.options

@@ -23,7 +23,7 @@ INCS=   -I ${BLD}/server/.ocsigenserver.objs/byte \
 ## ${SERVER_PACKAGE} is not only used to build the 'ocsigenserver' executable
 ## but also to generate src/baselib/ocsigen_config_static.ml
 
-SERVER_PACKAGE := lwt_ssl,bytes,lwt.unix,lwt_log,ipaddr,findlib,cryptokit,pcre,str,xml-light,dynlink,cohttp-lwt-unix,hmap
+SERVER_PACKAGE := lwt_ssl,bytes,lwt.unix,lwt_log,ipaddr,findlib,cryptokit,re,str,xml-light,dynlink,cohttp-lwt-unix,hmap
 
 LIBS := -package ${SERVER_PACKAGE} ${INCS}
 

configure

@@ -401,7 +401,7 @@ check_library lwt_react   "See: http://ocsigen.org/lwt"
 check_library lwt_ssl   "See: http://ocsigen.org/lwt"
 check_library lwt_log   "See: http://ocsigen.org/lwt"
 
-check_library pcre "See: http://ocaml.info/home/ocaml_sources.html"
+check_library re "See: https://github.com/ocaml/ocaml-re/"
 check_library cryptokit "See: http://pauillac.inria.fr/~xleroy/software.html#cryptokit"
 
 check_library xml-light "See: https://github.com/ncannasse/xml-light"

ocsigenserver.opam

@@ -54,10 +54,10 @@ depends: [
   "lwt_ssl"
   "lwt_react"
   "lwt_log"
-  "pcre"
+  "re" {>= "1.11.0"}
   "cryptokit"
   "ipaddr" {>= "2.1"}
-  "cohttp-lwt-unix" {< "5.0.0"}
+  "cohttp-lwt-unix" {>= "5.0.0"}
   "conduit-lwt-unix" {>= "2.0.0"}
   "hmap"
   "xml-light"

src/baselib/dune

@@ -18,7 +18,7 @@
     ocsigen_loader
     ocsigen_stream)
   (libraries
-     str findlib lwt_log lwt.unix cryptokit pcre ocsigen_lib_base
+     str findlib lwt_log lwt.unix cryptokit re ocsigen_lib_base
      (select dynlink_wrapper.ml from
        (dynlink -> dynlink_wrapper.natdynlink.ml)
        (_ -> dynlink_wrapper.nonatdynlink.ml))))

src/baselib/ocsigen_lib.ml

@@ -100,47 +100,44 @@ let make_cryptographic_safe_string =
 *)
 
 module Netstring_pcre = struct
+  module Pcre = Re.Pcre
+
   let regexp s = Pcre.regexp ~flags:[`MULTILINE] s
   let templ_re = Pcre.regexp "(?:\\\\\\d)|[\\$\\\\]"
 
-  let tr_templ s =
-    (* Convert \n to $n etc. *)
-    (* Unfortunately we cannot just replace \ by $. *)
+  let tr_templ s g =
+    (* Instantiate backreferences in s based on match g *)
+    let b = Buffer.create (String.length s) in
     let rec tr l =
       match l with
-      | Pcre.Delim "$" :: l' -> "$$" :: tr l'
-      | Pcre.Delim "\\" :: Pcre.Delim "$" :: l' -> "$$" :: tr l'
-      | Pcre.Delim "\\" :: Pcre.Delim s :: l' -> s :: tr l'
-      | Pcre.Delim "\\" :: Pcre.Text s :: l' -> s :: tr l'
+      | Pcre.Delim "$" :: l' -> Buffer.add_char b '$'; tr l'
+      | Pcre.Delim "\\" :: Pcre.Delim s :: l' -> Buffer.add_string b s; tr l'
+      | Pcre.Delim "\\" :: Pcre.Text s :: l' -> Buffer.add_string b s; tr l'
       | [Pcre.Delim "\\"] -> failwith "trailing backslash"
       | Pcre.Delim d :: l' ->
           assert (d.[0] = '\\');
           let n = Char.code d.[1] - Char.code '0' in
-          if n = 0
-          then "$&" :: tr l'
-          else ("$" ^ string_of_int n ^ "$!") :: tr l'
-      | Pcre.Text t :: l' -> t :: tr l'
+          Buffer.add_string b (Re.Group.get g n);
+          tr l'
+      | Pcre.Text t :: l' -> Buffer.add_string b t; tr l'
       | Pcre.Group (_, _) :: _ -> assert false
       | Pcre.NoGroup :: _ -> assert false
-      | [] -> []
+      | [] -> ()
     in
     let l = Pcre.full_split ~rex:templ_re ~max:(-1) s in
-    String.concat "" (tr l)
+    tr l; Buffer.contents b
 
   let matched_group result n _ =
-    if n < 0 || n >= Pcre.num_of_subs result then raise Not_found;
+    if n < 0 || n >= Re.Group.nb_groups result then raise Not_found;
     ignore (Pcre.get_substring_ofs result n);
     Pcre.get_substring result n
 
   let matched_string result _ =
     ignore (Pcre.get_substring_ofs result 0);
     Pcre.get_substring result 0
 
-  let global_replace pat templ s =
-    Pcre.replace ~rex:pat ~itempl:(Pcre.subst (tr_templ templ)) s
-
-  let global_substitute pat subst s =
-    Pcre.substitute_substrings ~rex:pat ~subst:(fun r -> subst r s) s
+  let global_replace pat templ s = Re.replace pat ~f:(tr_templ templ) s
+  let global_substitute pat subst s = Re.replace pat ~f:(fun r -> subst r s) s
 
   let search_forward pat s pos =
     let result = Pcre.exec ~rex:pat ~pos s in
@@ -149,14 +146,6 @@ module Netstring_pcre = struct
   let string_after s n = String.sub s n (String.length s - n)
 
   let bounded_split expr text num =
-    let start =
-      try
-        let start_substrs = Pcre.exec ~rex:expr ~flags:[`ANCHORED] text in
-        (* or Not_found *)
-        let _, match_end = Pcre.get_substring_ofs start_substrs 0 in
-        match_end
-      with Not_found -> 0
-    in
     let rec split start n =
       if start >= String.length text
       then []
@@ -167,21 +156,24 @@ module Netstring_pcre = struct
           let next_substrs = Pcre.exec ~rex:expr ~pos:start text in
           (* or Not_found *)
           let pos, match_end = Pcre.get_substring_ofs next_substrs 0 in
-          String.sub text start (pos - start) :: split match_end (n - 1)
+          if pos = 0
+          then split match_end n (* a leading match is ignored *)
+          else String.sub text start (pos - start) :: split match_end (n - 1)
         with Not_found -> [string_after text start]
     in
-    split start num
+    split 0 num
 
   let split sep s = bounded_split sep s 0
 
   let string_match pat s pos =
     try
-      let result = Pcre.exec ~rex:pat ~flags:[`ANCHORED] ~pos s in
-      Some result
+      let result = Pcre.exec ~rex:pat ~pos s in
+      if Re.Group.start result 0 = pos then Some result else None
     with Not_found -> None
 end
 
 module Url = struct
+  module Pcre = Re.Pcre
   include Url_base
 
   (* Taken from Neturl version 1.1.2 *)

src/baselib/ocsigen_lib.mli

@@ -95,13 +95,15 @@ end
 (* This exists to facilitate transition away from Ocamlnet. Do not use
    for new code! *)
 module Netstring_pcre : sig
+  open Re
+
   val regexp : string -> Pcre.regexp
-  val matched_group : Pcre.substrings -> int -> string -> string
-  val matched_string : Pcre.substrings -> string -> string
+  val matched_group : Pcre.groups -> int -> string -> string
+  val matched_string : Pcre.groups -> string -> string
   val global_replace : Pcre.regexp -> string -> string -> string
-  val search_forward : Pcre.regexp -> string -> int -> int * Pcre.substrings
+  val search_forward : Pcre.regexp -> string -> int -> int * Pcre.groups
   val split : Pcre.regexp -> string -> string list
-  val string_match : Pcre.regexp -> string -> int -> Pcre.substrings option
+  val string_match : Pcre.regexp -> string -> int -> Pcre.groups option
 end
 
 module Date : sig

src/baselib/ocsigen_loader.ml

@@ -147,7 +147,7 @@ let add_ocamlpath p =
 (* Using Findlib to locate files *)
 
 let findfiles =
-  let cmx = Pcre.regexp ~flags:[`MULTILINE; `CASELESS] "\\.cmx($| |a)" in
+  let cmx = Re.Pcre.regexp ~flags:[`MULTILINE; `CASELESS] "\\.cmx($| |a)" in
   fun package ->
     try
       let preds =

src/baselib/ocsigen_stream.ml

@@ -180,7 +180,7 @@ let substream delim s =
   if ldelim = 0
   then Lwt.fail (Stream_error "Empty delimiter")
   else
-    let rdelim = Pcre.(regexp (quote delim)) in
+    let rdelim = Re.Pcre.(regexp (quote delim)) in
     let rec aux = function
       | Finished _ -> Lwt.fail Stream_too_small
       | Cont (s, f) as stre -> (

src/extensions/outputfilter.ml

@@ -21,7 +21,7 @@
 (* This module enables rewritting the server output *)
 
 type header_filter =
-  [ `Rewrite of Ocsigen_header.Name.t * Pcre.regexp * string
+  [ `Rewrite of Ocsigen_header.Name.t * Re.Pcre.regexp * string
   | `Add of Ocsigen_header.Name.t * string * bool option ]
 
 let gen filter = function

src/extensions/outputfilter.mli

@@ -1,5 +1,5 @@
 val mode
-  : [ `Rewrite of Ocsigen_header.Name.t * Pcre.regexp * string
+  : [ `Rewrite of Ocsigen_header.Name.t * Re.Pcre.regexp * string
     | `Add of Ocsigen_header.Name.t * string * bool option
     | `Code of Cohttp.Code.status ]
     Ocsigen_server.Site.Config.key