Skip to content

Commit ee059f3

Browse files
da-liiida-liii
committed
[61_7] Goldfish: update syntax and doc
1 parent 84b6231 commit ee059f3

File tree

4 files changed

+77
-66
lines changed

4 files changed

+77
-66
lines changed

‎TeXmacs/plugins/goldfish/doc/goldfish.en.tm

+34-27
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,9 @@
146146
</input>
147147
</session>
148148

149-
<paragraph|SRFI>
149+
<paragraph|Godfish Standard Libraries>
150150

151-
SRFI implementation for Goldfish Scheme will be built-in for the Goldfish
152-
Scheme session. Here is the concise guide to load the SRFIs.
151+
For more, please visit: <slink|https://github.com/LiiiLabs/goldfish>.
153152

154153
<\wide-tabular>
155154
<tformat|<table|<row|<\cell>
@@ -177,71 +176,79 @@
177176
</cell>|<\cell>
178177
<scm|(import (scheme time))>
179178
</cell>>|<row|<\cell>
180-
<hlink|SRFI 1|$TEXMACS_PATH/plugins/goldfish/goldfish/srfi/srfi-1.scm>
179+
<hlink|(liii base)|$TEXMACS_PATH/plugins/goldfish/goldfish/liii/list.scm>
181180
</cell>|<\cell>
182-
List Library
181+
Liii Base Library
183182
</cell>|<\cell>
184-
<scm|(import (srfi srfi-1))>
183+
<scm|(import (liii base))>
185184
</cell>>|<row|<\cell>
186-
<hlink|SRFI 8|$TEXMACS_PATH/plugins/goldfish/goldfish/srfi/srfi-8.scm>
185+
<hlink|(liii list)|$TEXMACS_PATH/plugins/goldfish/goldfish/liii/list.scm>
187186
</cell>|<\cell>
188-
Provide <scm|receive>
187+
Liii List Library
189188
</cell>|<\cell>
190-
<scm|(import (srfi srfi-8))>
189+
<scm|(import (liii list))>
191190
</cell>>|<row|<\cell>
192-
<hlink|SRFI 9|$TEXMACS_PATH/plugins/goldfish/goldfish/srfi/srfi-9.scm>
191+
<hlink|(liii bitwise)|$TEXMACS_PATH/plugins/goldfish/goldfish/liii/bitwise.scm>
193192
</cell>|<\cell>
194-
Provide <scm|define-record-type>
193+
Liii Bitwise Library
195194
</cell>|<\cell>
196-
<scm|(import (srfi srfi-9))>
195+
<scm|(import (liii bitwise))>
197196
</cell>>|<row|<\cell>
198-
<hlink|SRFI 13|$TEXMACS_PATH/plugins/goldfish/goldfish/srfi/srfi-13.scm>
197+
<hlink|(liii string)|$TEXMACS_PATH/plugins/goldfish/goldfish/liii/string.scm>
199198
</cell>|<\cell>
200-
String Library
199+
Liii String Library
201200
</cell>|<\cell>
202-
<scm|(import (srfi srfi-13))>
201+
<scm|(import (liii string))>
203202
</cell>>|<row|<\cell>
204-
<hlink|SRFI 16|$TEXMACS_PATH/plugins/goldfish/goldfish/srfi/srfi-16.scm>
203+
<hlink|(liii vector)|$TEXMACS_PATH/plugins/goldfish/goldfish/liii/vector.scm>
205204
</cell>|<\cell>
206-
Provide <scm|case-lambda>
205+
Liii Vector Library
207206
</cell>|<\cell>
208-
<scm|(import (srfi srfi-16))>
207+
<scm|(import (liii vector))>
209208
</cell>>|<row|<\cell>
210-
<hlink|SRFI 39|$TEXMACS_PATH/plugins/goldfish/goldfish/srfi/srfi-39.scm>
209+
<hlink|(liii hash-table)|$TEXMACS_PATH/plugins/goldfish/goldfish/liii/hash-table.scm>
211210
</cell>|<\cell>
212-
Parameter objects
211+
Liii Hash Table Library
213212
</cell>|<\cell>
214-
<scm|(import (srfi srfi-39))>
213+
<scm|(import (liii hash-table))>
215214
</cell>>|<row|<\cell>
216-
<hlink|SRFI 78|$TEXMACS_PATH/plugins/goldfish/goldfish/srfi/srfi-78.scm>
215+
<hlink|(liii os)|$TEXMACS_PATH/plugins/goldfish/goldfish/liii/os.scm>
217216
</cell>|<\cell>
218-
Lightweight testing
217+
Liii OS Library
219218
</cell>|<\cell>
220-
<scm|(import (srfi srfi-78))>
219+
<scm|(import (liii os))>
221220
</cell>>>>
222221
</wide-tabular>
223222

224223
<\session|goldfish|default>
225224
<\unfolded-io>
226225
\<gtr\>\
227226
<|unfolded-io>
228-
(import (srfi srfi-1))
227+
(import (liii list))
229228
<|unfolded-io>
230229
<goldfish-result|(rootlet)>
231230
</unfolded-io>
232231

233232
<\unfolded-io>
234233
\<gtr\>\
235234
<|unfolded-io>
236-
(reduce + 0 (list 1 2 3))
235+
(iota 5 1)
236+
<|unfolded-io>
237+
<goldfish-result|(1 2 3 4 5)>
238+
</unfolded-io>
239+
240+
<\unfolded-io>
241+
\<gtr\>\
242+
<|unfolded-io>
243+
(reduce + 0 (iota 3 1))
237244
<|unfolded-io>
238245
<goldfish-result|6>
239246
</unfolded-io>
240247

241248
<\unfolded-io>
242249
\<gtr\>\
243250
<|unfolded-io>
244-
(import (srfi srfi-78))
251+
(import (liii check))
245252
<|unfolded-io>
246253
<goldfish-result|(rootlet)>
247254
</unfolded-io>

‎TeXmacs/plugins/goldfish/doc/goldfish.zh.tm

+34-33
Original file line numberDiff line numberDiff line change
@@ -136,10 +136,9 @@
136136
</input>
137137
</session>
138138

139-
<paragraph|SRFI>
139+
<paragraph|\<#91D1\>\<#9C7C\>\<#6807\>\<#51C6\>\<#5E93\>>
140140

141-
SRFI\<#7684\>\<#5B9E\>\<#73B0\>\<#662F\>\<#91D1\>\<#9C7C\>Scheme\<#548C\>S7
142-
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\>
141+
\<#66F4\>\<#591A\>\<#6807\>\<#51C6\>\<#5E93\>\<#FF0C\>\<#8BF7\>\<#8BBF\>\<#95EE\>\<#91D1\>\<#9C7C\>Scheme\<#5B98\>\<#7F51\>\<#FF1A\><slink|https://gitee.com/LiiiLabs/goldfish>
143142

144143
<\wide-tabular>
145144
<tformat|<table|<row|<\cell>
@@ -167,77 +166,79 @@
167166
</cell>|<\cell>
168167
<scm|(import (scheme time))>
169168
</cell>>|<row|<\cell>
170-
<hlink|SRFI 1|$TEXMACS_PATH/plugins/goldfish/goldfish/srfi/srfi-1.scm>
169+
<hlink|(liii base)|$TEXMACS_PATH/plugins/goldfish/goldfish/liii/list.scm>
171170
</cell>|<\cell>
172-
\<#5217\>\<#8868\>\<#51FD\>\<#6570\>\<#5E93\>
171+
Liii Base Library
173172
</cell>|<\cell>
174-
<scm|(import (srfi srfi-1))>
173+
<scm|(import (liii base))>
175174
</cell>>|<row|<\cell>
176-
<hlink|SRFI 8|$TEXMACS_PATH/plugins/goldfish/goldfish/srfi/srfi-8.scm>
175+
<hlink|(liii list)|$TEXMACS_PATH/plugins/goldfish/goldfish/liii/list.scm>
177176
</cell>|<\cell>
178-
\<#63D0\>\<#4F9B\><scm|receive>
177+
Liii List Library
179178
</cell>|<\cell>
180-
<scm|(import (srfi srfi-8))>
179+
<scm|(import (liii list))>
181180
</cell>>|<row|<\cell>
182-
<hlink|SRFI 9|$TEXMACS_PATH/plugins/goldfish/goldfish/srfi/srfi-9.scm>
181+
<hlink|(liii bitwise)|$TEXMACS_PATH/plugins/goldfish/goldfish/liii/bitwise.scm>
183182
</cell>|<\cell>
184-
\<#63D0\>\<#4F9B\><scm|define-record-type>
183+
Liii Bitwise Library
185184
</cell>|<\cell>
186-
<scm|(import (srfi srfi-9))>
185+
<scm|(import (liii bitwise))>
187186
</cell>>|<row|<\cell>
188-
<hlink|SRFI 13|$TEXMACS_PATH/plugins/goldfish/goldfish/srfi/srfi-13.scm>
187+
<hlink|(liii string)|$TEXMACS_PATH/plugins/goldfish/goldfish/liii/string.scm>
189188
</cell>|<\cell>
190-
\<#5B57\>\<#7B26\>\<#4E32\>\<#51FD\>\<#6570\>\<#5E93\>
189+
Liii String Library
191190
</cell>|<\cell>
192-
<scm|(import (srfi srfi-13))>
191+
<scm|(import (liii string))>
193192
</cell>>|<row|<\cell>
194-
<hlink|SRFI 16|$TEXMACS_PATH/plugins/goldfish/goldfish/srfi/srfi-16.scm>
193+
<hlink|(liii vector)|$TEXMACS_PATH/plugins/goldfish/goldfish/liii/vector.scm>
195194
</cell>|<\cell>
196-
\<#63D0\>\<#4F9B\><code*|case-lambda>
195+
Liii Vector Library
197196
</cell>|<\cell>
198-
<scm|(import (srfi srfi-16))>
197+
<scm|(import (liii vector))>
199198
</cell>>|<row|<\cell>
200-
<hlink|SRFI 39|$TEXMACS_PATH/plugins/goldfish/goldfish/srfi/srfi-39.scm>
199+
<hlink|(liii hash-table)|$TEXMACS_PATH/plugins/goldfish/goldfish/liii/hash-table.scm>
201200
</cell>|<\cell>
202-
\<#53C2\>\<#6570\>\<#5316\>\<#5BF9\>\<#8C61\>
201+
Liii Hash Table Library
203202
</cell>|<\cell>
204-
<scm|(import (srfi srfi-39))>
203+
<scm|(import (liii hash-table))>
205204
</cell>>|<row|<\cell>
206-
<hlink|SRFI 78|$TEXMACS_PATH/plugins/goldfish/goldfish/srfi/srfi-78.scm>
205+
<hlink|(liii os)|$TEXMACS_PATH/plugins/goldfish/goldfish/liii/os.scm>
207206
</cell>|<\cell>
208-
\<#8F7B\>\<#91CF\>\<#7EA7\>\<#6D4B\>\<#8BD5\>\<#6846\>\<#67B6\>
207+
Liii OS Library
209208
</cell>|<\cell>
210-
<scm|(import (srfi srfi-78))>
211-
</cell>>|<row|<\cell>
212-
<hlink|SRFI 216|$TEXMACS_PATH/plugins/goldfish/goldfish/srfi/srfi-216.scm>
213-
</cell>|<\cell>
214-
SICP\<#517C\>\<#5BB9\>\<#5E93\>
215-
</cell>|<\cell>
216-
<scm|(import (srfi sicp))>
209+
<scm|(import (liii os))>
217210
</cell>>>>
218211
</wide-tabular>
219212

220213
<\session|goldfish|default>
221214
<\unfolded-io>
222215
\<gtr\>\
223216
<|unfolded-io>
224-
(import (srfi srfi-1))
217+
(import (liii list))
225218
<|unfolded-io>
226219
<goldfish-result|(rootlet)>
227220
</unfolded-io>
228221

229222
<\unfolded-io>
230223
\<gtr\>\
231224
<|unfolded-io>
232-
(reduce + 0 (list 1 2 3))
225+
(iota 5 1)
226+
<|unfolded-io>
227+
<goldfish-result|(1 2 3 4 5)>
228+
</unfolded-io>
229+
230+
<\unfolded-io>
231+
\<gtr\>\
232+
<|unfolded-io>
233+
(reduce + 0 (iota 3 1))
233234
<|unfolded-io>
234235
<goldfish-result|6>
235236
</unfolded-io>
236237

237238
<\unfolded-io>
238239
\<gtr\>\
239240
<|unfolded-io>
240-
(import (srfi srfi-78))
241+
(import (liii check))
241242
<|unfolded-io>
242243
<goldfish-result|(rootlet)>
243244
</unfolded-io>

‎TeXmacs/plugins/goldfish/progs/code/liii-keyword.scm

+7-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@
2424

2525
(define (liii-list)
2626
(map symbol->string
27-
'(list-view flatmap list-null? list-not-null? not-null-list?)))
27+
'(list-view flatmap flatten list-null? list-not-null? not-null-list?)))
28+
29+
(define (liii-string)
30+
(map symbol->string
31+
'(string-starts? string-ends? string-remove-prefix string-remove-suffix)))
2832

2933
(define (liii-os)
3034
(map symbol->string
@@ -50,7 +54,8 @@
5054

5155

5256
(tm-define (liii-keywords)
53-
`(,@(liii-base) ,@(liii-check) ,@(liii-list) ,@(liii-os) ,@(liii-queue)
57+
`(,@(liii-base) ,@(liii-check) ,@(liii-list)
58+
,@(liii-string) ,@(liii-os) ,@(liii-queue)
5459
,@(liii-stack) ,@(liii-sys) ,@(liii-uuid)))
5560

5661
(tm-define (liii-keywords-define)

‎TeXmacs/plugins/r7rs/progs/code/srfi-keyword.scm

+2-4
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@
6363
"string-pad-right" "string-trim" "string-trim-right" "string-trim-both"
6464
; SRFI-13: String comparison
6565
"string-compare" "string=" "string<>"
66-
; SRFI-13: String Prefixes & Suffixes
67-
"string-prefix?" "string-suffix?"
6866
; SRFI-13: String searching
6967
"string-index" "string-index-right" "string-skip" "string-skip-right" "string-count"
7068
"string-contains"
@@ -78,8 +76,8 @@
7876

7977
(tm-define (srfi-60-keywords)
8078
(list
81-
"logand" "logior" "logxor" "lognot" "logand"
82-
"logbit?" "ash"))
79+
"bitwise-and" "bitwise-ior" "bitwise-xor" "bitwise-not"
80+
"arithmetic-shift" "ash"))
8381

8482
(tm-define (srfi-70-keywords)
8583
(list

0 commit comments

Comments
 (0)