Changeset 14929 in project


Ignore:
Timestamp:
06/07/09 05:59:54 (10 years ago)
Author:
Alex Shinn
Message:

fixing string-delete and test cases, using make in utf8.setup

Location:
release/4/utf8/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • release/4/utf8/trunk/tests/utf8-test.scm

    r14275 r14929  
    372372(test '("文字列" "匕" "裂") (string-tokenize "文字列を匕き裂く" (string->char-set "字列匕裂文")))
    373373
    374 (test "文字列匕裂" (string-filter "文字列を匕き裂く"
    375                                 (lambda (c)
     374(test "文字列匕裂" (string-filter (lambda (c)
    376375                                  (not (char-set-contains?
    377                                         (string->char-set "きくを") c)))))
    378 
    379 (test "文字列匕裂" (string-delete "文字列を匕き裂く" (string->char-set "きくを")))
     376                                        (string->char-set "きくを") c)))
     377                                "文字列を匕き裂く"))
     378
     379(test "文字列匕裂" (string-delete (string->char-set "きくを") "文字列を匕き裂く"))
    380380
    381381;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  • release/4/utf8/trunk/utf8-srfi-13.scm

    r14928 r14929  
    594594(define (string-delete filt s . opt)
    595595  (let ((pred (char-predicate filt)))
    596     (apply string-filter s (lambda (c) (not (pred c))) opt)))
     596    (apply string-filter (lambda (c) (not (pred c))) s opt)))
    597597
    598598(define (string-replace s1 s2 start1 end1 . opt)
  • release/4/utf8/trunk/utf8.setup

    r14928 r14929  
    22(define version "3.3.0")
    33
    4 (compile -fixnum-arithmetic -inline -local -s -O3 -d0 -j utf8-lolevel utf8-lolevel.scm)
    5 (compile -s -O2 -d0 utf8-lolevel.import.scm)
     4(make (("utf8-lolevel.so" ("utf8-lolevel.scm")
     5        (compile -fixnum-arithmetic -inline -local -s -O3 -d0
     6                 -j utf8-lolevel utf8-lolevel.scm)
     7        (compile -s -O2 -d0 utf8-lolevel.import.scm))
     8       ("utf8.so" ("utf8.scm")
     9        (compile -fixnum-arithmetic -inline -local -s -O2 -d1
     10                 -j utf8 utf8.scm)
     11        (compile -s -O2 -d0 utf8.import.scm)
     12        )
     13       ("utf8-srfi-14.so" ("utf8-srfi-14.scm")
     14        (compile -fixnum-arithmetic -inline -local -s -O2 -d1
     15                 -j utf8-srfi-14 utf8-srfi-14.scm)
     16        (compile -s -O2 -d0 utf8-srfi-14.import.scm)
     17        )
     18       ("unicode-char-sets.so" ("unicode-char-sets.scm")
     19        (compile -fixnum-arithmetic -inline -local -s -O2 -d1
     20                 -j unicode-char-sets unicode-char-sets.scm)
     21        (compile -s -O2 -d0 unicode-char-sets.import.scm)
     22        )
     23       ("utf8-case-map.so" ("utf8-case-map.scm")
     24        (compile -fixnum-arithmetic -inline -local -s -O2 -d1
     25                 -j utf8-case-map utf8-case-map.scm)
     26        (compile -s -O2 -d0 utf8-case-map.import.scm)
     27        )
     28       ("utf8-srfi-13.so" ("utf8-srfi-13.scm")
     29        (compile -fixnum-arithmetic -inline -local -s -O2 -d1
     30                 -j utf8-srfi-13 utf8-srfi-13.scm)
     31        (compile -s -O2 -d0 utf8-srfi-13.import.scm)))
     32  '("utf8-lolevel.so" "utf8.so" "utf8-srfi-14.so"
     33    "unicode-char-sets.so" "utf8-case-map.so" "utf8-srfi-13.so"))
     34
    635(install-extension 'utf8-lolevel
    736 '("utf8-lolevel.so" "utf8-lolevel.import.so")
    837 `((version ,version)))
    938
    10 (compile -fixnum-arithmetic -inline -local -s -O2 -d1 -j utf8 utf8.scm)
    11 (compile -s -O2 -d0 utf8.import.scm)
    1239(install-extension 'utf8
    1340 '("utf8.so" "utf8.import.so")
    1441 `((version ,version) (documentation "utf8.html")))
    1542
    16 (compile -fixnum-arithmetic -inline -local -s -O2 -d1 -j utf8-srfi-14 utf8-srfi-14.scm)
    17 (compile -s -O2 -d0 utf8-srfi-14.import.scm)
    1843(install-extension 'utf8-srfi-14
    1944 '("utf8-srfi-14.so" "utf8-srfi-14.import.so")
    2045 `((version ,version)))
    2146
    22 (compile -fixnum-arithmetic -inline -local -s -O2 -d1 -j unicode-char-sets unicode-char-sets.scm)
    23 (compile -s -O2 -d0 unicode-char-sets.import.scm)
    2447(install-extension 'unicode-char-sets
    2548 '("unicode-char-sets.so" "unicode-char-sets.import.so")
    2649 `((version ,version)))
    2750
    28 (compile -fixnum-arithmetic -inline -local -s -O2 -d1 -j utf8-case-map utf8-case-map.scm)
    29 (compile -s -O2 -d0 utf8-case-map.import.scm)
    3051(install-extension 'utf8-case-map
    3152 '("utf8-case-map.so" "utf8-case-map.import.so"
     
    3354 `((version ,version)))
    3455
    35 (compile -fixnum-arithmetic -inline -local -s -O2 -d1 -j utf8-srfi-13 utf8-srfi-13.scm)
    36 (compile -s -O2 -d0 utf8-srfi-13.import.scm)
    3756(install-extension 'utf8-srfi-13
    3857 '("utf8-srfi-13.so" "utf8-srfi-13.import.so")
Note: See TracChangeset for help on using the changeset viewer.