merge

Author: puripuri2100

__test__/satysrc/generic.saty

@@ -53,7 +53,7 @@ let () = Debug.log (String.of-int (Ref.get r)) in % 1
 
 let () = Debug.log `==== String ====` in
 let () = Debug.log (String.concat [`a`; `b`; `c`;]) in
-let () = Debug.log (String.with-concat `;` [`a`; `b`; `c`;]) in
+let () = Debug.log (String.concat ?:(`;`) [`a`; `b`; `c`;]) in
 let () = Debug.log (String.of-bool (String.is-empty `  `)) in % true
 let _ = String.split-by (Char.make `;`) `spam;ham;eggs;` |> List.map Debug.log in
 let _ = String.to-list `abc` |> List.map (fun c -> (c |> String.of-char |> Debug.log)) in
@@ -360,7 +360,7 @@ let () = Debug.log `==== TreeSet ====` in
 % REMARK:
 % This test relies on the fact that the order of elements of a result from TreeSet.to-list is
 % level-order (BFS). If the implementation is changed, the following tests have to be updated.
-let p s = s |> TreeSet.to-list |> List.map String.of-int |> List.intersperse `,` |> String.concat |> Debug.log in
+let p s = s |> TreeSet.to-list |> List.map String.of-int |> List.intersperse `,` |> (fun l -> String.concat l) |> Debug.log in
 let s = TreeSet.empty in
 let () = p s in
 let s = TreeSet.of-list Int.ord [3;2;3;1] in

src/string.satyg

@@ -26,9 +26,7 @@ module String : sig
   val of-char : Char.t -> string
   val of-length : length -> string
   val append : string -> string -> string
-  val with-concat : string -> string list -> string
-  val concat : string list -> string
-  val cat : string -> string -> string
+  val concat : string ?-> string list -> string
   val is-empty : string -> bool
   val starts-with : string -> string -> bool
   val ends-with : string -> string -> bool
@@ -67,15 +65,21 @@ end = struct
   let append s1 s2 = s1 ^ s2
 
 
-  let-rec with-concat s xs =
-    match xs with
-    | [] -> empty
-    | [x] -> x
-    | x :: xs -> x ^ s ^ with-concat s xs
 
-  let concat xs = with-concat empty xs
+  let concat ?:s xs =
+    let s =
+      match s with
+      | None -> empty
+      | Some(s) -> s
+    in
+    let-rec sub xs =
+      match xs with
+      | [] -> empty
+      | [x] -> x
+      | x :: xs -> x ^ s ^ sub xs
+    in
+    sub xs
 
-  let cat = (^)
 
   let is-empty s =
     equal s empty
@@ -96,7 +100,7 @@ end = struct
     |> List.map Char.of-codepoint
 
   let of-list chars =
-    chars |> List.map Char.to-string |> concat
+    chars |> List.map Char.to-string |> (fun slst -> concat slst)
 
   let pow n s =
     let-rec go i acc = if i == n then acc else go (i + 1) (acc ^ s) in