From 7ea1cdb7d31f00024f5a1d124b42cd19a03b959a Mon Sep 17 00:00:00 2001 From: Nicholas Date: Wed, 10 Nov 2021 20:12:45 -0800 Subject: chore: libunicode -> libutf --- include/base.h | 8 ++++---- include/libunicode.h | 38 -------------------------------------- include/libutf.h | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 42 deletions(-) delete mode 100644 include/libunicode.h create mode 100644 include/libutf.h (limited to 'include') diff --git a/include/base.h b/include/base.h index a7813e6..b841040 100644 --- a/include/base.h +++ b/include/base.h @@ -261,12 +261,12 @@ int bufio·read(io·Buffer *buf, int sz, int n, void *out); // ----------------------------------------------------------------------------- // memory mapped files -typedef struct mmap·Reader +typedef struct mmap·Reader { vlong len; - union { - byte *buf; - ubyte *ubuf; + union{ + char *b; + uchar *u; }; } mmap·Reader; diff --git a/include/libunicode.h b/include/libunicode.h deleted file mode 100644 index 25d6dee..0000000 --- a/include/libunicode.h +++ /dev/null @@ -1,38 +0,0 @@ -#pragma once - -typedef uint32 rune; - -#define UTFmax 4 -#define RuneErr 0xFFFDu -#define RuneMax 0x10FFFFu - -#define utf8·onebyte(c) (((c)&0x80u)==0x00u) -#define utf8·twobyte(c) (((c)&0xE0u)==0xC0u) -#define utf8·threebyte(c) (((c)&0xF0u)==0xE0u) -#define utf8·fourbyte(c) (((c)&0xF8u)==0xF0u) - -/* - * UTF-8 functions. - */ -int utf8·len(char *s); // returns number of runes for s -int utf8·runelen(rune r); // returns number of bytes for rune -int utf8·runewidth(rune r); // returns number of printed columns for rune - -int utf8·decode(char *, rune *); // decode 1 rune from char stream, store into rune, return number of bytes -int utf8·encode(rune *, char *); // encode 1 rune from rune stream, store into char, return number of bytes -int utf8·decodeprev(char *s, rune *r); // decode 1 rune from char stream, reading backwards, store into rune, return number of bytes - -char *utf8·find(char *s, rune); // find rune in char stream -char *utf8·findlast(char* s, rune); // find last rune in char stream - -int utf8·canfit(char *, int); // XXX: odd function... - -int utf8·isalpha(rune r); -int utf8·isdigit(rune r); -int utf8·isspace(rune r); -int utf8·istitle(rune r); -int utf8·ispunct(rune r); - -rune utf8·toupper(rune r); -rune utf8·tolower(rune r); -rune utf8·totitle(rune r); diff --git a/include/libutf.h b/include/libutf.h new file mode 100644 index 0000000..25d6dee --- /dev/null +++ b/include/libutf.h @@ -0,0 +1,38 @@ +#pragma once + +typedef uint32 rune; + +#define UTFmax 4 +#define RuneErr 0xFFFDu +#define RuneMax 0x10FFFFu + +#define utf8·onebyte(c) (((c)&0x80u)==0x00u) +#define utf8·twobyte(c) (((c)&0xE0u)==0xC0u) +#define utf8·threebyte(c) (((c)&0xF0u)==0xE0u) +#define utf8·fourbyte(c) (((c)&0xF8u)==0xF0u) + +/* + * UTF-8 functions. + */ +int utf8·len(char *s); // returns number of runes for s +int utf8·runelen(rune r); // returns number of bytes for rune +int utf8·runewidth(rune r); // returns number of printed columns for rune + +int utf8·decode(char *, rune *); // decode 1 rune from char stream, store into rune, return number of bytes +int utf8·encode(rune *, char *); // encode 1 rune from rune stream, store into char, return number of bytes +int utf8·decodeprev(char *s, rune *r); // decode 1 rune from char stream, reading backwards, store into rune, return number of bytes + +char *utf8·find(char *s, rune); // find rune in char stream +char *utf8·findlast(char* s, rune); // find last rune in char stream + +int utf8·canfit(char *, int); // XXX: odd function... + +int utf8·isalpha(rune r); +int utf8·isdigit(rune r); +int utf8·isspace(rune r); +int utf8·istitle(rune r); +int utf8·ispunct(rune r); + +rune utf8·toupper(rune r); +rune utf8·tolower(rune r); +rune utf8·totitle(rune r); -- cgit v1.2.1