Remove the use of the batteries library

Author: benfaerber

IMPROVEMENTS.md

@@ -248,7 +248,6 @@ and interpret_style settings ctx str body =
 and interpret_render settings ctx str ~filename ~render_ctx ~body =
   if filename = Settings.style_tag then interpret_style settings ctx str body
   else
-    (* File.write "logs/body.txt" (Batteries.dump body); *)
     let ast = ast_from_file settings filename in
     let val_ctx = Values.unwrap_render_context ~outer_ctx:ctx ~render_ctx in
     let _, rendered_text = interpret settings val_ctx "" ast in

liquid_interpreter/interpreter.ml

@@ -1,6 +1,6 @@
 (library
  (public_name liquid_std)
- (libraries base core stdio re2 calendar base64 sha liquid_syntax
+ (libraries base core stdio re2 calendar base64 sha str liquid_syntax
    liquid_parser)
  (preprocess
   (pps bisect_ppx --conditional)))

liquid_std/dune

@@ -11,14 +11,13 @@ homepage: "https://github.com/benfaerber/liquid-ml"
 bug-reports: "https://github.com/benfaerber/liquid-ml/issues"
 dev-repo: "git+https://github.com/benfaerber/liquid-ml.git"
 license: "MIT"
-depends: [ 
+depends: [
     "ocaml" { >= "4.11" }
     "dune" { >= "2.5" }
     "base" { >= "v0.15.0" }
-    "core" { >= "v0.15.0" } 
-    "stdio" { >= "v0.10.0" } 
+    "core" { >= "v0.15.0" }
+    "stdio" { >= "v0.10.0" }
     "re2" { >= "v0.13.0" }
-    "batteries" { >= "3.1.0" } 
     "calendar" { >= "3.0.0"}
 ]
 build: [

liquid_syntax.opam

@@ -8,7 +8,9 @@ let block_token_as_string = show_block_token
 let operator_as_string = show_operator
 let lex_value_as_string = show_lex_value
 let lex_combiner_as_string = show_lex_combiner
-let dump x = x |> Batteries.dump |> Stdio.print_endline
+
+(* Generic debug printer - for any type with a show function *)
+let dump show_fn x = x |> show_fn |> Stdio.print_endline
 
 let remove_nl text =
   let exp = Re2.create_exn "\n" in

liquid_syntax/debug.ml

@@ -1,5 +1,5 @@
 (library
  (public_name liquid_syntax)
- (libraries base core stdio batteries re2 calendar ppx_deriving.runtime)
+ (libraries base core stdio re2 calendar ppx_deriving.runtime)
  (preprocess
   (pps ppx_deriving.show bisect_ppx --conditional)))

liquid_syntax/dune

@@ -140,7 +140,7 @@ type ast =
 
 let list_of_range = function
   | LexRange (start, stop) ->
-      Batteries.( -- ) start stop |> Batteries.List.of_enum
+      List.range start (stop + 1)
   | _ -> raise (Failure "This is not a range!")
 
 let liq_list_of_range r =

liquid_syntax/syntax.ml

@@ -6,7 +6,7 @@ let ( != ) = Stdlib.( != )
 let ( > ) = Stdlib.( > )
 let ( < ) = Stdlib.( < )
 let ( ~/ ) = Re2.create_exn
-let range x = Batteries.( -- ) 0 x |> Batteries.List.of_enum
+let range x = List.range 0 (x + 1)
 let sub_prefix text x = String.sub text ~pos:0 ~len:x
 let sub_suffix text x = String.sub text ~pos:x ~len:(String.length text - x)
 let sub_list lst start_i end_i = List.sub lst ~pos:start_i ~len:(end_i - start_i)