shithub: sl

Info  •  Files  •  Log  •  Branches

for-each: operate on runes of a string rather than bytes

--- a/src/sl.c

+++ b/src/sl.c

@@ -1139,15 +1139,24 @@

 				PUSH(car_(v));

 				args[i] = cdr_(v);

 				continue;

-			}

-			if(isvec(v)){

+			}else if(isvec(v)){

 				usize sz = vec_size(v);

 				if(n < sz){

 					PUSH(vec_elt(v, n));

 					continue;

 				}

-			}

-			if(isarr(v)){

+			}else if(sl_isstr(v)){

+				char *s = tostr(v);

+				usize sz = cv_len(ptr(v)), b, k;

+				for(b = k = 0; k < n && b < sz; k++)

+					b += u8_seqlen(s+b);

+				if(k == n && b < sz){

+					Rune r;

+					chartorune(&r, s+b);

+					PUSH(mk_rune(r));

+					continue;

+				}

+			}else if(isarr(v)){

 				usize sz = cvalue_arrlen(v);

 				if(n < sz){

 					sl_v a[2];

@@ -1156,8 +1165,7 @@

 					PUSH(cvalue_arr_aref(a));

 					continue;

 				}

-			}

-			if(ishashtable(v)){

+			}else if(ishashtable(v)){

 				sl_htable *h = totable(v);

 				assert(n != 0 || h->i == 0);

 				void **table = h->table;

--- a/test/unittest.sl

+++ b/test/unittest.sl

@@ -529,6 +529,10 @@

 (assert (str-utf8? "wб☺🡷⁹гq"))

 (assert (not (str-utf8? "\xfffe")))

+(let {[b (buffer)]}

+  (with-output-to b (for-each print "йцукен"))

+  (assert (equal? (io->str b) "#\\й#\\ц#\\у#\\к#\\е#\\н")))

+

 (let ((b (buffer)))

   (write "a\x0a\x09\\\x07\x08\x1b\x0c\x0d\x0b" b)

   (assert (equal? (io->str b) «"a\n\t\\\a\b\e\f\r\v"»)))