bjoli/goof-loop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added some generator clauses

Browse source 
Now in-file, in-port, in-lists and in-generator have generator clauses
This commit is contained in:
Linus 2021-02-18 22:06:59 +01:00
parent 7b3814c430
commit bb0de3e949
2 changed files with 68 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

83
goof/iterators.scm
View file

@ -101,7 +101,23 @@
((elts (map car pairs))
(succ (map step pairs)))
()
. rest))))
. rest))
;; Generator clause
((in-lists lists ...)
(gen-lists lists ...))))
;; TODO: make this not slow.
(define (gen-lists . lists)
(lambda ()
(if (any null? lists)
(eof-object)
(let ((cars (map car lists))
(cdrs (map cdr lists)))
(set! lists cdrs)
(values cars)))))
(define-syntax define-in-indexed
(syntax-rules ()
@ -156,22 +172,52 @@
((eof? var))
()
()
. rest))))
. rest))
;; generator clauses
((in-port port)
(gen-port port read-char eof-object?))
((in-port port reader)
(gen-port port reader eof-object?))
((in-port port reader eof?)
(gen-port port reader eof?))))
(define (gen-port port read eof?)
(lambda ()
(let ((res (read port)))
(if (eof? res)
(eof-object)
res))))
(define-syntax in-file
(syntax-rules ()
((in-file ((var) source) next . rest)
(in-file ((var p) source) next . rest))
((in-file ((var p) (file)) next . rest)
(in-file ((var p) (file read-char)) next . rest))
((in-file ((var p) (file reader)) next . rest)
(in-file ((var p) (file reader eof-object?)) next . rest))
((in-file ((var p) (file reader eof?)) next . rest)
(next ((p (open-input-file file)) (r reader) (e? eof?))
((var (r p) (r p)))
((e? var))
()
((close-input-port p)) . rest))))
(syntax-rules ()
((in-file ((var) source) next . rest)
(in-file ((var p) source) next . rest))
((in-file ((var p) (file)) next . rest)
(in-file ((var p) (file read-char)) next . rest))
((in-file ((var p) (file reader)) next . rest)
(in-file ((var p) (file reader eof-object?)) next . rest))
((in-file ((var p) (file reader eof?)) next . rest)
(next ((p (open-input-file file)) (r reader) (e? eof?))
((var (r p) (r p)))
((e? var))
()
((close-input-port p)) . rest))
;; generator clauses
((in-file path)
(gen-file path read-char eof-object?))
((in-file path read)
(gen-file path read eof-object?))
((in-file path read eof?)
(gen-file path read eof?))))
(define (gen-file path read eof?)
(let ((file (open-input-file path)))
(lambda ()
(let ((res (read file)))
(cond ((eof? res)
(close-port file)
(eof-object))
(else res))))))
(define-syntax in-generator
(syntax-rules ()
@ -181,7 +227,12 @@
((eof-object? var))
()
()
. rest))))
. rest))
;; yes, generator clause
((in-generator gen)
(let ((g gen))
(lambda ()
(g))))))
(define-syntax up-from
(syntax-rules (to by)