From ce1d5c06532d97110bd2719c9e05b716f3797592 Mon Sep 17 00:00:00 2001
From: Yuichi Nishiwaki <yuichi.nishiwaki@gmail.com>
Date: Tue, 9 Sep 2014 01:12:52 +0900
Subject: [PATCH] Revert "immutable string"

This reverts commit e56f2dce2815ec2273b986075b41a8deb10e7716.
---
 include/picrin/string.h |  3 ++
 string.c                | 98 ++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 99 insertions(+), 2 deletions(-)

diff --git a/include/picrin/string.h b/include/picrin/string.h
index 9cb7d3eb..3df116cf 100644
--- a/include/picrin/string.h
+++ b/include/picrin/string.h
@@ -19,9 +19,12 @@ struct pic_string {
 
 pic_str *pic_str_new(pic_state *, const char * /* nullable */, size_t);
 pic_str *pic_str_new_cstr(pic_state *, const char *);
+pic_str *pic_str_new_fill(pic_state *, size_t, char);
 
 size_t pic_strlen(pic_str *);
 char pic_str_ref(pic_state *, pic_str *, size_t);
+void pic_str_set(pic_state *, pic_str *, size_t, char);
+
 pic_str *pic_strcat(pic_state *, pic_str *, pic_str *);
 pic_str *pic_substr(pic_state *, pic_str *, size_t, size_t);
 int pic_strcmp(pic_str *, pic_str *);
diff --git a/string.c b/string.c
index 7afa7a26..92a3c569 100644
--- a/string.c
+++ b/string.c
@@ -34,6 +34,25 @@ pic_str_new_cstr(pic_state *pic, const char *cstr)
   return pic_str_new(pic, cstr, strlen(cstr));
 }
 
+pic_str *
+pic_str_new_fill(pic_state *pic, size_t len, char fill)
+{
+  size_t i;
+  char *cstr;
+  pic_str *str;
+
+  cstr = (char *)pic_alloc(pic, len + 1);
+  cstr[len] = '\0';
+  for (i = 0; i < len; ++i) {
+    cstr[i] = fill;
+  }
+
+  str = pic_str_new(pic, cstr, len);
+
+  pic_free(pic, cstr);
+  return str;
+}
+
 size_t
 pic_strlen(pic_str *str)
 {
@@ -257,6 +276,17 @@ pic_str_string_p(pic_state *pic)
   return pic_bool_value(pic_str_p(v));
 }
 
+static pic_value
+pic_str_make_string(pic_state *pic)
+{
+  int len;
+  char c = ' ';
+
+  pic_get_args(pic, "i|c", &len, &c);
+
+  return pic_obj_value(pic_str_new_fill(pic, len, c));
+}
+
 static pic_value
 pic_str_string_length(pic_state *pic)
 {
@@ -278,6 +308,19 @@ pic_str_string_ref(pic_state *pic)
   return pic_char_value(pic_str_ref(pic, str, k));
 }
 
+static pic_value
+pic_str_string_set(pic_state *pic)
+{
+  pic_str *str;
+  char c;
+  int k;
+
+  pic_get_args(pic, "sic", &str, &k, &c);
+
+  pic_str_set(pic, str, k, c);
+  return pic_none_value();
+}
+
 #define DEFINE_STRING_CMP(name, op)                                     \
   static pic_value                                                      \
   pic_str_string_##name(pic_state *pic)                                 \
@@ -327,6 +370,30 @@ pic_str_string_copy(pic_state *pic)
   return pic_obj_value(pic_substr(pic, str, start, end));
 }
 
+static pic_value
+pic_str_string_copy_ip(pic_state *pic)
+{
+  pic_str *to, *from;
+  int n, at, start, end;
+
+  n = pic_get_args(pic, "sis|ii", &to, &at, &from, &start, &end);
+
+  switch (n) {
+  case 3:
+    start = 0;
+  case 4:
+    end = pic_strlen(from);
+  }
+  if (to == from) {
+    from = pic_substr(pic, from, 0, end);
+  }
+
+  while (start < end) {
+    pic_str_set(pic, to, at++, pic_str_ref(pic, from, start++));
+  }
+  return pic_none_value();
+}
+
 static pic_value
 pic_str_string_append(pic_state *pic)
 {
@@ -346,18 +413,45 @@ pic_str_string_append(pic_state *pic)
   return pic_obj_value(str);
 }
 
+static pic_value
+pic_str_string_fill_ip(pic_state *pic)
+{
+  pic_str *str;
+  char c;
+  int n, start, end;
+
+  n = pic_get_args(pic, "sc|ii", &str, &c, &start, &end);
+
+  switch (n) {
+  case 2:
+    start = 0;
+  case 3:
+    end = pic_strlen(str);
+  }
+
+  while (start < end) {
+    pic_str_set(pic, str, start++, c);
+  }
+  return pic_none_value();
+}
+
 void
 pic_init_str(pic_state *pic)
 {
   pic_defun(pic, "string?", pic_str_string_p);
+  pic_defun(pic, "make-string", pic_str_make_string);
   pic_defun(pic, "string-length", pic_str_string_length);
   pic_defun(pic, "string-ref", pic_str_string_ref);
-  pic_defun(pic, "string-copy", pic_str_string_copy);
-  pic_defun(pic, "string-append", pic_str_string_append);
+  pic_defun(pic, "string-set!", pic_str_string_set);
 
   pic_defun(pic, "string=?", pic_str_string_eq);
   pic_defun(pic, "string<?", pic_str_string_lt);
   pic_defun(pic, "string>?", pic_str_string_gt);
   pic_defun(pic, "string<=?", pic_str_string_le);
   pic_defun(pic, "string>=?", pic_str_string_ge);
+
+  pic_defun(pic, "string-copy", pic_str_string_copy);
+  pic_defun(pic, "string-copy!", pic_str_string_copy_ip);
+  pic_defun(pic, "string-append", pic_str_string_append);
+  pic_defun(pic, "string-fill!", pic_str_string_fill_ip);
 }