Skip to content

Commit c741432

Browse files
committed
Merge pull request #14290 from KDr2/flisp-bootstrap
add function `string.encode' to avoid flisp bootstrap failure
2 parents 9918c4c + b6bae38 commit c741432

File tree

3 files changed

+2
-9
lines changed

3 files changed

+2
-9
lines changed

src/flisp/aliases.scm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
(define char>? >)
1313
(define char<=? <=)
1414
(define char>=? >=)
15-
(define (char-whitespace? c) (not (not (string.find *whitespace* c))))
1615
(define (char-numeric? c) (not (not (string.find "0123456789" c))))
1716

1817
(define string-append string)

src/flisp/flisp.boot

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,8 @@
5959
trycatch lambda if and pair? eq? car quote thrown-value cadr caddr raise]) let #fn(">000s1^|C6B0|m62}Mm02}Nm1530]2c0c1L1c2c3|32L1c4}3133c2c5|32g66C0c6g6g7L2L1g6L3540g7g8K;" [#fn(nconc)
6060
lambda #fn(map) #fn("5000r1|F650|M;|;" [])
6161
#fn(copy-list) #fn("5000r1|F650|\x84;e040;" [void]) letrec]))
62-
*whitespace* "\t\n\v\f\r \u0085  ᠎           \u2028\u2029   " 1+
63-
#fn("6000r1|aw;" [] 1+) 1- #fn("6000r1|ax;" [] 1-) 1arg-lambda?
64-
#fn("7000r1|F16T02|Mc0<16J02|NF16B02|\x84F16:02e1|\x84a42;" [lambda
62+
1+ #fn("6000r1|aw;" [] 1+) 1-
63+
#fn("6000r1|ax;" [] 1-) 1arg-lambda? #fn("7000r1|F16T02|Mc0<16J02|NF16B02|\x84F16:02e1|\x84a42;" [lambda
6564
length=] 1arg-lambda?)
6665
<= #fn("6000r2|}X17602|}W;" [] <=) >
6766
#fn("6000r2}|X;" [] >) >= #fn("6000r2}|X17602|}W;" [] >=)

src/flisp/system.lsp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -640,11 +640,6 @@
640640

641641
(define (string.tail s n) (string.sub s (string.inc s 0 n)))
642642

643-
(define *whitespace*
644-
(string.encode #array(wchar 9 10 11 12 13 32 133 160 5760 6158 8192
645-
8193 8194 8195 8196 8197 8198 8199 8200
646-
8201 8202 8232 8233 8239 8287 12288)))
647-
648643
#;(define (string.trim s at-start at-end)
649644
(define (trim-start s chars i L)
650645
(if (and (< i L)

0 commit comments

Comments
 (0)