diff --git a/example/7080.retro b/example/7080.retro
index eba022c..95299b2 100755
--- a/example/7080.retro
+++ b/example/7080.retro
@@ -83,8 +83,8 @@ pointers in the variables.
~~~
:parse-url (s-)
- $: s:split s:keep !Server
- $/ s:split n:inc s:to-number !Port
+ $: s:split/char s:keep !Server
+ $/ s:split/char n:inc s:to-number !Port
s:keep !Selector ;
diff --git a/example/Casket-HTTP.retro b/example/Casket-HTTP.retro
index 2ee59de..078a1bd 100755
--- a/example/Casket-HTTP.retro
+++ b/example/Casket-HTTP.retro
@@ -83,7 +83,7 @@ the requested file from any query string that may be present.
:check-for-params (-)
&Requested $? s:contains-char?
- [ &Requested $? s:split drop dup n:inc !GET-Query #0 swap store ] if ;
+ [ &Requested $? s:split/char drop dup n:inc !GET-Query #0 swap store ] if ;
:filename (-s)
check-for-params map-/-to-index ensure-leading-/
diff --git a/example/atua-gophermap.retro b/example/atua-gophermap.retro
index 8d79ecc..5032275 100755
--- a/example/atua-gophermap.retro
+++ b/example/atua-gophermap.retro
@@ -153,7 +153,7 @@ a binary (type 9) file if I don't recognize the extension.
~~~
:file-type
- dup $. s:split drop
+ dup $. s:split/char drop
'.forth [ $0 ] s:case
'.md [ $0 ] s:case
'.txt [ $0 ] s:case
diff --git a/example/curl.retro b/example/curl.retro
index 443bbdd..f4a47d4 100644
--- a/example/curl.retro
+++ b/example/curl.retro
@@ -45,7 +45,7 @@ flags:
'POST flag
generate-request pipe>
-'"response":" s:split-on-string drop #12 + s:chop s:chop s:keep 'SESSION s:const
+'"response":" s:split/string drop #12 + s:chop s:chop s:keep 'SESSION s:const
~~~
Send a message using the session token.
diff --git a/example/enum.retro b/example/enum.retro
index 1cbeb81..abf49d4 100644
--- a/example/enum.retro
+++ b/example/enum.retro
@@ -33,7 +33,7 @@ increments the counter.
:a:enum (a-)
#0 swap
[ dup $= s:contains-char?
- [ nip $= s:split [ n:inc s:to-number ] dip ] if
+ [ nip $= s:split/char [ n:inc s:to-number ] dip ] if
over &const dip n:inc
] a:for-each drop ;
~~~
diff --git a/example/export-as-html.retro b/example/export-as-html.retro
index 104f5d9..5f1a18e 100755
--- a/example/export-as-html.retro
+++ b/example/export-as-html.retro
@@ -264,7 +264,7 @@ headers should look like:
over '####_ s:begins-with? or ;
:format:head
- ASCII:SPACE s:split
+ ASCII:SPACE s:split/char
'# [ ' s:put n:inc s:put '
s:put nl ] s:case
'## [ ' s:put n:inc s:put '
s:put nl ] s:case
'### [ ' s:put n:inc s:put '
s:put nl ] s:case
diff --git a/example/http-get.retro b/example/http-get.retro
index 261b231..4a8475c 100644
--- a/example/http-get.retro
+++ b/example/http-get.retro
@@ -65,7 +65,7 @@ split on the first / character to separate the domain and requested file.
'Host var
'Request var
-:parse-url #7 + $/ s:split s:keep !Host s:keep !Request ;
+:parse-url #7 + $/ s:split/char s:keep !Host s:keep !Request ;
~~~
Given that, making a request is simply:
diff --git a/example/http-post.retro b/example/http-post.retro
index 84a26fd..b1b0726 100644
--- a/example/http-post.retro
+++ b/example/http-post.retro
@@ -71,7 +71,7 @@ This also takes a second string with the parameters to pass.
'Request var
'Params var
-:parse-url #7 + $/ s:split s:keep !Host s:keep !Request s:keep !Params ;
+:parse-url #7 + $/ s:split/char s:keep !Host s:keep !Request s:keep !Params ;
~~~
Given that, making a request is simply:
diff --git a/package/extensions/deprecated.retro b/package/extensions/deprecated.retro
new file mode 100644
index 0000000..31e2900
--- /dev/null
+++ b/package/extensions/deprecated.retro
@@ -0,0 +1,5 @@
+~~~
+:s:split (sc-ss) s:split/char ;
+:s:split-on-string (ss-ss) s:split/string ;
+~~~
+
diff --git a/vm/nga-c/image.c b/vm/nga-c/image.c
index 6bce0d7..b117c39 100644
--- a/vm/nga-c/image.c
+++ b/vm/nga-c/image.c
@@ -10,8 +10,8 @@
#define CELL_MAX LLONG_MAX - 1
#endif
#endif
-CELL ngaImageCells = 15098;
-CELL ngaImage[] = { 1793,14718,15073,15097,202107,376,348,1027,1535,0,10,1,10,2,10,3,10,4,10,
+CELL ngaImageCells = 14937;
+CELL ngaImage[] = { 1793,14718,14912,14936,202107,376,348,1027,1535,0,10,1,10,2,10,3,10,4,10,
5,10,6,10,7,10,8,10,9,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,68223234,1,2575,85000450,1,656912,144,161,268505089,67,66,285281281,0,67,2063,10,101384453,0,9,
@@ -170,7 +170,7 @@ CELL ngaImage[] = { 1793,14718,15073,15097,202107,376,348,1027,1535,0,10,1,10,2,
3113,2049,2095,4100,10,3096,3136,149,118,58,117,112,100,97,116,101,0,4,1793,3143,
15,4,8,10,1,3139,2049,2105,16,10,3124,3157,149,99,111,112,121,0,1793,3166,
285278725,1,33951492,268767489,1,6,10,1,3159,2049,2270,771,10,3149,3185,149,83,99,111,112,
- 101,76,105,115,116,0,14923,14975,10,3172,3194,149,123,123,0,2049,1570,2,1,3185,
+ 101,76,105,115,116,0,14762,14814,10,3172,3194,149,123,123,0,2049,1570,2,1,3185,
2049,63,16,10,3188,3219,149,45,45,45,114,101,118,101,97,108,45,45,45,0,
2049,1570,1,3185,2049,2921,16,10,3203,3233,149,125,125,0,1,3185,2049,60,4,15,
11,1793,3247,3841,3185,4097,2,10,1,3242,1793,3273,3841,3185,1793,3268,1,2,983567,1,
@@ -189,7 +189,7 @@ CELL ngaImage[] = { 1793,14718,15073,15097,202107,376,348,1027,1535,0,10,1,10,2,
2095,4097,3296,10,3464,3518,137,84,101,109,112,83,116,114,105,110,103,115,0,32,
3503,3536,137,84,101,109,112,83,116,114,105,110,103,77,97,120,0,512,3519,3548,
149,83,84,82,73,78,71,83,0,2049,1543,3841,3518,3841,3536,19,18,10,3537,3568,
- 137,67,117,114,114,101,110,116,0,10,10,3557,3583,149,115,58,112,111,105,110,
+ 137,67,117,114,114,101,110,116,0,2,10,3557,3583,149,115,58,112,111,105,110,
116,101,114,0,3841,3568,3841,3536,19,2049,3548,17,10,3570,3602,149,115,58,110,101,
120,116,0,1,3568,2049,3019,3841,3568,3841,3518,11,1793,3618,1,0,4097,3568,10,1,
3613,9,10,3537,3632,149,115,58,116,101,109,112,0,2,2049,85,2049,2921,2049,3583,
@@ -756,13 +756,5 @@ CELL ngaImage[] = { 1793,14718,15073,15097,202107,376,348,1027,1535,0,10,1,10,2,
14845,2049,9379,2049,9353,10,1,14840,1793,14851,3,10,1,14849,2049,68,10,14762,14882,149,
100,58,119,111,114,100,115,45,98,101,103,105,110,110,105,110,103,45,119,105,
116,104,0,2049,1871,2049,4678,1793,14893,2049,167,2049,14833,10,1,14888,2049,7528,10,14856,
- 14909,149,100,58,119,111,114,100,115,0,1793,14918,2049,167,2049,9379,2049,9353,10,1,
- 14911,2049,7528,10,14898,14939,149,100,58,119,111,114,100,115,45,119,105,116,104,0,
- 2049,1871,2049,4678,1793,14970,2049,167,2,2049,1871,2049,4192,1793,14959,2049,9379,2049,9353,10,
- 1,14954,1793,14965,3,10,1,14963,2049,68,10,1,14945,2049,7528,10,14923,14994,149,100,
- 105,115,112,108,97,121,45,105,102,45,108,101,102,116,0,2,2049,1871,2049,4628,
- 1793,15006,2049,9379,2049,9353,10,1,15001,1793,15012,3,10,1,15010,2049,68,10,14923,15043,
- 149,100,58,119,111,114,100,115,45,98,101,103,105,110,110,105,110,103,45,119,
- 105,116,104,0,2049,1871,2049,4678,1793,15054,2049,167,2049,14994,10,1,15049,2049,7528,10,
- 15017,15070,149,115,58,115,112,108,105,116,0,2049,6143,10,15059,15094,149,115,58,115,
- 112,108,105,116,45,111,110,45,115,116,114,105,110,103,0,2049,6175,10,0 };
+ 14909,149,115,58,115,112,108,105,116,0,2049,6143,10,14898,14933,149,115,58,115,112,
+ 108,105,116,45,111,110,45,115,116,114,105,110,103,0,2049,6175,10,0 };