Commit: 94d1790b23a054b803b72f9ba4b666a39049a3e4 - uim (git)

A multilingual input method framework

Commit MetaInfo

• Revision: 94d1790b23a054b803b72f9ba4b666a39049a3e4 (tree)
• Time: 2006-12-27 12:18:09
• Author: yamaken <yamaken@ff9a...>
• Commiter: yamaken

Log Message

* scm/util.scm

- (string-escape): New procedure

* uim/uim-util.c

- (string_escape): Removed
- (uim_init_util_subrs): Remove string-escape registration

Change Summary

• modified: scm/util.scm
• modified: uim/uim-util.c

Incremental Difference

--- a/scm/util.scm
+++ b/scm/util.scm
@@ -28,11 +28,10 @@
 ;;; OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 ;;; SUCH DAMAGE.
 
+(use srfi-6)
 (use srfi-34)
 
 ;;;;
-;(require "slib-mulapply.scm")
-;(require "slib-srfi-1.scm")
 
 (define hyphen-sym (string->symbol "-"))
 
@@ -40,6 +39,25 @@
 ;; generic utilities
 ;;
 
+;; Make escaped string literal to print a form.
+;;
+;; (string-escape "a str\n") -> "\"a str\\n\""
+;;
+;; The following two codes must display same result. See
+;; test/test-util.scm for further specification.
+;;
+;; (display str)
+;;
+;; (use srfi-6)
+;; (define estr (string-append "(display " (string-escape str) ")"))
+;; (eval (read (open-input-string estr))
+;;       (interaction-environment))
+(define string-escape
+  (lambda (s)
+    (let ((p (open-output-string)))
+      (write s p)
+      (get-output-string p))))
+
 ;; Current uim implementation treats char as integer
 
 ;; TODO: write test

--- a/uim/uim-util.c
+++ b/uim/uim-util.c
@@ -624,82 +624,6 @@ setugidp(void)
   return uim_scm_f();
 }
 
-/*
- * Make escaped string literal to print a form.
- *
- * (string-escape "a str\n") -> "\"a str\\n\""
- *
- * The following two codes must display same result. See
- * test/test-util.scm for further specification.
- *
- * (display str)
- *
- * (use srfi-6)
- * (define estr (string-append "(display " (string-escape str) ")"))
- * (eval (read (open-input-string estr))
- *       (interaction-environment))
- */
-static uim_lisp
-string_escape(uim_lisp str)
-{
-  const char *c_str = uim_scm_refer_c_str(str);
-  const char *s;
-  char *ret;
-  int len = strlen("\"\"");
-  int ch;
-  int i;
-  uim_lisp scm_ret;
-  if (strlen(c_str) == 0)
-    return uim_scm_make_str("\"\"");
-
-  /* guess len */
-  for (s = c_str; (*s); s++) {
-    ch = (*s);
-    switch (ch) {
-    case '\"':
-    case '\\':
-    case '\n':
-    case '\r':
-    case '\t':
-    case '\f':
-    case '\v':
-      len += 2;
-      break;
-
-    default:
-      len++;
-      break;
-    }
-  }
-
-  ret = (char*)malloc(sizeof(char) * len + 1);
-
-  /* fill str */
-  for (i = 1, s = c_str; i < len - 1; i++, s++) {
-    ch = (*s);
-    switch (ch) {
-    case '\"': ret[i]='\\'; ret[++i]='\"'; break; 
-    case '\\': ret[i]='\\'; ret[++i]='\\'; break;
-    case '\n': ret[i]='\\'; ret[++i]='n';  break;
-    case '\r': ret[i]='\\'; ret[++i]='r';  break;
-    case '\t': ret[i]='\\'; ret[++i]='t';  break;
-    case '\f': ret[i]='\\'; ret[++i]='f';  break;
-    case '\v': ret[i]='\\'; ret[++i]='v';  break;
-
-    default:
-      ret[i] = ch;
-      break;
-    }
-  }
-  ret[0]       = '\"';
-  ret[len - 1] = '\"';
-  ret[len]     = '\0';
-
-  scm_ret = uim_scm_make_str(ret);
-  free(ret);
-  return scm_ret;
-}
-
 void
 uim_init_util_subrs(void)
 {
@@ -733,5 +657,4 @@ uim_init_util_subrs(void)
   uim_scm_init_subr_2("find-tail", find_tail);
   uim_scm_init_subr_1("lang-code->lang-name-raw", lang_code_to_lang_name_raw);
   uim_scm_init_subr_0("setugid?", setugidp);
-  uim_scm_init_subr_1("string-escape", string_escape);
 }