ref: bf67cf62e629985306488cbe6495dffa117c3484
parent: 7892ec8225d46e852e9547d4db5ed54775591bdd
author: Sigrid Solveig Haflínudóttir <sigrid@ftrv.se>
date: Tue Jan 28 18:23:47 EST 2025
sort out wcwidth and iswprint, add license for the latter
--- /dev/null
+++ b/3rd/iswprint.c
@@ -1,0 +1,35 @@
+/*
+Copyright © 2005-2020 Rich Felker, et al.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include "platform.h"
+
+// straight from musl
+int
+fl_iswprint(Rune c)
+{+ if(c < 0xff)
+ return ((c+1) & 0x7f) >= 0x21;
+ if(c < 0x2028 || c-0x202a < 0xd800-0x202a || c-0xe000 < 0xfff9-0xe000)
+ return 1;
+ return !(c-0xfffc > Runemax-0xfffc || (c&0xfffe) == 0xfffe);
+}
--- a/3rd/wcwidth.c
+++ b/3rd/wcwidth.c
@@ -523,7 +523,7 @@
}
int
-wcwidth(Rune ucs)
+fl_wcwidth(Rune ucs)
{// NOTE: created by hand, there isn't anything identifiable other than
// general Cf category code to identify these, and some characters in Cf
--- a/LICENSE
+++ b/LICENSE
@@ -10,6 +10,10 @@
mt19937-64 (3rd/mt19937-64.[ch]) is under MIT license.
+wcwidth (3rd/wcwidth.c) is under MIT license.
+
+iswprint (3rd/iswprint.c) is under MIT license.
+
Copyright (c) 2008 Jeff Bezanson
Copyright (c) 2025 Sigrid Solveig Haflínudóttir
--- a/meson.build
+++ b/meson.build
@@ -125,7 +125,7 @@
elif sys == 'dos'
platform = sys
flisp_exe_name = 'flisp.exe'
- src_flisp += ['3rd/wcwidth.c']
+ src_flisp += ['3rd/iswprint.c', '3rd/wcwidth.c']
else
platform = 'posix'
flisp_exe_name = 'flisp'
--- a/mkfile
+++ b/mkfile
@@ -18,6 +18,7 @@
3rd/brieflz/brieflz.$O\
3rd/brieflz/depacks.$O\
3rd/fn.$O\
+ 3rd/iswprint.$O\
3rd/mt19937-64.$O\
3rd/spooky.$O\
3rd/tbl.$O\
--- a/src/dos/platform.h
+++ b/src/dos/platform.h
@@ -24,7 +24,6 @@
#include <sys/time.h>
#include <time.h>
#include <unistd.h>
-#include <wctype.h>
#include <wchar.h>
#define __os_name__ "dos"
@@ -53,4 +52,5 @@
#include "mp.h"
#include "utf.h"
-int wcwidth(Rune c) fl_constfn;
+int fl_iswprint(Rune c) fl_constfn;
+int fl_wcwidth(Rune c) fl_constfn;
--- a/src/dos/sys.c
+++ b/src/dos/sys.c
@@ -19,8 +19,9 @@
time_t tme = (time_t)s;
struct tm tm;
- localtime_r(&tme, &tm);
- strftime(buf, sz, "%c", &tm);
+ *buf = 0;
+ if(localtime_r(&tme, &tm) != nil)
+ strftime(buf, sz, "%a %b %e %H:%M:%S %Y", &tm);
}
double
--- a/src/macos/platform.h
+++ b/src/macos/platform.h
@@ -51,6 +51,9 @@
#define ALLOC_LIMIT_TRIGGER INITIAL_HEAP_SIZE
#endif
+#define fl_iswprint(r) iswprint(r)
+#define fl_wcwidth(r) wcwidth(r)
+
#include "cc.h"
#include "mem.h"
#include "mp.h"
--- a/src/plan9/platform.h
+++ b/src/plan9/platform.h
@@ -125,7 +125,8 @@
typedef uintptr size_t;
typedef enum { false, true } bool;-int wcwidth(Rune c);
+int fl_iswprint(Rune c);
+int fl_wcwidth(Rune c);
int ftruncate(int f, off_t sz);
#if !defined(INITIAL_HEAP_SIZE)
--- a/src/posix/platform.h
+++ b/src/posix/platform.h
@@ -96,6 +96,9 @@
#define ALLOC_LIMIT_TRIGGER INITIAL_HEAP_SIZE
#endif
+#define fl_iswprint(r) iswprint(r)
+#define fl_wcwidth(r) wcwidth(r)
+
#include "cc.h"
#include "mem.h"
#include "mp.h"
--- a/src/print.c
+++ b/src/print.c
@@ -667,7 +667,7 @@
case ' ': outsn(f, "space", 5); break;
case 0x7f: outsn(f, "delete", 6); break;
default:
- if(u8_iswprint(r))
+ if(fl_iswprint(r))
outs(f, seq);
else
FL(hpos) += ios_printf(f, "x%04"PRIx32, r);
--- a/src/string.c
+++ b/src/string.c
@@ -47,7 +47,7 @@
if(iscprim(args[0])){cprim_t *cp = ptr(args[0]);
if(cp_class(cp) == FL(runetype)){- int w = wcwidth(*(Rune*)cp_data(cp));
+ int w = fl_wcwidth(*(Rune*)cp_data(cp));
return w < 0 ? FL_f : fixnum(w);
}
}
--- a/src/utf8.c
+++ b/src/utf8.c
@@ -31,17 +31,6 @@
2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 3,3,3,3,3,3,3,3,4,4,4,4,5,5,5,5
};
-// straight from musl
-int
-u8_iswprint(Rune c)
-{- if(c < 0xff)
- return ((c+1) & 0x7f) >= 0x21;
- if(c < 0x2028 || c-0x202a < 0xd800-0x202a || c-0xe000 < 0xfff9-0xe000)
- return 1;
- return !(c-0xfffc > Runemax-0xfffc || (c&0xfffe) == 0xfffe);
-}
-
/* returns length of next utf-8 sequence */
size_t
u8_seqlen(const char *s)
@@ -71,7 +60,7 @@
for(i = w = 0; s[i];){i += chartorune(&r, s+i);
- w += wcwidth(r);
+ w += fl_wcwidth(r);
}
return w;
}
@@ -173,7 +162,7 @@
}else{i0 = i;
ch = u8_nextmemchar(src, &i);
- if(ascii || !u8_iswprint(ch)){+ if(ascii || !fl_iswprint(ch)){buf += u8_escape_rune(buf, sz - (buf-start), ch);
}else{i = i0;
--- a/src/utf8.h
+++ b/src/utf8.h
@@ -3,8 +3,6 @@
/* is c the start of a utf8 sequence? */
#define isutf(c) (((c)&0xC0) != 0x80)
-int u8_iswprint(Rune c) fl_constfn;
-
/* byte offset to character number */
size_t u8_charnum(const char *s, size_t offset) fl_purefn;