Changeset 9792 in project


Ignore:
Timestamp:
03/16/08 01:49:43 (12 years ago)
Author:
Kon Lovett
Message:

Made calls to 'with-substring-offsets' match use in "utf8-srfi-13' (& definition).

Location:
release/3/utf8
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • release/3/utf8/utf8-support.scm

    r9741 r9792  
    269269
    270270(define (substring s start . opt)
    271   (apply with-substring-offsets byte-substring s start opt))
     271  (with-substring-offsets byte-substring s (cons start opt)))
    272272
    273273(define (make-string len . opt)
     
    449449                         (start2 0)
    450450                         (len (min (- s1-len start1) (- s2-len start2))))
    451       (with-substring-offsets
    452        (lambda (s1 s1-start s1-end)
    453          (with-substring-offsets
    454           (lambda (s2 s2-start s2-end)
    455             (byte-substring=? s1 s2 s1-start s2-start (- s1-end s1-start)))
    456           s2 start2 (+ start2 len)))
    457        s1 start1 (+ start1 len)))))
     451      (let ((opt1 (list start1 (+ start1 len)))
     452            (opt2 (list start2 (+ start2 len))))
     453        (with-substring-offsets
     454         (lambda (s1 s1-start s1-end)
     455           (with-substring-offsets
     456            (lambda (s2 s2-start s2-end)
     457              (byte-substring=? s1 s2 s1-start s2-start (- s1-end s1-start)))
     458            s2 opt2))
     459         s1 opt1)))) )
    458460
    459461(define (substring-ci=? s1 s2 . opt)
     
    462464                         (start2 0)
    463465                         (len (min (- s1-len start1) (- s2-len start2))))
    464       (with-substring-offsets
    465        (lambda (s1 s1-start s1-end)
    466          (with-substring-offsets
    467           (lambda (s2 s2-start s2-end)
    468             (byte-substring-ci=? s1 s2 s1-start s2-start (- s1-end s1-start)))
    469           s2 start2 (+ start2 len)))
    470        s1 start1 (+ start1 len)))))
     466      (let ((opt1 (list start1 (+ start1 len)))
     467            (opt2 (list start2 (+ start2 len))))
     468        (with-substring-offsets
     469         (lambda (s1 s1-start s1-end)
     470           (with-substring-offsets
     471            (lambda (s2 s2-start s2-end)
     472              (byte-substring-ci=? s1 s2 s1-start s2-start (- s1-end s1-start)))
     473            s2 opt2))
     474         s1 opt1)))) )
    471475
    472476(define (substring-index which where . opt)
  • release/3/utf8/utf8.setup

    r9608 r9792  
    66(install-extension 'byte-string
    77 '("byte-string.so")
    8  `((version 2.0)
     8 `((version "2.0.1")
    99   ,@(if has-exports? `((exports "byte-string.exports")) '()) ) )
    1010
     
    1414(install-extension 'utf8-lolevel
    1515 '("utf8-lolevel.so")
    16  `((version 2.0)
     16 `((version "2.0.1")
    1717   ,@(if has-exports? `((exports "utf8-lolevel.exports")) '()) ) )
    1818
     
    2424   "utf8-support.so"
    2525   "utf8.html")
    26  `((version 2.0)
     26 `((version "2.0.1")
    2727   ,@(if has-exports? `((exports "utf8.exports")) '())
    2828   (syntax)
     
    3636 '("utf8-srfi-14.scm"
    3737   "utf8-srfi-14.so")
    38  `((version 2.0)
     38 `((version "2.0.1")
    3939   ,@(if has-exports? `((exports "utf8-srfi-14.exports")) '())
    4040   (documentation "utf8.html") ) )
     
    4545(install-extension 'byte-string-srfi-13
    4646 '("byte-string-srfi-13.so")
    47  `((version 2.0)
     47 `((version "2.0.1")
    4848   ,@(if has-exports? `((exports "byte-string-srfi-13.exports")) '())
    4949   (documentation "utf8.html") ) )
     
    5555 '("utf8-srfi-13.scm"
    5656   "utf8-srfi-13.so")
    57  `((version 2.0)
     57 `((version "2.0.1")
    5858   ,@(if has-exports? `((exports "utf8-srfi-13.exports")) '())
    5959   (documentation "utf8.html") ) )
     
    6464(install-extension 'unicode-char-sets
    6565 '("unicode-char-sets.so")
    66  `((version 2.0)
     66 `((version "2.0.1")
    6767   ,@(if has-exports? `((exports "unicode-char-sets.exports")) '())
    6868   (documentation "utf8.html") ) )
     
    7373(install-extension 'utf8-case-map
    7474 '("utf8-case-map.so" "case-map-1.dat" "case-map-2.dat")
    75  `((version 2.0)
     75 `((version "2.0.1")
    7676   ,@(if has-exports? `((exports "utf8-case-map.exports")) '())
    7777   (documentation "utf8.html") ) )
Note: See TracChangeset for help on using the changeset viewer.