trackler 2.2.1.110 → 2.2.1.111

data/tracks/ocaml/exercises/pangram/jbuild

@@ -0,0 +1,11 @@
+(jbuild_version 1)
+
+(executable
+ ((name test)
+  (libraries (base oUnit))
+ ))
+
+(alias
+ ((name    runtest)
+  (deps    (test.exe))
+  (action  (run ${<}))))

data/tracks/ocaml/exercises/pangram/test.ml

@@ -1,10 +1,9 @@
 (* Test/exercise version: "1.4.0" *)
 
-open Core
 open OUnit2
 open Pangram
 
-let ae exp got _test_ctxt = assert_equal ~printer:Bool.to_string exp got
+let ae exp got _test_ctxt = assert_equal ~printer:string_of_bool exp got
 
 let tests = [
    "sentence empty" >::

data/tracks/ocaml/exercises/phone-number/Makefile

@@ -1,11 +1,9 @@
-test: test.native
-	@./test.native
+default: clean test
 
-test.native: *.ml *.mli
-	@corebuild -r -quiet -pkg oUnit test.native
+test: 
+	jbuilder runtest
 
 clean:
-	rm -rf _build
-	rm -f test.native
+	jbuilder clean
 
 .PHONY: clean

data/tracks/ocaml/exercises/phone-number/example.ml

@@ -1,7 +1,7 @@
-open Core
+open Base
 
 let check_valid_first_digits s =
-  if s.[0] = '0' || s.[0] = '1' || s.[3] = '0' || s.[3] = '1'
+  if Char.(s.[0] = '0' || s.[0] = '1' || s.[3] = '0' || s.[3] = '1')
   then None
   else Some s
 
@@ -11,6 +11,6 @@ let number s =
   else
     let s = String.filter ~f:(Char.is_digit) s in
     match String.length s with
-    | 10                            -> check_valid_first_digits s
-    | 11 when String.get s 0 = '1'  -> check_valid_first_digits (String.drop_prefix s 1)
-    | _                             -> None
+    | 10                                   -> check_valid_first_digits s
+    | 11 when Char.(String.get s 0 = '1')  -> check_valid_first_digits (String.drop_prefix s 1)
+    | _                                    -> None

data/tracks/ocaml/exercises/phone-number/jbuild

@@ -0,0 +1,11 @@
+(jbuild_version 1)
+
+(executable
+ ((name test)
+  (libraries (base oUnit))
+ ))
+
+(alias
+ ((name    runtest)
+  (deps    (test.exe))
+  (action  (run ${<}))))

data/tracks/ocaml/exercises/phone-number/test.ml

@@ -1,6 +1,6 @@
 (* Test/exercise version: "1.4.0" *)
 
-open Core
+open Base
 open OUnit2
 open Phone_number
 
@@ -9,7 +9,7 @@ let option_to_string f = function
   | Some x -> "Some " ^ f x
 
 let ae exp got _test_ctxt =
-  assert_equal ~printer:(option_to_string String.to_string) exp got
+  assert_equal ~printer:(option_to_string Fn.id) exp got
 
 let tests = [
   "cleans the number" >::

data/tracks/ocaml/exercises/prime-factors/Makefile

@@ -1,11 +1,9 @@
-test: test.native
-	@./test.native
+default: clean test
 
-test.native: *.ml *.mli
-	@corebuild -r -quiet -pkg oUnit test.native
+test: 
+	jbuilder runtest
 
 clean:
-	rm -rf _build
-	rm -f test.native
+	jbuilder clean
 
 .PHONY: clean

data/tracks/ocaml/exercises/prime-factors/example.ml

@@ -1,8 +1,8 @@
-open Core
+open Base
 
 let square_root_trunc n =
     (* Square root is not defined on int64 *)
-    Int64.to_float n |> sqrt |> Int64.of_float
+    Int64.to_float n |> Float.sqrt |> Int64.of_float
 
 let rec factors_of' = function
     | 1L -> []

data/tracks/ocaml/exercises/prime-factors/jbuild

@@ -0,0 +1,11 @@
+(jbuild_version 1)
+
+(executable
+ ((name test)
+  (libraries (base oUnit))
+ ))
+
+(alias
+ ((name    runtest)
+  (deps    (test.exe))
+  (action  (run ${<}))))

data/tracks/ocaml/exercises/prime-factors/test.ml

@@ -1,12 +1,12 @@
 (* Test/exercise version: "1.1.0" *)
 
-open Core
+open Base
 open OUnit2
 open Prime_factors
 
 (* Assert Equals *)
 let ae exp got _test_ctxt =
-  let printer = List.to_string ~f:Int64.to_string in
+  let printer xs = List.map xs ~f:Int64.to_string |> String.concat ~sep:";" in
   assert_equal exp got ~printer
 
 let to_int64s = List.map ~f:Int64.of_int

data/tracks/ocaml/exercises/raindrops/Makefile

@@ -1,11 +1,9 @@
-test: test.native
-	@./test.native
+default: clean test
 
-test.native: *.ml *.mli
-	@corebuild -r -quiet -pkg oUnit test.native
+test: 
+	jbuilder runtest
 
 clean:
-	rm -rf _build
-	rm -f test.native
+	jbuilder clean
 
 .PHONY: clean

data/tracks/ocaml/exercises/raindrops/example.ml

@@ -1,5 +1,3 @@
-open Core
-
 let raindrop = function
   | n when n mod 105 = 0 -> "PlingPlangPlong"
   | n when n mod 35 = 0 -> "PlangPlong"

data/tracks/ocaml/exercises/raindrops/jbuild

@@ -0,0 +1,11 @@
+(jbuild_version 1)
+
+(executable
+ ((name test)
+  (libraries (base oUnit))
+ ))
+
+(alias
+ ((name    runtest)
+  (deps    (test.exe))
+  (action  (run ${<}))))

data/tracks/ocaml/exercises/raindrops/test.ml

@@ -1,10 +1,9 @@
 (* Test/exercise version: "1.1.0" *)
 
-open Core
 open OUnit2
 open Raindrops
 
-let ae exp got _test_ctxt = assert_equal ~printer:Fn.id exp got
+let ae exp got _test_ctxt = assert_equal ~printer:(fun x -> x) exp got
 
 let tests = [
    "the sound for 1 is 1" >::

data/tracks/ocaml/exercises/react/Makefile

@@ -1,11 +1,9 @@
-test: test.native
-	@./test.native
+default: clean test
 
-test.native: *.ml *.mli
-	@corebuild -r -quiet -pkg oUnit test.native
+test: 
+	jbuilder runtest
 
 clean:
-	rm -rf _build
-	rm -f test.native
+	jbuilder clean
 
 .PHONY: clean

data/tracks/ocaml/exercises/react/example.ml

@@ -1,4 +1,4 @@
-open Core
+open Core_kernel
 
 type callback_id = int
 

data/tracks/ocaml/exercises/react/jbuild

@@ -0,0 +1,11 @@
+(jbuild_version 1)
+
+(executable
+ ((name test)
+  (libraries (core_kernel oUnit))
+ ))
+
+(alias
+ ((name    runtest)
+  (deps    (test.exe))
+  (action  (run ${<}))))

data/tracks/ocaml/exercises/react/test.ml

@@ -1,6 +1,6 @@
 (* Test/exercise version: "1.0.0" *)
 
-open Core
+open Core_kernel
 open OUnit2
 open React
 

data/tracks/ocaml/exercises/rectangles/Makefile

@@ -1,11 +1,9 @@
-test: test.native
-	@./test.native
+default: clean test
 
-test.native: *.ml *.mli
-	@corebuild -r -quiet -pkg oUnit test.native
+test: 
+	jbuilder runtest
 
 clean:
-	rm -rf _build
-	rm -f test.native
+	jbuilder clean
 
 .PHONY: clean

data/tracks/ocaml/exercises/rectangles/jbuild

@@ -0,0 +1,11 @@
+(jbuild_version 1)
+
+(executable
+ ((name test)
+  (libraries (base oUnit))
+ ))
+
+(alias
+ ((name    runtest)
+  (deps    (test.exe))
+  (action  (run ${<}))))

data/tracks/ocaml/exercises/rectangles/test.ml

@@ -1,10 +1,9 @@
 (* Test/exercise version: "1.0.0" *)
 
-open Core
 open OUnit2
 open Rectangles
 
-let ae exp got _test_ctxt = assert_equal exp got ~printer:Int.to_string
+let ae exp got _test_ctxt = assert_equal exp got ~printer:string_of_int
 
 let tests = [
    "no rows" >::

data/tracks/ocaml/exercises/rna-transcription/Makefile

@@ -1,11 +1,9 @@
-test: test.native
-	@./test.native
+default: clean test
 
-test.native: *.ml *.mli
-	@corebuild -r -quiet -pkg oUnit test.native
+test: 
+	jbuilder runtest
 
 clean:
-	rm -rf _build
-	rm -f test.native
+	jbuilder clean
 
 .PHONY: clean

data/tracks/ocaml/exercises/rna-transcription/example.ml

@@ -1,9 +1,7 @@
-open Core
-
 type dna = [ `A | `C | `G | `T ]
 type rna = [ `A | `C | `G | `U ]
 
-let to_rna = List.map ~f:(function
+let to_rna = List.map (function
     | `A -> `U
     | `C -> `G
     | `G -> `C

data/tracks/ocaml/exercises/rna-transcription/jbuild

@@ -0,0 +1,11 @@
+(jbuild_version 1)
+
+(executable
+ ((name test)
+  (libraries (base oUnit))
+ ))
+
+(alias
+ ((name    runtest)
+  (deps    (test.exe))
+  (action  (run ${<}))))

data/tracks/ocaml/exercises/rna-transcription/test.ml

@@ -1,4 +1,4 @@
-open Core
+open Base
 open OUnit2
 
 let char_of_variant = function

data/tracks/ocaml/exercises/robot-name/Makefile

@@ -1,11 +1,9 @@
-test: test.native
-	@./test.native
+default: clean test
 
-test.native: *.ml *.mli
-	@corebuild -r -quiet -pkg oUnit test.native
+test: 
+	jbuilder runtest
 
 clean:
-	rm -rf _build
-	rm -f test.native
+	jbuilder clean
 
 .PHONY: clean

data/tracks/ocaml/exercises/robot-name/example.ml

@@ -1,4 +1,4 @@
-open Core
+open Base
 
 type robot = {mutable index : int}
 
@@ -19,7 +19,7 @@ let name r =
   let letter_A = Char.to_int 'A' in
   let first_letter = Char.of_int_exn (letter_A + (letters_part / 26)) in
   let second_letter = Char.of_int_exn (letter_A + (letters_part % 26)) in
-  sprintf "%c%c%03d" first_letter second_letter (n % 1000)
+  Printf.sprintf "%c%c%03d" first_letter second_letter (n % 1000)
 
 let reset r =
   index := !index + 1;

data/tracks/ocaml/exercises/robot-name/jbuild

@@ -0,0 +1,11 @@
+(jbuild_version 1)
+
+(executable
+ ((name test)
+  (libraries (base oUnit))
+ ))
+
+(alias
+ ((name    runtest)
+  (deps    (test.exe))
+  (action  (run ${<}))))

data/tracks/ocaml/exercises/robot-name/test.ml

@@ -1,10 +1,10 @@
-open Core
+open Base
 open OUnit2
 open Robot_name
 
 let assert_matches_spec name =
-  let is_valid_letter ch = 'A' <= ch && ch <= 'Z' in
-  let is_valid_digit ch = '0' <= ch && ch <= '9' in
+  let is_valid_letter ch = Char.('A' <= ch && ch <= 'Z') in
+  let is_valid_digit ch = Char.('0' <= ch && ch <= '9') in
   assert_equal ~printer:Int.to_string 5 (String.length name);
   assert_bool ("First character must be from A to Z") (is_valid_letter @@ name.[0]);
   assert_bool ("Second character must be from A to Z") (is_valid_letter @@ name.[1]);
@@ -23,7 +23,7 @@ let basic_tests = [
     let n1 = name r in
     reset r;
     let n2 = name r in
-    assert_bool ("'" ^ n1 ^ "' was repeated") (n1 <> n2)
+    assert_bool ("'" ^ n1 ^ "' was repeated") String.(n1 <> n2)
     );
 
   "after reset the robot's name still matches the specification" >:: (fun _ctxt ->
@@ -48,7 +48,8 @@ line at the bottom of this module.
 let unique_name_tests = [
   "all possible robot names are distinct" >:: (fun _ctxt ->
     let rs = Array.init (26 * 26 * 1000) ~f:(fun _ -> new_robot ()) in
-    let (repeated, _) = Array.fold rs ~init:(String.Set.empty, String.Set.empty) ~f:(fun (repeated, seen) r ->
+    let empty = Set.empty (module String) in
+    let (repeated, _) = Array.fold rs ~init:(empty, empty) ~f:(fun (repeated, seen) r ->
       let n = name r in
       if Set.mem seen n
       then (Set.add repeated n, seen)

data/tracks/ocaml/exercises/roman-numerals/Makefile

@@ -1,11 +1,9 @@
-test: test.native
-	@./test.native
+default: clean test
 
-test.native: *.ml *.mli
-	@corebuild -quiet -pkg oUnit test.native
+test: 
+	jbuilder runtest
 
 clean:
-	rm -rf _build
-	rm -f test.native
+	jbuilder clean
 
 .PHONY: clean

data/tracks/ocaml/exercises/roman-numerals/jbuild

@@ -0,0 +1,11 @@
+(jbuild_version 1)
+
+(executable
+ ((name test)
+  (libraries (base oUnit))
+ ))
+
+(alias
+ ((name    runtest)
+  (deps    (test.exe))
+  (action  (run ${<}))))