Merge pull request #46 from AltGr/stdren

Rename changed references in the OCaml stdlib

exercises/fpottier/breaking_sort/prepare.ml

@@ -1,6 +1,6 @@
 open Printf
 (* A correct sort. *)
-let sort = List.sort Pervasives.compare
+let sort = List.sort Stdlib.compare
 
 exception TODO
 
@@ -261,7 +261,7 @@ let sort42 xs =
     | true, true  ->  0
     | true, false -> -1
     | false, true -> +1
-    | false, false -> Pervasives.compare x y
+    | false, false -> Stdlib.compare x y
   in
   List.sort compare xs
 
@@ -299,7 +299,7 @@ let sort15 xs =
     | true, true  ->  0
     | true, false -> -1
     | false, true -> +1
-    | false, false -> Pervasives.compare x y
+    | false, false -> Stdlib.compare x y
   in
   List.sort compare xs
 

exercises/fpottier/enumerating_trees/test.ml

@@ -836,7 +836,7 @@ let compare_enumerations (type a)
   end;
   for s = 0 to threshold do
     (* Compare sorted lists. *)
-    let sort = List.sort Pervasives.compare in
+    let sort = List.sort Stdlib.compare in
     let actual = T.result (fun () -> actual () s |> Seq.elements |> sort)
     and expected = Ok (expected s |> Seq.elements |> sort) in
     black_box_compare (=) (wrap (print_list print))

exercises/mooc/week2/seq4/ex1/test.ml

@@ -68,7 +68,7 @@ let sample_contact =
         names.(id)
       else names.(id mod len) ^ name (id / len) in
     id := !id + len + 2 ;
-    let name = String.capitalize (name !id) in
+    let name = String.capitalize_ascii (name !id) in
     let phone_number = (!id mod 23, !id mod 19, !id mod 7, !id mod 17) in
     { name ; phone_number }
 

exercises/mooc/week4/seq1/ex1/test.ml

@@ -13,7 +13,7 @@ let sample_string_ff =
   sample_cases
     [ printable_fun "((^) \"@\")" ((^) "@") ;
       printable_fun "(fun s -> s ^ s)" (fun s -> s ^ s) ;
-      printable_fun "String.uppercase" (String.uppercase) ]
+      printable_fun "String.uppercase_ascii" (String.uppercase_ascii) ]
 
 let exercise_1 =
   set_progress "Grading exercise 1." ;

exercises/mooc/week4/seq3/ex1/prepare.ml

@@ -8,8 +8,8 @@ let unset r = r := 0
 let ccr_reference a b c s =
   s /. (2. *. (cos (a /. 2.)) *. 2. *. (cos (b /. 2.)) *. 2. *. (cos (c /. 2.)))
 
-module Pervasives = struct
-  include Pervasives
+module Stdlib = struct
+  include Stdlib
   let cos_f = cos
   let cos v =
     set used_cos;
@@ -26,7 +26,7 @@ module Pervasives = struct
     div_f x y
 end
 
-include Pervasives
+include Stdlib
 
 let test_ccr ccr (a, b, c, s) =
   let unset_all () =

exercises/mooc/week4/seq3/ex2/test.ml

@@ -65,7 +65,7 @@ let check_min l =
     if i <= 0 then acc else
       let x = Random.int 50 - 25 and y = Random.int 50 - 25 in
       let v1 = result @@ fun () -> min x y in
-      let v2 = result @@ fun () -> Pervasives.min x y in
+      let v2 = result @@ fun () -> Stdlib.min x y in
       compute_min min
         (test [%ty: int ] v1 v2 @
          [ Message ([ Text "Computing " ; Code (Format.asprintf "min %d %d" x y) ], Informative) ] @
@@ -88,9 +88,9 @@ let exercise_3 =
            find_binding code_ast "my_env" @@ fun expr ->
            ast_check_expr
              ~on_expression:(function
-                   [%expr Pervasives.min] | [%expr min] ->
+                   [%expr Stdlib.min] | [%expr min] ->
                      [ failure
-                         ~message:"You cannot use the Pervasives.min function." ]
+                         ~message:"You cannot use the Stdlib.min function." ]
                  | { pexp_desc = Pexp_let (_, _, _) } ->
                      [ failure
                        ~message:"You cannot use any let expression to define \