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 csv-num-rows when last row doesn't end in nl

Browse source
This commit is contained in:
Alex Shinn 2024-11-08 17:00:16 +09:00
parent bf7187f324
commit 28676fcba9
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/chibi/csv.scm
View file

@ -231,30 +231,30 @@
(define csv-num-rows (define csv-num-rows
(opt-lambda ((grammar default-csv-grammar) (opt-lambda ((grammar default-csv-grammar)
(in (current-input-port))) (in (current-input-port)))
(let lp ((num-rows 0)) (let lp ((num-rows 0) (start? #t))
(let ((ch (read-char in))) (let ((ch (read-char in)))
(cond (cond
((eof-object? ch) num-rows) ((eof-object? ch) (if start? num-rows (+ num-rows 1)))
((eqv? ch (csv-grammar-quote-char grammar)) ((eqv? ch (csv-grammar-quote-char grammar))
(csv-skip-quoted in grammar) (csv-skip-quoted in grammar)
(lp num-rows)) (lp num-rows #f))
((eqv? ch (csv-grammar-record-separator grammar)) ((eqv? ch (csv-grammar-record-separator grammar))
(lp (+ num-rows 1))) (lp (+ num-rows 1) #f))
((and (eqv? ch #\return) ((and (eqv? ch #\return)
(memq (csv-grammar-record-separator grammar) '(crlf lax))) (memq (csv-grammar-record-separator grammar) '(crlf lax)))
(cond (cond
((eqv? (peek-char in) #\newline) ((eqv? (peek-char in) #\newline)
(read-char in) (read-char in)
(lp (+ num-rows 1))) (lp (+ num-rows 1) #t))
((eq? (csv-grammar-record-separator grammar) 'lax) ((eq? (csv-grammar-record-separator grammar) 'lax)
(lp (+ num-rows 1))) (lp (+ num-rows 1) #t))
(else (else
(lp num-rows)))) (lp num-rows #f))))
((and (eqv? ch #\newline) ((and (eqv? ch #\newline)
(eq? (csv-grammar-record-separator grammar) 'lax)) (eq? (csv-grammar-record-separator grammar) 'lax))
(lp (+ num-rows 1))) (lp (+ num-rows 1) #t))
(else (else
(lp num-rows))))))) (lp num-rows #f)))))))
;;> \section{CSV Readers} ;;> \section{CSV Readers}