[uim-commit] r951 - branches/composer/scm

[yamaken at freedesktop.org]

Author: yamaken
Date: 2005-07-08 09:01:57 -0700 (Fri, 08 Jul 2005)
New Revision: 951

Modified:
   branches/composer/scm/utext.scm
   branches/composer/scm/util.scm
Log:
* scm/util.scm
  - (sublist, sublist-rel): New procedure generalized from
    utext-subtext and utext-subtext-rel
* scm/utext.scm
  - (utext-subtext, utext-subtext-rel): Removed and generalized as
    sublist and sublist-rel of util.scm


Modified: branches/composer/scm/utext.scm
===================================================================
--- branches/composer/scm/utext.scm	2005-07-08 12:44:54 UTC (rev 950)
+++ branches/composer/scm/utext.scm	2005-07-08 16:01:57 UTC (rev 951)
@@ -195,15 +195,6 @@
   (lambda (utext other)
     (every uchar=? utext other)))
 
-(define utext-subtext
-  (lambda (utext start end)
-    (list-tail (list-head utext (+ end 1))
-	       start)))
-
-(define utext-subtext-rel
-  (lambda (utext start len)
-    (utext-subtext start (+ start len))))
-
 ;; .returns List of utext aggregated by uchar-props=?
 (define utext-aggregate
   (lambda (utext)

Modified: branches/composer/scm/util.scm
===================================================================
--- branches/composer/scm/util.scm	2005-07-08 12:44:54 UTC (rev 950)
+++ branches/composer/scm/util.scm	2005-07-08 16:01:57 UTC (rev 951)
@@ -106,6 +106,17 @@
 	(or (truncate-list lst n)
 	    (error "out of range in list-head")))))
 
+;; TODO: write test
+(define sublist
+  (lambda (lst start end)
+    (list-tail (list-head lst (+ end 1))
+	       start)))
+
+;; TODO: write test
+(define sublist-rel
+  (lambda (lst start len)
+    (sublist lst start (+ start len))))
+
 (define alist-replace
   (lambda (kons alist)
     (let* ((id (car kons))