Fcalva/chibi-scheme
1
0
Fork 0
mirror of https://github.com/ashinn/chibi-scheme.git synced 2025-05-18 21:29:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix list/vector*->array for 0 dimensions.

Browse source 
Closes #962.
This commit is contained in:
Alex Shinn 2024-05-26 21:54:11 +09:00
parent c200ecb21c
commit f4add6d188
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/srfi/231/test.sld
View file

@ -1816,10 +1816,14 @@
(list*->array 2 '(((a b c) (1 2)))) (list*->array 2 '(((a b c) (1 2))))
(list->array (make-interval '#(1 2)) (list->array (make-interval '#(1 2))
'((a b c) (1 2))))) '((a b c) (1 2)))))
;; (test-assert (test-assert
;; (array-every equal? (array-every equal?
;; (list*->array 0 '()) (list*->array 0 '())
;; (make-array (make-interval '#()) (lambda () '())))) (make-array (make-interval '#()) (lambda () '()))))
(test-assert
(array-every equal?
(vector*->array 0 '())
(make-array (make-interval '#()) (lambda () '()))))
(test-error (array-any 1 2)) (test-error (array-any 1 2))
(test-error (array-any list 1)) (test-error (array-any list 1))
(test-error (array-any list (test-error (array-any list

8
lib/srfi/231/transforms.scm
View file

@ -529,7 +529,9 @@
(else (else
(apply list->array (apply list->array
(make-interval (list->vector (reverse lens))) (make-interval (list->vector (reverse lens)))
(flatten nested-ls (- dimension 1)) (if (zero? dimension)
(list nested-ls)
(flatten nested-ls (- dimension 1)))
o))))) o)))))
(define (array->list* a) (define (array->list* a)
@ -576,7 +578,9 @@
(else (else
(apply list->array (apply list->array
(make-interval (reverse-list->vector lens)) (make-interval (reverse-list->vector lens))
(flatten-vector->list nested-vec (- dimension 1)) (if (zero? dimension)
(list nested-vec)
(flatten-vector->list nested-vec (- dimension 1)))
o))))) o)))))
(define (dimensions-compatible? a-domain b-domain axis) (define (dimensions-compatible? a-domain b-domain axis)