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

Just went with the existing string-split

Browse source
This commit is contained in:
Brian Caine 2017-08-08 01:11:24 -04:00
parent 90e2cb1aa6
commit a0dfe647cd
1 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
tools/chibi-ffi
View file

@ -319,13 +319,17 @@
(else (lp from (+ i 1) res))))))
(define (string-split str c . o)
(let ((start (if (pair? o) (car o) 0))
(let ((test?
(if (procedure? c)
c
(lambda (char) (eqv? char c))))
(start (if (pair? o) (car o) 0))
(end (string-length str)))
(let lp ((from start) (i start) (res '()))
(define (collect) (if (= i from) res (cons (substring str from i) res)))
(cond
((>= i end) (reverse (collect)))
((eqv? c (string-ref str i)) (lp (+ i 1) (+ i 1) (collect)))
((test? (string-ref str i)) (lp (+ i 1) (+ i 1) (collect)))
(else (lp from (+ i 1) res))))))
(define (string-scan c str . o)
@ -416,21 +420,14 @@
(set! *clibs* (cons lib *clibs*)))
(define (c-flags-from-script cmd)
(eval '(import (chibi process)
; lest I clobber the existing string-split:
(prefix (chibi string) imported:)
(chibi char-set full)) ; for char-set:whitespace
(current-environment))
(let ((string-null? (eval 'imported:string-null? (current-environment)))
(string-split (eval 'imported:string-split (current-environment)))
(process->string (eval 'process->string (current-environment)))
(char-set:whitespace
(eval 'char-set:whitespace (current-environment))))
(eval '(import (chibi process)) (current-environment))
(let ((string-null? (lambda (str) (equal? str "")))
(process->string (eval 'process->string (current-environment))))
(set! *cflags*
(append *cflags*
(filter
(lambda (x) (not (string-null? x)))
(string-split (process->string cmd) char-set:whitespace))))))
(string-split (process->string cmd) char-whitespace?))))))
(define (c-declare . args)
(apply cat args)