Changeset 32975 in project


Ignore:
Timestamp:
12/12/15 11:16:28 (5 years ago)
Author:
juergen
Message:

arrays 0.2 sets renamed array-sets

Location:
release/4/arrays
Files:
6 edited
1 copied

Legend:

Unmodified
Added
Removed
  • release/4/arrays/tags/0.2/arrays.scm

    r31727 r32975  
    11671167) ; module arrays
    11681168
    1169 (module sets SETS
     1169(module array-sets SETS
    11701170  (import scheme
    11711171          array-handlers
     
    15641564      ((sym) (assq sym signatures)))))
    15651565
    1566 ) ; module sets
    1567 
    1568 ;(import arrays)
    1569 ;(define (array-merge <? arr0 arr1) ; internal
    1570 ;  (let loop ((arr0 arr0)
    1571 ;             (arr1 arr1))
    1572 ;    (cond
    1573 ;      ((array-null? arr0) arr1)
    1574 ;      ((array-null? arr1) arr0)
    1575 ;      (else
    1576 ;         ;ok, but far too slow
    1577 ;        (let ((item0 (array-first arr0))
    1578 ;              (item1 (array-first arr1)))
    1579 ;          (cond
    1580 ;            ((<? item0 item1)
    1581 ;             (array-append (array (array-item? arr0) item0)
    1582 ;                           (loop (array-rest arr0) arr1)))
    1583 ;            (else
    1584 ;              (array-append (array (array-item? arr0) item1)
    1585 ;                            (loop arr0 (array-rest arr1))))))))))
    1586 ;;; merge sort
    1587 ;(define (array-sort <? arr)
    1588 ;  (let loop ((arr arr))
    1589 ;    (let ((len (array-length arr)))
    1590 ;      (if (< len 2)
    1591 ;        (array-copy arr)
    1592 ;        (receive (head tail) (array-split-at (fxshr len 1) arr)
    1593 ;          (array-merge <? (loop head) (loop tail)))))))
    1594 
     1566) ; module array-sets
     1567
  • release/4/arrays/tags/0.2/arrays.setup

    r31727 r32975  
    44(compile -O3 -d0 -s array-handlers.import.scm)
    55(compile -O3 -d0 -s arrays.import.scm)
    6 (compile -O3 -d0 -s sets.import.scm)
     6(compile -O3 -d0 -s array-sets.import.scm)
    77
    88(install-extension
    99 'arrays
    10  '("arrays.so" "array-handlers.import.so" "arrays.import.so" "sets.import.so")
    11  '((version "0.1")))
     10 '("arrays.so" "array-handlers.import.so" "arrays.import.so" "array-sets.import.so")
     11 '((version "0.2")))
    1212
  • release/4/arrays/tags/0.2/tests/run.scm

    r31727 r32975  
    11(require-library arrays simple-tests)
    2 (import arrays sets simple-tests)
     2(import arrays array-sets simple-tests)
    33
    44(define-test (arrays?)
  • release/4/arrays/trunk/arrays.scm

    r31727 r32975  
    11671167) ; module arrays
    11681168
    1169 (module sets SETS
     1169(module array-sets SETS
    11701170  (import scheme
    11711171          array-handlers
     
    15641564      ((sym) (assq sym signatures)))))
    15651565
    1566 ) ; module sets
    1567 
    1568 ;(import arrays)
    1569 ;(define (array-merge <? arr0 arr1) ; internal
    1570 ;  (let loop ((arr0 arr0)
    1571 ;             (arr1 arr1))
    1572 ;    (cond
    1573 ;      ((array-null? arr0) arr1)
    1574 ;      ((array-null? arr1) arr0)
    1575 ;      (else
    1576 ;         ;ok, but far too slow
    1577 ;        (let ((item0 (array-first arr0))
    1578 ;              (item1 (array-first arr1)))
    1579 ;          (cond
    1580 ;            ((<? item0 item1)
    1581 ;             (array-append (array (array-item? arr0) item0)
    1582 ;                           (loop (array-rest arr0) arr1)))
    1583 ;            (else
    1584 ;              (array-append (array (array-item? arr0) item1)
    1585 ;                            (loop arr0 (array-rest arr1))))))))))
    1586 ;;; merge sort
    1587 ;(define (array-sort <? arr)
    1588 ;  (let loop ((arr arr))
    1589 ;    (let ((len (array-length arr)))
    1590 ;      (if (< len 2)
    1591 ;        (array-copy arr)
    1592 ;        (receive (head tail) (array-split-at (fxshr len 1) arr)
    1593 ;          (array-merge <? (loop head) (loop tail)))))))
    1594 
     1566) ; module array-sets
     1567
  • release/4/arrays/trunk/arrays.setup

    r31727 r32975  
    44(compile -O3 -d0 -s array-handlers.import.scm)
    55(compile -O3 -d0 -s arrays.import.scm)
    6 (compile -O3 -d0 -s sets.import.scm)
     6(compile -O3 -d0 -s array-sets.import.scm)
    77
    88(install-extension
    99 'arrays
    10  '("arrays.so" "array-handlers.import.so" "arrays.import.so" "sets.import.so")
    11  '((version "0.1")))
     10 '("arrays.so" "array-handlers.import.so" "arrays.import.so" "array-sets.import.so")
     11 '((version "0.2")))
    1212
  • release/4/arrays/trunk/tests/run.scm

    r31727 r32975  
    11(require-library arrays simple-tests)
    2 (import arrays sets simple-tests)
     2(import arrays array-sets simple-tests)
    33
    44(define-test (arrays?)
Note: See TracChangeset for help on using the changeset viewer.