fix d:words-with (thanks kiyoshi)

FossilOrigin-Name: 0698614ff0474fdcfaf6ba401233aa17a56ae0cb99ba4f26460f7fc8597441e5
This commit is contained in:
crc 2019-04-10 12:19:03 +00:00
parent 0806fa9dfc
commit d12677c1b7
2 changed files with 16 additions and 19 deletions

View file

@ -1,6 +1,6 @@
#include <stdint.h>
int32_t ngaImageCells = 16475;
int32_t ngaImage[] = { 1793,16229,16432,16474,201906,0,10,1,10,2,10,3,10,4,10,5,10,6,10,
int32_t ngaImageCells = 16450;
int32_t ngaImage[] = { 1793,16229,16407,16449,201906,0,10,1,10,2,10,3,10,4,10,5,10,6,10,
7,10,8,10,9,10,10,10,11,10,12,10,13,10,14,10,15,10,16,10,
17,10,18,10,19,10,20,10,21,10,22,10,23,10,24,10,25,10,26,10,
68223234,1,2575,85000450,1,656912,142,141,268505089,66,65,135205121,66,10,101384453,0,9,10,2049,59,
@ -160,7 +160,7 @@ int32_t ngaImage[] = { 1793,16229,16432,16474,201906,0,10,1,10,2,10,3,10,4,10,5,
112,100,97,116,101,45,117,115,105,110,103,0,4,1793,3158,15,4,8,10,1,
3154,2049,2082,16,10,3133,3172,147,99,111,112,121,0,1793,3181,1,59,2049,2070,2049,
62,10,1,3174,2049,2257,3,3,10,3164,3201,147,83,99,111,112,101,76,105,115,
116,0,16358,16390,10,3188,3210,147,123,123,0,2049,1570,2,1,3201,2049,62,16,10,
116,0,16313,16365,10,3188,3210,147,123,123,0,2049,1570,2,1,3201,2049,62,16,10,
3204,3235,147,45,45,45,114,101,118,101,97,108,45,45,45,0,2049,1570,1,3201,
2049,2913,16,10,3219,3249,147,125,125,0,1,3201,2049,59,4,15,11,1793,3263,3841,
3201,4097,2,10,1,3258,1793,3293,3841,3201,1793,3288,1,2,15,2,15,1,3201,2049,
@ -815,12 +815,11 @@ int32_t ngaImage[] = { 1793,16229,16432,16474,201906,0,10,1,10,2,10,3,10,4,10,5,
2499,2049,15941,2049,16076,2049,15929,1793,16253,2049,367,2049,15941,10,1,16248,1793,16259,3,10,
1,16257,2049,67,1,16242,7,10,16219,16281,147,105,109,97,103,101,58,115,97,118,
101,0,1,1000,2049,8967,2049,8941,10,16267,16299,147,100,58,119,111,114,100,115,0,
1793,16308,2049,165,2049,9060,2049,9034,10,1,16301,2049,7089,10,16288,16335,147,100,105,115,
112,108,97,121,45,105,102,45,109,97,116,99,104,101,100,0,2049,1841,67502597,2049,
4328,1793,16347,2049,9060,2049,9034,10,1,16342,1793,16353,3,10,1,16351,2049,67,10,16288,
16374,147,100,58,119,111,114,100,115,45,119,105,116,104,0,2049,1841,2049,4726,1793,
16385,2049,165,2049,16335,10,1,16380,2049,7089,10,16358,16409,147,100,105,115,112,108,97,
121,45,105,102,45,108,101,102,116,0,2,2049,1841,2049,4642,1793,16421,2049,9060,2049,
9034,10,1,16416,1793,16427,3,10,1,16425,2049,67,10,16358,16458,147,100,58,119,111,
114,100,115,45,98,101,103,105,110,110,105,110,103,45,119,105,116,104,0,2049,
1841,2049,4726,1793,16469,2049,165,2049,16409,10,1,16464,2049,7089,10,0 };
1793,16308,2049,165,2049,9060,2049,9034,10,1,16301,2049,7089,10,16288,16329,147,100,58,119,
111,114,100,115,45,119,105,116,104,0,2049,1841,2049,4726,1793,16360,2049,165,2,2049,
1841,2049,4328,1793,16349,2049,9060,2049,9034,10,1,16344,1793,16355,3,10,1,16353,2049,67,
10,1,16335,2049,7089,10,16313,16384,147,100,105,115,112,108,97,121,45,105,102,45,
108,101,102,116,0,2,2049,1841,2049,4642,1793,16396,2049,9060,2049,9034,10,1,16391,1793,
16402,3,10,1,16400,2049,67,10,16313,16433,147,100,58,119,111,114,100,115,45,98,
101,103,105,110,110,105,110,103,45,119,105,116,104,0,2049,1841,2049,4726,1793,16444,
2049,165,2049,16384,10,1,16439,2049,7089,10,0 };

View file

@ -16,13 +16,11 @@ in a specific namespace, e.g., by doing `'s: d:words-with`, or
words that likely display something: `':put d:words-with`.
~~~
{{
:display-if-matched (s-)
here over s:contains-string? [ s:put sp ] [ drop ] choose ;
---reveal---
:d:words-with (s-)
here s:copy [ d:name display-if-matched ] d:for-each ;
}}
:d:words-with (s-)
here s:copy
[ d:name dup here
(put-match s:contains-string? [ s:put sp ] [ drop ] choose )
] d:for-each ;
~~~
This does have a drawback if you want words in a namespace as