diff --git a/TeXmacs/plugins/goldfish/doc/goldfish.en.tm b/TeXmacs/plugins/goldfish/doc/goldfish.en.tm index a6ec669325..b4c9ae7de3 100644 --- a/TeXmacs/plugins/goldfish/doc/goldfish.en.tm +++ b/TeXmacs/plugins/goldfish/doc/goldfish.en.tm @@ -146,10 +146,9 @@ - + - SRFI implementation for Goldfish Scheme will be built-in for the Goldfish - Scheme session. Here is the concise guide to load the SRFIs. + For more, please visit: . <\wide-tabular> @@ -177,47 +176,47 @@ |<\cell> >| - + |<\cell> - List Library + Liii Base Library |<\cell> - + >| - + |<\cell> - Provide + Liii List Library |<\cell> - + >| - + |<\cell> - Provide + Liii Bitwise Library |<\cell> - + >| - + |<\cell> - String Library + Liii String Library |<\cell> - + >| - + |<\cell> - Provide + Liii Vector Library |<\cell> - + >| - + |<\cell> - Parameter objects + Liii Hash Table Library |<\cell> - + >| - + |<\cell> - Lightweight testing + Liii OS Library |<\cell> - + >>> @@ -225,7 +224,7 @@ <\unfolded-io> \\ <|unfolded-io> - (import (srfi srfi-1)) + (import (liii list)) <|unfolded-io> @@ -233,7 +232,15 @@ <\unfolded-io> \\ <|unfolded-io> - (reduce + 0 (list 1 2 3)) + (iota 5 1) + <|unfolded-io> + + + + <\unfolded-io> + \\ + <|unfolded-io> + (reduce + 0 (iota 3 1)) <|unfolded-io> @@ -241,7 +248,7 @@ <\unfolded-io> \\ <|unfolded-io> - (import (srfi srfi-78)) + (import (liii check)) <|unfolded-io> diff --git a/TeXmacs/plugins/goldfish/doc/goldfish.zh.tm b/TeXmacs/plugins/goldfish/doc/goldfish.zh.tm index a3d0a3835d..81af4268ab 100644 --- a/TeXmacs/plugins/goldfish/doc/goldfish.zh.tm +++ b/TeXmacs/plugins/goldfish/doc/goldfish.zh.tm @@ -136,10 +136,9 @@ - + \<#9C7C\>\<#6807\>\<#51C6\>\<#5E93\>> - SRFI\<#7684\>\<#5B9E\>\<#73B0\>\<#662F\>\<#91D1\>\<#9C7C\>Scheme\<#548C\>S7 - Scheme\<#7684\>\<#663E\>\<#8457\>\<#533A\>\<#522B\>\<#4E4B\>\<#4E00\>\<#FF0C\>\<#5728\>\<#91D1\>\<#9C7C\>Scheme\<#4F1A\>\<#8BDD\>\<#4E2D\>\<#FF0C\>\<#6211\>\<#4EEC\>\<#53EF\>\<#4EE5\>\<#4F7F\>\<#7528\>\<#4E0B\>\<#8868\>\<#4E2D\>\<#7684\>SRFI\<#5B9E\>\<#73B0\>\<#3002\> + \<#66F4\>\<#591A\>\<#6807\>\<#51C6\>\<#5E93\>\<#FF0C\>\<#8BF7\>\<#8BBF\>\<#95EE\>\<#91D1\>\<#9C7C\>Scheme\<#5B98\>\<#7F51\>\<#FF1A\> <\wide-tabular> @@ -167,53 +166,47 @@ |<\cell> >| - + |<\cell> - \<#5217\>\<#8868\>\<#51FD\>\<#6570\>\<#5E93\> + Liii Base Library |<\cell> - + >| - + |<\cell> - \<#63D0\>\<#4F9B\> + Liii List Library |<\cell> - + >| - + |<\cell> - \<#63D0\>\<#4F9B\> + Liii Bitwise Library |<\cell> - + >| - + |<\cell> - \<#5B57\>\<#7B26\>\<#4E32\>\<#51FD\>\<#6570\>\<#5E93\> + Liii String Library |<\cell> - + >| - + |<\cell> - \<#63D0\>\<#4F9B\> + Liii Vector Library |<\cell> - + >| - + |<\cell> - \<#53C2\>\<#6570\>\<#5316\>\<#5BF9\>\<#8C61\> + Liii Hash Table Library |<\cell> - + >| - + |<\cell> - \<#8F7B\>\<#91CF\>\<#7EA7\>\<#6D4B\>\<#8BD5\>\<#6846\>\<#67B6\> + Liii OS Library |<\cell> - - >| - - |<\cell> - SICP\<#517C\>\<#5BB9\>\<#5E93\> - |<\cell> - + >>> @@ -221,7 +214,7 @@ <\unfolded-io> \\ <|unfolded-io> - (import (srfi srfi-1)) + (import (liii list)) <|unfolded-io> @@ -229,7 +222,15 @@ <\unfolded-io> \\ <|unfolded-io> - (reduce + 0 (list 1 2 3)) + (iota 5 1) + <|unfolded-io> + + + + <\unfolded-io> + \\ + <|unfolded-io> + (reduce + 0 (iota 3 1)) <|unfolded-io> @@ -237,7 +238,7 @@ <\unfolded-io> \\ <|unfolded-io> - (import (srfi srfi-78)) + (import (liii check)) <|unfolded-io> diff --git a/TeXmacs/plugins/goldfish/progs/code/liii-keyword.scm b/TeXmacs/plugins/goldfish/progs/code/liii-keyword.scm index d897f70c11..bf33fc5cd6 100644 --- a/TeXmacs/plugins/goldfish/progs/code/liii-keyword.scm +++ b/TeXmacs/plugins/goldfish/progs/code/liii-keyword.scm @@ -24,7 +24,11 @@ (define (liii-list) (map symbol->string - '(list-view flatmap list-null? list-not-null? not-null-list?))) + '(list-view flatmap flatten list-null? list-not-null? not-null-list?))) + +(define (liii-string) + (map symbol->string + '(string-starts? string-ends? string-remove-prefix string-remove-suffix))) (define (liii-os) (map symbol->string @@ -50,7 +54,8 @@ (tm-define (liii-keywords) - `(,@(liii-base) ,@(liii-check) ,@(liii-list) ,@(liii-os) ,@(liii-queue) + `(,@(liii-base) ,@(liii-check) ,@(liii-list) + ,@(liii-string) ,@(liii-os) ,@(liii-queue) ,@(liii-stack) ,@(liii-sys) ,@(liii-uuid))) (tm-define (liii-keywords-define) diff --git a/TeXmacs/plugins/r7rs/progs/code/srfi-keyword.scm b/TeXmacs/plugins/r7rs/progs/code/srfi-keyword.scm index efcef6cf61..2dd2322897 100644 --- a/TeXmacs/plugins/r7rs/progs/code/srfi-keyword.scm +++ b/TeXmacs/plugins/r7rs/progs/code/srfi-keyword.scm @@ -63,8 +63,6 @@ "string-pad-right" "string-trim" "string-trim-right" "string-trim-both" ; SRFI-13: String comparison "string-compare" "string=" "string<>" - ; SRFI-13: String Prefixes & Suffixes - "string-prefix?" "string-suffix?" ; SRFI-13: String searching "string-index" "string-index-right" "string-skip" "string-skip-right" "string-count" "string-contains" @@ -78,8 +76,8 @@ (tm-define (srfi-60-keywords) (list - "logand" "logior" "logxor" "lognot" "logand" - "logbit?" "ash")) + "bitwise-and" "bitwise-ior" "bitwise-xor" "bitwise-not" + "arithmetic-shift" "ash")) (tm-define (srfi-70-keywords) (list