shithub: sl

Info  •  Files  •  Log  •  Branches

string-width: return #f if wcwidth returns an error

--- a/src/flisp.h

+++ b/src/flisp.h

@@ -418,7 +418,7 @@

 	fixnum_t print_level;

 	fixnum_t p_level;

 	int scr_width;

-	int hpos, vpos;

+	ssize_t hpos, vpos;

 	htable_t reverse_dlsym_lookup_table;

 	htable_t TypeTable;

--- a/src/print.c

+++ b/src/print.c

@@ -21,7 +21,9 @@

 outsn(ios_t *f, const char *s, size_t n)

 {

 	ios_write(f, s, n);

-	FL(hpos) += u8_strwidth(s, n);

+	ssize_t w = u8_strwidth(s, n);

+	if(w > 0)

+		FL(hpos) += w;

 }

 static inline void

--- a/src/string.c

+++ b/src/string.c

@@ -55,7 +55,8 @@

 		type_error("string", args[0]);

 	char *str = tostring(args[0]);

 	size_t len = cv_len(ptr(args[0]));

-	return size_wrap(u8_strwidth(str, len));

+	ssize_t w = u8_strwidth(str, len);

+	return w < 0 ? FL_f : size_wrap(w);

 }

 BUILTIN("string-reverse", string_reverse)

--- a/src/utf8.c

+++ b/src/utf8.c

@@ -61,15 +61,19 @@

 	return charnum;

 }

-size_t

-u8_strwidth(const char *s, size_t n)

+ssize_t

+u8_strwidth(const char *s, ssize_t n)

 {

-	size_t i, w;

+	ssize_t i, w;

 	Rune r;

+	assert(n >= 0);

 	for(i = w = 0; i < n;){

 		i += chartorune(&r, s+i);

-		w += fl_wcwidth(r);

+		ssize_t x = fl_wcwidth(r);

+		if(x < 0)

+			return -1;

+		w += x;

 	}

 	return w;

 }

--- a/src/utf8.h

+++ b/src/utf8.h

@@ -49,7 +49,7 @@

 char *u8_memchr(char *s, Rune ch, size_t sz, size_t *charn);

 /* number of columns occupied by a string */

-size_t u8_strwidth(const char *s, size_t n) fl_purefn;

+ssize_t u8_strwidth(const char *s, ssize_t n) fl_purefn;

 /* determine whether a sequence of bytes is valid UTF-8. length is in bytes */

 int u8_isvalid(const char *str, int length) fl_purefn;