Remove calls to deprecated String.capitalize, depends on Astring

Author: klakplok

.travis-ci.sh

@@ -1,10 +1,10 @@
 # Edit this for your own project dependencies
-OPAM_DEPENDS="ocamlfind pprint ocp-build"
+OPAM_DEPENDS="ocamlfind pprint ocp-build astring"
 
 case "$OCAML_VERSION,$OPAM_VERSION" in
-4.00.1,1.2.0) ppa=avsm/ocaml40+opam12 ;;
 4.01.0,1.2.0) ppa=avsm/ocaml41+opam12 ;;
 4.02.1,1.2.0) ppa=avsm/ocaml42+opam12 ;;
+4.04.2,1.2.0) ppa=avsm/ocaml44+opam12 ;;
 *) echo Unknown $OCAML_VERSION,$OPAM_VERSION; exit 1 ;;
 esac
 

Makefile

@@ -2,7 +2,7 @@ LIBDIR ?= $(shell ocamlfind printconf destdir)
 BINDIR ?= $(LIBDIR)/../bin
 DOCDIR ?= $(LIBDIR)/../doc
 
-PACKAGES=unix,str,pprint,dynlink
+PACKAGES=unix,str,pprint,astring,dynlink
 .PHONY: all clean \
    install uninstall \
    doc install-doc uninstall-doc

build.ocp

@@ -11,7 +11,7 @@ begin library "ocplib-ocamlres"
       	    "src/oCamlResRegistry.ml"
       	    "src/oCamlResScanners.ml"
       ]
-      requires = [ "str" "unix" "dynlink" "pprint" ]
+      requires = [ "str" "unix" "dynlink" "pprint" "astring" ]
       asmcomp = [ "-g" ]
 end
 

opam

@@ -5,7 +5,7 @@ maintainer: "benjamin@ocamlpro.com"
 authors: "benjamin@ocamlpro.com"
 homepage: "https://github.com/OCamlPro/ocp-ocamlres"
 bug-reports: "https://github.com/OCamlPro/ocp-ocamlres/issues"
-depends: ["ocamlfind" "base-unix" "pprint"]
+depends: ["ocamlfind" "base-unix" "pprint" "astring"]
 available: ocaml-version >= "4.01.0"
 build: [
   [make "all"]

src/META

@@ -5,7 +5,7 @@ archive(byte) = "ocplib-ocamlres.cma"
 archive(byte, plugin) = "ocplib-ocamlres.cma"
 archive(native) = "ocplib-ocamlres.cmxa"
 archive(native, plugin) = "ocplib-ocamlres.cmxs"
-requires = "pprint,str,ocplib-ocamlres.runtime"
+requires = "pprint,str,ocplib-ocamlres.runtime,astring"
 exists_if = "ocplib-ocamlres.cma"
 
 package "runtime" (

src/oCamlResFormats.ml

@@ -57,7 +57,7 @@ module OCaml (SF : SubFormat) = struct
       match name.[0] with
       | '0' .. '9' -> "M_" ^ res
       | '_' -> "M" ^ res
-      | 'a'..'z' -> String.capitalize res
+      | 'a'..'z' -> Astring.String.Ascii.capitalize res
       | _ -> res
 
   let output params root =
@@ -114,18 +114,18 @@ module Res (SF : SubFormat) = struct
           let cases =
             separate_map hardline
               (fun (c, t) ->
-                 !^"| " ^^ !^ (String.capitalize c) ^^ !^" of " ^^ !^t) l
+                 !^"| " ^^ !^ (Astring.String.Ascii.capitalize c) ^^ !^" of " ^^ !^t) l
           in
           hd := [ group (!^"type content =" ^^ nest 2 (hardline ^^ cases)) ]
         end ; true
     in
     let res_cstr ext =
       if not box then !^"" else
 	!^((if params.use_variants_for_leaves then "`" else "")
-           ^ String.capitalize ext ^ " ") in
+           ^ Astring.String.Ascii.capitalize ext ^ " ") in
     let node_cstr ext =
       !^((if params.use_variants_for_nodes then "`" else "")
-         ^ String.capitalize ext ^ " ") in
+         ^ Astring.String.Ascii.capitalize ext ^ " ") in
     let rec output dirs node =
       match node with
       | Error msg ->

src/oCamlResMain.ml

@@ -93,7 +93,7 @@ let prefixed_file = ref false
 
 (** Prints the version number *)
 let version () =
-  Format.printf "0.1\n" ;
+  Format.printf "0.4\n" ;
   exit 0
 
 (** Parse the preload arguments, scan and filter the files, select the