mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-05-03 20:24:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Improve some unicode functions

Browse source
This commit is contained in:
Justine Tunney 2021-05-05 07:25:39 -07:00
parent b9187061a7
commit 1b5a5719c3
33 changed files with 8366 additions and 197 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
ape/ape.S
View file

@ -1476,7 +1476,22 @@ kernel: movabs $ape_stack_vaddr,%rsp
test %rax,%rax test %rax,%rax
jz 1f jz 1f
movb $METAL,(%rax) movb $METAL,(%rax)
1: xor %eax,%eax 1: push $0
mov %rsp,%rbp
mov .Lenv0(%rip),%rax
mov %rax,(%rbp) # envp[0][0]
push $0 # argv[0][0]
push $0 # auxv[1][1]
push $0 # auxv[1][0]
push %rbp # auxv[0][1]
push $31 # auxv[0][0] AT_EXECFN
push $0 # envp[1]
push $.Lenv0 # envp[0]
push $0 # argv[1]
push %rbp # argv[0]
push $1 # argc
xor %ebp,%ebp
xor %eax,%eax
xor %ecx,%ecx xor %ecx,%ecx
xor %edx,%edx xor %edx,%edx
xor %edi,%edi xor %edi,%edi
@ -1485,20 +1500,10 @@ kernel: movabs $ape_stack_vaddr,%rsp
xor %r9d,%r9d xor %r9d,%r9d
xor %r10d,%r10d xor %r10d,%r10d
xor %r11d,%r11d xor %r11d,%r11d
push $0 # auxv[1][1]
push $0 # auxv[1][0]
push $.Larg0 # auxv[0][1]
push $31 # auxv[0][0] AT_EXECFN
push $0 # envp[1]
push $.Lenv0 # envp[0]
push $0 # argv[1]
push $.Larg0 # argv[0]
push $1 # argc
jmp _start jmp _start
.endfn kernel .endfn kernel
.rodata .rodata
.Larg0: .asciz "ape.com"
.Lenv0: .asciz "METAL=1" .Lenv0: .asciz "METAL=1"
.previous .previous

6
libc/runtime/getdosargv.c
View file

@ -89,14 +89,16 @@ textwindows noasan int GetDosArgv(const char16_t *cmdline, char *buf,
argc = 0; argc = 0;
st.wc = DecodeDosArgv(&st.s); st.wc = DecodeDosArgv(&st.s);
while (st.wc) { while (st.wc) {
while (st.wc && isspace(st.wc)) st.wc = DecodeDosArgv(&st.s); while (st.wc && (st.wc == ' ' || st.wc == '\t')) {
st.wc = DecodeDosArgv(&st.s);
}
if (!st.wc) break; if (!st.wc) break;
if (++argc < max) { if (++argc < max) {
argv[argc - 1] = st.p < st.pe ? st.p : NULL; argv[argc - 1] = st.p < st.pe ? st.p : NULL;
} }
inquote = false; inquote = false;
while (st.wc) { while (st.wc) {
if (!inquote && isspace(st.wc)) break; if (!inquote && (st.wc == ' ' || st.wc == '\t')) break;
if (st.wc == '"' || st.wc == '\\') { if (st.wc == '"' || st.wc == '\\') {
slashes = 0; slashes = 0;
quotes = 0; quotes = 0;

3
libc/str/isspace.c
View file

@ -19,7 +19,8 @@
#include "libc/str/str.h" #include "libc/str/str.h"
/** /**
* Returns true if c is space, \t, \r, \n, \f, or \v. * Returns nonzero if c is space, \t, \r, \n, \f, or \v.
* @see isblank()
*/ */
int isspace(int c) { int isspace(int c) {
return c == ' ' || c == '\t' || c == '\r' || c == '\n' || c == '\f' || return c == ' ' || c == '\t' || c == '\r' || c == '\n' || c == '\f' ||

7
libc/str/iswalnum.c
View file

@ -18,6 +18,9 @@
╚─────────────────────────────────────────────────────────────────────────────*/ ╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/str/str.h" #include "libc/str/str.h"
int iswalnum(wint_t wc) { /**
return isalnum(wc); * Returns nonzero if c is lower, alpha, or digit.
*/
int iswalnum(wint_t c) {
return iswdigit(c) || iswalpha(c);
} }

7
libc/str/iswalpha.c
View file

@ -18,6 +18,9 @@
╚─────────────────────────────────────────────────────────────────────────────*/ ╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/str/str.h" #include "libc/str/str.h"
int iswalpha(wint_t wc) { /**
return isalpha(wc); * Returns nonzero if c is alphabetical.
*/
int iswalpha(wint_t c) {
return iswupper(c) || iswlower(c);
} }

7
libc/str/iswblank.c
View file

@ -18,6 +18,9 @@
╚─────────────────────────────────────────────────────────────────────────────*/ ╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/str/str.h" #include "libc/str/str.h"
int iswblank(wint_t wc) { /**
return isblank(wc); * Returns nonzero if c is space or tab.
*/
int iswblank(wint_t c) {
return c == ' ' || c == '\t';
} }

6
libc/str/iswcntrl.c
View file

@ -19,8 +19,8 @@
#include "libc/str/str.h" #include "libc/str/str.h"
/** /**
* Returns nonzero if wc is C0 or C1 control code. * Returns nonzero if c is C0 or C1 control code.
*/ */
int iswcntrl(wint_t wc) { int iswcntrl(wint_t c) {
return (0x00 <= wc && wc <= 0x1F) || (0x7F <= wc && wc <= 0x9F); return (0x00 <= c && c <= 0x1F) || (0x7F <= c && c <= 0x9F);
} }

87
libc/str/iswctype.c
View file

@ -19,71 +19,30 @@
#include "libc/macros.internal.h" #include "libc/macros.internal.h"
#include "libc/str/str.h" #include "libc/str/str.h"
#define ALNUM 1 static const int (*const kWcTypeFuncs[])(wint_t) = {
#define ALPHA 2 iswalnum, //
#define BLANK 3 iswalpha, //
#define CNTRL 4 iswblank, //
#define DIGIT 5 iswcntrl, //
#define GRAPH 6 iswdigit, //
#define LOWER 7 iswgraph, //
#define PRINT 8 iswlower, //
#define PUNCT 9 iswprint, //
#define SPACE 10 iswpunct, //
#define UPPER 11 iswspace, //
#define XDIGIT 12 iswupper, //
iswxdigit, //
static const struct {
char name[7];
char type;
} kWcTypes[] = {
{"alnum", ALNUM}, {"alpha", ALPHA}, {"blank", BLANK}, {"cntrl", CNTRL},
{"digit", DIGIT}, {"graph", GRAPH}, {"lower", LOWER}, {"print", PRINT},
{"punct", PUNCT}, {"space", SPACE}, {"upper", UPPER}, {"xdigit", XDIGIT},
}; };
static int CompareStrings(const char *l, const char *r) { /**
size_t i = 0; * Returns nonzero if c has property.
while (l[i] == r[i] && r[i]) ++i; *
return (l[i] & 0xff) - (r[i] & 0xff); * @param t is number returned by wctype
} */
int iswctype(wint_t c, wctype_t t) {
wctype_t wctype(const char *name) { if (1 <= t && t <= ARRAYLEN(kWcTypeFuncs)) {
unsigned i; return kWcTypeFuncs[t - 1](c);
for (i = 0; i < ARRAYLEN(kWcTypes); ++i) { } else {
if (CompareStrings(name, kWcTypes[i].name) == 0) { return 0;
return kWcTypes[i].type;
}
}
return 0;
}
int iswctype(wint_t wc, wctype_t type) {
switch (type) {
case ALNUM:
return iswalnum(wc);
case ALPHA:
return iswalpha(wc);
case BLANK:
return iswblank(wc);
case CNTRL:
return iswcntrl(wc);
case DIGIT:
return iswdigit(wc);
case GRAPH:
return iswgraph(wc);
case LOWER:
return iswlower(wc);
case PRINT:
return iswprint(wc);
case PUNCT:
return iswpunct(wc);
case SPACE:
return iswspace(wc);
case UPPER:
return iswupper(wc);
case XDIGIT:
return iswxdigit(wc);
default:
return 0;
} }
} }

7
libc/str/iswdigit.c
View file

@ -18,6 +18,9 @@
╚─────────────────────────────────────────────────────────────────────────────*/ ╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/str/str.h" #include "libc/str/str.h"
int iswdigit(wint_t wc) { /**
return isdigit(wc); * Returns nonzero if c is decimal digit.
*/
int iswdigit(wint_t c) {
return '0' <= c && c <= '9';
} }

7
libc/str/iswgraph.c
View file

@ -18,6 +18,9 @@
╚─────────────────────────────────────────────────────────────────────────────*/ ╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/str/str.h" #include "libc/str/str.h"
int iswgraph(wint_t wc) { /**
return isgraph(wc); * Returns nonzero if c is printable and not a space.
*/
int iswgraph(wint_t c) {
return iswprint(c) && !iswspace(c);
} }

2139
libc/str/iswlower.c
View file

File diff suppressed because it is too large Load diff

8
libc/str/iswprint.c
View file

@ -18,6 +18,10 @@
╚─────────────────────────────────────────────────────────────────────────────*/ ╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/str/str.h" #include "libc/str/str.h"
int iswprint(wint_t wc) { /**
return !iswcntrl(wc); * Returns nonzero if c is printable.
*/
int iswprint(wint_t c) {
return !((0x00 <= c && c <= 0x1F) || (0x7F <= c && c <= 0x9F) ||
(0xFFF9 <= c && c <= 0xFFFB) || c == 0x2028 || c == 0x2029);
} }

522
libc/str/iswpunct.c
View file

@ -18,6 +18,524 @@
╚─────────────────────────────────────────────────────────────────────────────*/ ╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/str/str.h" #include "libc/str/str.h"
int iswpunct(wint_t wc) { /**
return ispunct(wc); * Returns nonzero if c is punctuation mark.
*/
int iswpunct(wint_t c) {
if (c < 0xa0) {
switch (c) {
case '!':
case '"':
case '#':
case '$':
case '%':
case '&':
case '\'':
case '(':
case ')':
case '*':
case '+':
case ',':
case '-':
case '.':
case '/':
case ':':
case ';':
case '<':
case '=':
case '>':
case '?':
case '@':
case '[':
case '\\':
case ']':
case '^':
case '_':
case '`':
case '{':
case '|':
case '}':
case '~':
return 1;
default:
return 0;
}
}
switch (c) {
case u'¡': // INVERTED EXCLAMATION MARK (0x00a1 Po)
case u'§': // SECTION SIGN (0x00a7 Po)
case u'«': // LEFT-POINTING DOUBLE ANGLE QUOTATION MARK (0x00ab Pi)
case u'': // PILCROW SIGN (0x00b6 Po)
case u'·': // MIDDLE DOT (0x00b7 Po)
case u'»': // RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK (0x00bb Pf)
case u'¿': // INVERTED QUESTION MARK (0x00bf Po)
case u';': // GREEK QUESTION MARK (0x037e Po)
case u'·': // GREEK ANO TELEIA (0x0387 Po)
case u'՚': // ARMENIAN APOSTROPHE (0x055a Po)
case u'՛': // ARMENIAN EMPHASIS MARK (0x055b Po)
case u'՜': // ARMENIAN EXCLAMATION MARK (0x055c Po)
case u'՝': // ARMENIAN COMMA (0x055d Po)
case u'՞': // ARMENIAN QUESTION MARK (0x055e Po)
case u'՟': // ARMENIAN ABBREVIATION MARK (0x055f Po)
case u'։': // ARMENIAN FULL STOP (0x0589 Po)
case u'֊': // ARMENIAN HYPHEN (0x058a Pd)
case 0x05be: // HEBREW PUNCTUATION MAQAF (0x05be Pd)
case 0x05c0: // HEBREW PUNCTUATION PASEQ (0x05c0 Po)
case 0x05c3: // HEBREW PUNCTUATION SOF PASUQ (0x05c3 Po)
case 0x05c6: // HEBREW PUNCTUATION NUN HAFUKHA (0x05c6 Po)
case 0x05f3: // HEBREW PUNCTUATION GERESH (0x05f3 Po)
case 0x05f4: // HEBREW PUNCTUATION GERSHAYIM (0x05f4 Po)
case 0x0609: // ARABIC-INDIC PER MILLE SIGN (0x0609 Po)
case 0x060a: // ARABIC-INDIC PER TEN THOUSAND SIGN (0x060a Po)
case 0x060c: // ARABIC COMMA (0x060c Po)
case 0x060d: // ARABIC DATE SEPARATOR (0x060d Po)
case 0x061b: // ARABIC SEMICOLON (0x061b Po)
case u'؞': // ARABIC TRIPLE DOT PUNCTUATION MARK (0x061e Po)
case u'؟': // ARABIC QUESTION MARK (0x061f Po)
case u'٪': // ARABIC PERCENT SIGN (0x066a Po)
case u'٫': // ARABIC DECIMAL SEPARATOR (0x066b Po)
case u'٬': // ARABIC THOUSANDS SEPARATOR (0x066c Po)
case u'٭': // ARABIC FIVE POINTED STAR (0x066d Po)
case u'۔': // ARABIC FULL STOP (0x06d4 Po)
case u'߷': // NKO SYMBOL GBAKURUNEN (0x07f7 Po)
case u'߸': // NKO COMMA (0x07f8 Po)
case u'߹': // NKO EXCLAMATION MARK (0x07f9 Po)
case u'।': // DEVANAGARI DANDA (0x0964 Po)
case u'॥': // DEVANAGARI DOUBLE DANDA (0x0965 Po)
case u'॰': // DEVANAGARI ABBREVIATION SIGN (0x0970 Po)
case 0x09fd: // BENGALI ABBREVIATION SIGN (0x09fd Po)
case 0x0a76: // GURMUKHI ABBREVIATION SIGN (0x0a76 Po)
case 0x0af0: // GUJARATI ABBREVIATION SIGN (0x0af0 Po)
case 0x0c77: // TELUGU SIGN SIDDHAM (0x0c77 Po)
case 0x0c84: // KANNADA SIGN SIDDHAM (0x0c84 Po)
case u'෴': // SINHALA PUNCTUATION KUNDDALIYA (0x0df4 Po)
case u'๏': // THAI CHARACTER FONGMAN (0x0e4f Po)
case u'๚': // THAI CHARACTER ANGKHANKHU (0x0e5a Po)
case u'๛': // THAI CHARACTER KHOMUT (0x0e5b Po)
case u'༄': // TIBETAN MARK INITIAL YIG MGO MDUN MA (0x0f04 Po)
case u'༅': // TIBETAN MARK CLOSING YIG MGO SGAB MA (0x0f05 Po)
case u'༆': // TIBETAN MARK CARET YIG MGO PHUR SHAD MA (0x0f06 Po)
case u'༇': // TIBETAN MARK YIG MGO TSHEG SHAD MA (0x0f07 Po)
case u'༈': // TIBETAN MARK SBRUL SHAD (0x0f08 Po)
case u'༉': // TIBETAN MARK BSKUR YIG MGO (0x0f09 Po)
case u'༊': // TIBETAN MARK BKA- SHOG YIG MGO (0x0f0a Po)
case u'་': // TIBETAN MARK INTERSYLLABIC TSHEG (0x0f0b Po)
case u'༌': // TIBETAN MARK DELIMITER TSHEG BSTAR (0x0f0c Po)
case u'།': // TIBETAN MARK SHAD (0x0f0d Po)
case u'༎': // TIBETAN MARK NYIS SHAD (0x0f0e Po)
case u'༏': // TIBETAN MARK TSHEG SHAD (0x0f0f Po)
case u'༐': // TIBETAN MARK NYIS TSHEG SHAD (0x0f10 Po)
case u'༑': // TIBETAN MARK RIN CHEN SPUNGS SHAD (0x0f11 Po)
case u'༒': // TIBETAN MARK RGYA GRAM SHAD (0x0f12 Po)
case u'༔': // TIBETAN MARK GTER TSHEG (0x0f14 Po)
case u'༺': // TIBETAN MARK GUG RTAGS GYON (0x0f3a Ps)
case u'༻': // TIBETAN MARK GUG RTAGS GYAS (0x0f3b Pe)
case u'༼': // TIBETAN MARK ANG KHANG GYON (0x0f3c Ps)
case u'༽': // TIBETAN MARK ANG KHANG GYAS (0x0f3d Pe)
case u'྅': // TIBETAN MARK PALUTA (0x0f85 Po)
case u'࿐': // TIBETAN MARK BSKA- SHOG GI MGO RGYAN (0x0fd0 Po)
case u'࿑': // TIBETAN MARK MNYAM YIG GI MGO RGYAN (0x0fd1 Po)
case u'࿒': // TIBETAN MARK NYIS TSHEG (0x0fd2 Po)
case u'࿓': // TIBETAN MARK INITIAL BRDA RNYING YIG MGO MDUN MA (0x0fd3 Po)
case u'࿔': // TIBETAN MARK CLOSING BRDA RNYING YIG MGO SGAB MA (0x0fd4 Po)
case u'࿙': // TIBETAN MARK LEADING MCHAN RTAGS (0x0fd9 Po)
case u'࿚': // TIBETAN MARK TRAILING MCHAN RTAGS (0x0fda Po)
case u'၊': // MYANMAR SIGN LITTLE SECTION (0x104a Po)
case u'။': // MYANMAR SIGN SECTION (0x104b Po)
case u'၌': // MYANMAR SYMBOL LOCATIVE (0x104c Po)
case u'၍': // MYANMAR SYMBOL COMPLETED (0x104d Po)
case u'၎': // MYANMAR SYMBOL AFOREMENTIONED (0x104e Po)
case u'၏': // MYANMAR SYMBOL GENITIVE (0x104f Po)
case u'჻': // GEORGIAN PARAGRAPH SEPARATOR (0x10fb Po)
case u'፠': // ETHIOPIC SECTION MARK (0x1360 Po)
case u'፡': // ETHIOPIC WORDSPACE (0x1361 Po)
case u'።': // ETHIOPIC FULL STOP (0x1362 Po)
case u'፣': // ETHIOPIC COMMA (0x1363 Po)
case u'፤': // ETHIOPIC SEMICOLON (0x1364 Po)
case u'፥': // ETHIOPIC COLON (0x1365 Po)
case u'፦': // ETHIOPIC PREFACE COLON (0x1366 Po)
case u'፧': // ETHIOPIC QUESTION MARK (0x1367 Po)
case u'፨': // ETHIOPIC PARAGRAPH SEPARATOR (0x1368 Po)
case u'᐀': // CANADIAN SYLLABICS HYPHEN (0x1400 Pd)
case u'᙮': // CANADIAN SYLLABICS FULL STOP (0x166e Po)
case u'᚛': // OGHAM FEATHER MARK (0x169b Ps)
case u'᚜': // OGHAM REVERSED FEATHER MARK (0x169c Pe)
case u'᛫': // RUNIC SINGLE PUNCTUATION (0x16eb Po)
case u'᛬': // RUNIC MULTIPLE PUNCTUATION (0x16ec Po)
case u'᛭': // RUNIC CROSS PUNCTUATION (0x16ed Po)
case u'᜵': // PHILIPPINE SINGLE PUNCTUATION (0x1735 Po)
case u'᜶': // PHILIPPINE DOUBLE PUNCTUATION (0x1736 Po)
case u'។': // KHMER SIGN KHAN (0x17d4 Po)
case u'៕': // KHMER SIGN BARIYOOSAN (0x17d5 Po)
case u'៖': // KHMER SIGN CAMNUC PII KUUH (0x17d6 Po)
case u'៘': // KHMER SIGN BEYYAL (0x17d8 Po)
case u'៙': // KHMER SIGN PHNAEK MUAN (0x17d9 Po)
case u'៚': // KHMER SIGN KOOMUUT (0x17da Po)
case u'᠀': // MONGOLIAN BIRGA (0x1800 Po)
case u'᠁': // MONGOLIAN ELLIPSIS (0x1801 Po)
case u'᠂': // MONGOLIAN COMMA (0x1802 Po)
case u'᠃': // MONGOLIAN FULL STOP (0x1803 Po)
case u'᠄': // MONGOLIAN COLON (0x1804 Po)
case u'᠅': // MONGOLIAN FOUR DOTS (0x1805 Po)
case u'᠆': // MONGOLIAN TODO SOFT HYPHEN (0x1806 Pd)
case u'᠇': // MONGOLIAN SIBE SYLLABLE BOUNDARY MARKER (0x1807 Po)
case u'᠈': // MONGOLIAN MANCHU COMMA (0x1808 Po)
case u'᠉': // MONGOLIAN MANCHU FULL STOP (0x1809 Po)
case u'᠊': // MONGOLIAN NIRUGU (0x180a Po)
case u'᥄': // LIMBU EXCLAMATION MARK (0x1944 Po)
case u'᥅': // LIMBU QUESTION MARK (0x1945 Po)
case u'᨞': // BUGINESE PALLAWA (0x1a1e Po)
case u'᨟': // BUGINESE END OF SECTION (0x1a1f Po)
case u'᱾': // OL CHIKI PUNCTUATION MUCAAD (0x1c7e Po)
case u'᱿': // OL CHIKI PUNCTUATION DOUBLE MUCAAD (0x1c7f Po)
case u'‐': // HYPHEN (0x2010 Pd)
case u'‑': // NON-BREAKING HYPHEN (0x2011 Pd)
case u'‒': // FIGURE DASH (0x2012 Pd)
case u'–': // EN DASH (0x2013 Pd)
case u'—': // EM DASH (0x2014 Pd)
case u'―': // HORIZONTAL BAR (0x2015 Pd)
case u'‖': // DOUBLE VERTICAL LINE (0x2016 Po)
case u'‗': // DOUBLE LOW LINE (0x2017 Po)
case u'‘': // LEFT SINGLE QUOTATION MARK (0x2018 Pi)
case u'’': // RIGHT SINGLE QUOTATION MARK (0x2019 Pf)
case u'‚': // SINGLE LOW-9 QUOTATION MARK (0x201a Ps)
case u'‛': // SINGLE HIGH-REVERSED-9 QUOTATION MARK (0x201b Pi)
case u'“': // LEFT DOUBLE QUOTATION MARK (0x201c Pi)
case u'”': // RIGHT DOUBLE QUOTATION MARK (0x201d Pf)
case u'„': // DOUBLE LOW-9 QUOTATION MARK (0x201e Ps)
case u'‟': // DOUBLE HIGH-REVERSED-9 QUOTATION MARK (0x201f Pi)
case u'†': // DAGGER (0x2020 Po)
case u'‡': // DOUBLE DAGGER (0x2021 Po)
case u'•': // BULLET (0x2022 Po)
case u'‣': // TRIANGULAR BULLET (0x2023 Po)
case u'․': // ONE DOT LEADER (0x2024 Po)
case u'‥': // TWO DOT LEADER (0x2025 Po)
case u'…': // HORIZONTAL ELLIPSIS (0x2026 Po)
case u'‧': // HYPHENATION POINT (0x2027 Po)
case u'‰': // PER MILLE SIGN (0x2030 Po)
case u'‱': // PER TEN THOUSAND SIGN (0x2031 Po)
case u'′': // PRIME (0x2032 Po)
case u'″': // DOUBLE PRIME (0x2033 Po)
case u'‴': // TRIPLE PRIME (0x2034 Po)
case u'‵': // REVERSED PRIME (0x2035 Po)
case u'‶': // REVERSED DOUBLE PRIME (0x2036 Po)
case u'‷': // REVERSED TRIPLE PRIME (0x2037 Po)
case u'‸': // CARET (0x2038 Po)
case u'‹': // SINGLE LEFT-POINTING ANGLE QUOTATION MARK (0x2039 Pi)
case u'›': // SINGLE RIGHT-POINTING ANGLE QUOTATION MARK (0x203a Pf)
case u'※': // REFERENCE MARK (0x203b Po)
case u'‼': // DOUBLE EXCLAMATION MARK (0x203c Po)
case u'‽': // INTERROBANG (0x203d Po)
case u'‾': // OVERLINE (0x203e Po)
case u'‿': // UNDERTIE (0x203f Pc)
case u'⁀': // CHARACTER TIE (0x2040 Pc)
case u'⁁': // CARET INSERTION POINT (0x2041 Po)
case u'⁂': // ASTERISM (0x2042 Po)
case u'⁃': // HYPHEN BULLET (0x2043 Po)
case u'⁅': // LEFT SQUARE BRACKET WITH QUILL (0x2045 Ps)
case u'⁆': // RIGHT SQUARE BRACKET WITH QUILL (0x2046 Pe)
case u'⁇': // DOUBLE QUESTION MARK (0x2047 Po)
case u'⁈': // QUESTION EXCLAMATION MARK (0x2048 Po)
case u'⁉': // EXCLAMATION QUESTION MARK (0x2049 Po)
case u'⁊': // TIRONIAN SIGN ET (0x204a Po)
case u'⁋': // REVERSED PILCROW SIGN (0x204b Po)
case u'⁌': // BLACK LEFTWARDS BULLET (0x204c Po)
case u'⁍': // BLACK RIGHTWARDS BULLET (0x204d Po)
case u'⁎': // LOW ASTERISK (0x204e Po)
case u'⁏': // REVERSED SEMICOLON (0x204f Po)
case u'⁐': // CLOSE UP (0x2050 Po)
case u'⁑': // TWO ASTERISKS ALIGNED VERTICALLY (0x2051 Po)
case u'⁓': // SWUNG DASH (0x2053 Po)
case u'⁔': // INVERTED UNDERTIE (0x2054 Pc)
case u'⁕': // FLOWER PUNCTUATION MARK (0x2055 Po)
case u'⁖': // THREE DOT PUNCTUATION (0x2056 Po)
case u'⁗': // QUADRUPLE PRIME (0x2057 Po)
case u'⁘': // FOUR DOT PUNCTUATION (0x2058 Po)
case u'⁙': // FIVE DOT PUNCTUATION (0x2059 Po)
case u'⁚': // TWO DOT PUNCTUATION (0x205a Po)
case u'⁛': // FOUR DOT MARK (0x205b Po)
case u'⁜': // DOTTED CROSS (0x205c Po)
case u'⁝': // TRICOLON (0x205d Po)
case u'⁞': // VERTICAL FOUR DOTS (0x205e Po)
case u'⁽': // SUPERSCRIPT LEFT PARENTHESIS (0x207d Ps)
case u'⁾': // SUPERSCRIPT RIGHT PARENTHESIS (0x207e Pe)
case u'₍': // SUBSCRIPT LEFT PARENTHESIS (0x208d Ps)
case u'₎': // SUBSCRIPT RIGHT PARENTHESIS (0x208e Pe)
case u'⌈': // LEFT CEILING (0x2308 Ps)
case u'⌉': // RIGHT CEILING (0x2309 Pe)
case u'⌊': // LEFT FLOOR (0x230a Ps)
case u'⌋': // RIGHT FLOOR (0x230b Pe)
case u'〈': // LEFT-POINTING ANGLE BRACKET (0x2329 Ps)
case u'〉': // RIGHT-POINTING ANGLE BRACKET (0x232a Pe)
case u'❨': // MEDIUM LEFT PARENTHESIS ORNAMENT (0x2768 Ps)
case u'❩': // MEDIUM RIGHT PARENTHESIS ORNAMENT (0x2769 Pe)
case u'❪': // MEDIUM FLATTENED LEFT PARENTHESIS ORNAMENT (0x276a Ps)
case u'❫': // MEDIUM FLATTENED RIGHT PARENTHESIS ORNAMENT (0x276b Pe)
case u'❬': // MEDIUM LEFT-POINTING ANGLE BRACKET ORNAMENT (0x276c Ps)
case u'❭': // MEDIUM RIGHT-POINTING ANGLE BRACKET ORNAMENT (0x276d Pe)
case u'❮': // HEAVY LEFT-POINTING ANGLE QUOTATION MARK ORNAMENT (0x276e Ps)
case u'❯': // HEAVY RIGHT-POINTING ANGLE QUOT MARK ORNAMENT (0x276f Pe)
case u'❰': // HEAVY LEFT-POINTING ANGLE BRACKET ORNAMENT (0x2770 Ps)
case u'❱': // HEAVY RIGHT-POINTING ANGLE BRACKET ORNAMENT (0x2771 Pe)
case u'❲': // LIGHT LEFT TORTOISE SHELL BRACKET ORNAMENT (0x2772 Ps)
case u'❳': // LIGHT RIGHT TORTOISE SHELL BRACKET ORNAMENT (0x2773 Pe)
case u'❴': // MEDIUM LEFT CURLY BRACKET ORNAMENT (0x2774 Ps)
case u'❵': // MEDIUM RIGHT CURLY BRACKET ORNAMENT (0x2775 Pe)
case u'⟅': // LEFT S-SHAPED BAG DELIMITER (0x27c5 Ps)
case u'⟆': // RIGHT S-SHAPED BAG DELIMITER (0x27c6 Pe)
case u'⟦': // MATHEMATICAL LEFT WHITE SQUARE BRACKET (0x27e6 Ps)
case u'⟧': // MATHEMATICAL RIGHT WHITE SQUARE BRACKET (0x27e7 Pe)
case u'⟨': // MATHEMATICAL LEFT ANGLE BRACKET (0x27e8 Ps)
case u'⟩': // MATHEMATICAL RIGHT ANGLE BRACKET (0x27e9 Pe)
case u'⟪': // MATHEMATICAL LEFT DOUBLE ANGLE BRACKET (0x27ea Ps)
case u'⟫': // MATHEMATICAL RIGHT DOUBLE ANGLE BRACKET (0x27eb Pe)
case u'⟬': // MATHEMATICAL LEFT WHITE TORTOISE SHELL BRACKET (0x27ec Ps)
case u'⟭': // MATHEMATICAL RIGHT WHITE TORTOISE SHELL BRACKET (0x27ed Pe)
case u'⟮': // MATHEMATICAL LEFT FLATTENED PARENTHESIS (0x27ee Ps)
case u'⟯': // MATHEMATICAL RIGHT FLATTENED PARENTHESIS (0x27ef Pe)
case u'⦃': // LEFT WHITE CURLY BRACKET (0x2983 Ps)
case u'⦄': // RIGHT WHITE CURLY BRACKET (0x2984 Pe)
case u'⦅': // LEFT WHITE PARENTHESIS (0x2985 Ps)
case u'⦆': // RIGHT WHITE PARENTHESIS (0x2986 Pe)
case u'⦇': // Z NOTATION LEFT IMAGE BRACKET (0x2987 Ps)
case u'⦈': // Z NOTATION RIGHT IMAGE BRACKET (0x2988 Pe)
case u'⦉': // Z NOTATION LEFT BINDING BRACKET (0x2989 Ps)
case u'⦊': // Z NOTATION RIGHT BINDING BRACKET (0x298a Pe)
case u'⦋': // LEFT SQUARE BRACKET WITH UNDERBAR (0x298b Ps)
case u'⦌': // RIGHT SQUARE BRACKET WITH UNDERBAR (0x298c Pe)
case u'⦍': // LEFT SQUARE BRACKET WITH TICK IN TOP CORNER (0x298d Ps)
case u'⦎': // RIGHT SQUARE BRACKET WITH TICK IN BOTTOM CORNER (0x298e Pe)
case u'⦏': // LEFT SQUARE BRACKET WITH TICK IN BOTTOM CORNER (0x298f Ps)
case u'⦐': // RIGHT SQUARE BRACKET WITH TICK IN TOP CORNER (0x2990 Pe)
case u'⦑': // LEFT ANGLE BRACKET WITH DOT (0x2991 Ps)
case u'⦒': // RIGHT ANGLE BRACKET WITH DOT (0x2992 Pe)
case u'⦓': // LEFT ARC LESS-THAN BRACKET (0x2993 Ps)
case u'⦔': // RIGHT ARC GREATER-THAN BRACKET (0x2994 Pe)
case u'⦗': // LEFT BLACK TORTOISE SHELL BRACKET (0x2997 Ps)
case u'⦘': // RIGHT BLACK TORTOISE SHELL BRACKET (0x2998 Pe)
case u'⧘': // LEFT WIGGLY FENCE (0x29d8 Ps)
case u'⧙': // RIGHT WIGGLY FENCE (0x29d9 Pe)
case u'⧚': // LEFT DOUBLE WIGGLY FENCE (0x29da Ps)
case u'⧛': // RIGHT DOUBLE WIGGLY FENCE (0x29db Pe)
case u'⧼': // LEFT-POINTING CURVED ANGLE BRACKET (0x29fc Ps)
case u'⧽': // RIGHT-POINTING CURVED ANGLE BRACKET (0x29fd Pe)
case u'⵰': // TIFINAGH SEPARATOR MARK (0x2d70 Po)
case u'⸎': // EDITORIAL CORONIS (0x2e0e Po)
case u'⸏': // PARAGRAPHOS (0x2e0f Po)
case u'⸐': // FORKED PARAGRAPHOS (0x2e10 Po)
case u'⸑': // REVERSED FORKED PARAGRAPHOS (0x2e11 Po)
case u'⸒': // HYPODIASTOLE (0x2e12 Po)
case u'⸓': // DOTTED OBELOS (0x2e13 Po)
case u'⸔': // DOWNWARDS ANCORA (0x2e14 Po)
case u'⸕': // UPWARDS ANCORA (0x2e15 Po)
case u'⸖': // DOTTED RIGHT-POINTING ANGLE (0x2e16 Po)
case u'⸗': // DOUBLE OBLIQUE HYPHEN (0x2e17 Pd)
case u'⸙': // PALM BRANCH (0x2e19 Po)
case u'⸚': // HYPHEN WITH DIAERESIS (0x2e1a Pd)
case u'⸛': // TILDE WITH RING ABOVE (0x2e1b Po)
case u'⸞': // TILDE WITH DOT ABOVE (0x2e1e Po)
case u'⸟': // TILDE WITH DOT BELOW (0x2e1f Po)
case u'⸪': // TWO DOTS OVER ONE DOT PUNCTUATION (0x2e2a Po)
case u'⸫': // ONE DOT OVER TWO DOTS PUNCTUATION (0x2e2b Po)
case u'⸬': // SQUARED FOUR DOT PUNCTUATION (0x2e2c Po)
case u'⸭': // FIVE DOT MARK (0x2e2d Po)
case u'⸮': // REVERSED QUESTION MARK (0x2e2e Po)
case u'⸰': // RING POINT (0x2e30 Po)
case u'⸱': // WORD SEPARATOR MIDDLE DOT (0x2e31 Po)
case u'⸲': // TURNED COMMA (0x2e32 Po)
case u'⸳': // RAISED DOT (0x2e33 Po)
case u'⸴': // RAISED COMMA (0x2e34 Po)
case u'⸵': // TURNED SEMICOLON (0x2e35 Po)
case u'⸶': // DAGGER WITH LEFT GUARD (0x2e36 Po)
case u'⸷': // DAGGER WITH RIGHT GUARD (0x2e37 Po)
case u'⸸': // TURNED DAGGER (0x2e38 Po)
case u'⸹': // TOP HALF SECTION SIGN (0x2e39 Po)
case u'⸺': // TWO-EM DASH (0x2e3a Pd)
case u'⸻': // THREE-EM DASH (0x2e3b Pd)
case u'⸼': // STENOGRAPHIC FULL STOP (0x2e3c Po)
case u'⸽': // VERTICAL SIX DOTS (0x2e3d Po)
case u'⸾': // WIGGLY VERTICAL LINE (0x2e3e Po)
case u'⸿': // CAPITULUM (0x2e3f Po)
case u'⹀': // DOUBLE HYPHEN (0x2e40 Pd)
case u'⹁': // REVERSED COMMA (0x2e41 Po)
case u'⹂': // DOUBLE LOW-REVERSED-9 QUOTATION MARK (0x2e42 Ps)
case u'⹃': // DASH WITH LEFT UPTURN (0x2e43 Po)
case u'⹄': // DOUBLE SUSPENSION MARK (0x2e44 Po)
case u'⹅': // INVERTED LOW KAVYKA (0x2e45 Po)
case u'⹆': // INVERTED LOW KAVYKA WITH KAVYKA ABOVE (0x2e46 Po)
case u'⹇': // LOW KAVYKA (0x2e47 Po)
case u'⹈': // LOW KAVYKA WITH DOT (0x2e48 Po)
case u'⹉': // DOUBLE STACKED COMMA (0x2e49 Po)
case u'⹊': // DOTTED SOLIDUS (0x2e4a Po)
case u'⹋': // TRIPLE DAGGER (0x2e4b Po)
case u'⹌': // MEDIEVAL COMMA (0x2e4c Po)
case u'⹍': // PARAGRAPHUS MARK (0x2e4d Po)
case u'⹎': // PUNCTUS ELEVATUS MARK (0x2e4e Po)
case u'⹏': // CORNISH VERSE DIVIDER (0x2e4f Po)
case u'、': // IDEOGRAPHIC COMMA (0x3001 Po)
case u'。': // IDEOGRAPHIC FULL STOP (0x3002 Po)
case u'〃': // DITTO MARK (0x3003 Po)
case u'〈': // LEFT ANGLE BRACKET (0x3008 Ps)
case u'〉': // RIGHT ANGLE BRACKET (0x3009 Pe)
case u'《': // LEFT DOUBLE ANGLE BRACKET (0x300a Ps)
case u'》': // RIGHT DOUBLE ANGLE BRACKET (0x300b Pe)
case u'「': // LEFT CORNER BRACKET (0x300c Ps)
case u'」': // RIGHT CORNER BRACKET (0x300d Pe)
case u'『': // LEFT WHITE CORNER BRACKET (0x300e Ps)
case u'』': // RIGHT WHITE CORNER BRACKET (0x300f Pe)
case u'【': // LEFT BLACK LENTICULAR BRACKET (0x3010 Ps)
case u'】': // RIGHT BLACK LENTICULAR BRACKET (0x3011 Pe)
case u'〔': // LEFT TORTOISE SHELL BRACKET (0x3014 Ps)
case u'〕': // RIGHT TORTOISE SHELL BRACKET (0x3015 Pe)
case u'〖': // LEFT WHITE LENTICULAR BRACKET (0x3016 Ps)
case u'〗': // RIGHT WHITE LENTICULAR BRACKET (0x3017 Pe)
case u'〘': // LEFT WHITE TORTOISE SHELL BRACKET (0x3018 Ps)
case u'〙': // RIGHT WHITE TORTOISE SHELL BRACKET (0x3019 Pe)
case u'〚': // LEFT WHITE SQUARE BRACKET (0x301a Ps)
case u'〛': // RIGHT WHITE SQUARE BRACKET (0x301b Pe)
case u'〜': // WAVE DASH (0x301c Pd)
case u'〝': // REVERSED DOUBLE PRIME QUOTATION MARK (0x301d Ps)
case u'〞': // DOUBLE PRIME QUOTATION MARK (0x301e Pe)
case u'〟': // LOW DOUBLE PRIME QUOTATION MARK (0x301f Pe)
case u'〰': // WAVY DASH (0x3030 Pd)
case u'〽': // PART ALTERNATION MARK (0x303d Po)
case u'゠': // KATAKANA-HIRAGANA DOUBLE HYPHEN (0x30a0 Pd)
case u'・': // KATAKANA MIDDLE DOT (0x30fb Po)
case u'꓾': // LISU PUNCTUATION COMMA (0xa4fe Po)
case u'꓿': // LISU PUNCTUATION FULL STOP (0xa4ff Po)
case u'꘍': // VAI COMMA (0xa60d Po)
case u'꘎': // VAI FULL STOP (0xa60e Po)
case u'꘏': // VAI QUESTION MARK (0xa60f Po)
case u'꙾': // CYRILLIC KAVYKA (0xa67e Po)
case u'꡴': // PHAGS-PA SINGLE HEAD MARK (0xa874 Po)
case u'꡵': // PHAGS-PA DOUBLE HEAD MARK (0xa875 Po)
case u'꡶': // PHAGS-PA MARK SHAD (0xa876 Po)
case u'꡷': // PHAGS-PA MARK DOUBLE SHAD (0xa877 Po)
case u'꣎': // SAURASHTRA DANDA (0xa8ce Po)
case u'꣏': // SAURASHTRA DOUBLE DANDA (0xa8cf Po)
case u'꣸': // DEVANAGARI SIGN PUSHPIKA (0xa8f8 Po)
case u'꣹': // DEVANAGARI GAP FILLER (0xa8f9 Po)
case u'꣺': // DEVANAGARI CARET (0xa8fa Po)
case u'꣼': // DEVANAGARI SIGN SIDDHAM (0xa8fc Po)
case u'꧁': // JAVANESE LEFT RERENGGAN (0xa9c1 Po)
case u'꧂': // JAVANESE RIGHT RERENGGAN (0xa9c2 Po)
case u'꧃': // JAVANESE PADA ANDAP (0xa9c3 Po)
case u'꧄': // JAVANESE PADA MADYA (0xa9c4 Po)
case u'꧅': // JAVANESE PADA LUHUR (0xa9c5 Po)
case u'꧆': // JAVANESE PADA WINDU (0xa9c6 Po)
case u'꧇': // JAVANESE PADA PANGKAT (0xa9c7 Po)
case u'꧈': // JAVANESE PADA LINGSA (0xa9c8 Po)
case u'꧉': // JAVANESE PADA LUNGSI (0xa9c9 Po)
case u'꧊': // JAVANESE PADA ADEG (0xa9ca Po)
case u'꧋': // JAVANESE PADA ADEG ADEG (0xa9cb Po)
case u'꧌': // JAVANESE PADA PISELEH (0xa9cc Po)
case u'꧍': // JAVANESE TURNED PADA PISELEH (0xa9cd Po)
case u'꧞': // JAVANESE PADA TIRTA TUMETES (0xa9de Po)
case u'꧟': // JAVANESE PADA ISEN-ISEN (0xa9df Po)
case u'꩜': // CHAM PUNCTUATION SPIRAL (0xaa5c Po)
case u'꩝': // CHAM PUNCTUATION DANDA (0xaa5d Po)
case u'꩞': // CHAM PUNCTUATION DOUBLE DANDA (0xaa5e Po)
case u'꩟': // CHAM PUNCTUATION TRIPLE DANDA (0xaa5f Po)
case u'꫞': // TAI VIET SYMBOL HO HOI (0xaade Po)
case u'꫟': // TAI VIET SYMBOL KOI KOI (0xaadf Po)
case u'꫰': // MEETEI MAYEK CHEIKHAN (0xaaf0 Po)
case u'꫱': // MEETEI MAYEK AHANG KHUDAM (0xaaf1 Po)
case u'꯫': // MEETEI MAYEK CHEIKHEI (0xabeb Po)
case u'︐': // PRESENTATION FORM FOR VERTICAL COMMA (0xfe10 Po)
case u'︑': // PRESENTATION FORM FOR VERTICAL IDEOGRAPHIC COMMA (0xfe11 Po)
case u'︒': // PRESENTATION FORM FOR VERTICAL IDEO FULL STOP (0xfe12 Po)
case u'︓': // PRESENTATION FORM FOR VERTICAL COLON (0xfe13 Po)
case u'︔': // PRESENTATION FORM FOR VERTICAL SEMICOLON (0xfe14 Po)
case u'︕': // PRESENTATION FORM FOR VERTICAL EXCLAMATION MARK (0xfe15 Po)
case u'︖': // PRESENTATION FORM FOR VERTICAL QUESTION MARK (0xfe16 Po)
case u'︗': // PRESENTATION ... LEFT WHITE LENTICULAR BRACKET (0xfe17 Ps)
case u'︘': // PRESENTATION ... RIGHT WHITE LENTICULAR BRAKCET (0xfe18 Pe)
case u'︙': // PRESENTATION ... VERTICAL HORIZONTAL ELLIPSIS (0xfe19 Po)
case u'︰': // PRESENTATION FORM FOR VERTICAL TWO DOT LEADER (0xfe30 Po)
case u'︱': // PRESENTATION FORM FOR VERTICAL EM DASH (0xfe31 Pd)
case u'︲': // PRESENTATION FORM FOR VERTICAL EN DASH (0xfe32 Pd)
case u'︳': // PRESENTATION FORM FOR VERTICAL LOW LINE (0xfe33 Pc)
case u'︴': // PRESENTATION FORM FOR VERTICAL WAVY LOW LINE (0xfe34 Pc)
case u'︵': // PRESENTATION FORM FOR VERTICAL LEFT PARENTHESIS (0xfe35 Ps)
case u'︶': // PRESENTATION FORM FOR VERTICAL RIGHT PARENTHESIS (0xfe36 Pe)
case u'︷': // PRESENTATION ... VERTICAL LEFT CURLY BRACKET (0xfe37 Ps)
case u'︸': // PRESENTATION ... VERTICAL RIGHT CURLY BRACKET (0xfe38 Pe)
case u'︹': // PRESENTATION ... LEFT TORTOISE SHELL BRACKET (0xfe39 Ps)
case u'︺': // PRESENTATION ... RIGHT TORTOISE SHELL BRACKET (0xfe3a Pe)
case u'︻': // PRESENTATION ... LEFT BLACK LENTICULAR BRACKET (0xfe3b Ps)
case u'︼': // PRESENTATION ... RIGHT BLACK LENTICULAR BRACKET (0xfe3c Pe)
case u'︽': // PRESENTATION ... LEFT DOUBLE ANGLE BRACKET (0xfe3d Ps)
case u'︾': // PRESENTATION ... RIGHT DOUBLE ANGLE BRACKET (0xfe3e Pe)
case u'︿': // PRESENTATION ... LEFT ANGLE BRACKET (0xfe3f Ps)
case u'﹀': // PRESENTATION ... RIGHT ANGLE BRACKET (0xfe40 Pe)
case u'﹁': // PRESENTATION ... LEFT CORNER BRACKET (0xfe41 Ps)
case u'﹂': // PRESENTATION ... RIGHT CORNER BRACKET (0xfe42 Pe)
case u'﹃': // PRESENTATION ... LEFT WHITE CORNER BRACKET (0xfe43 Ps)
case u'﹄': // PRESENTATION ... RIGHT WHITE CORNER BRACKET Pe)
case u'﹅': // SESAME DOT (0xfe45 Po)
case u'﹆': // WHITE SESAME DOT (0xfe46 Po)
case u'﹇': // PRESENTATION ... VERTICAL LEFT SQUARE BRACKET (0xfe47 Ps)
case u'﹈': // PRESENTATION ... VERTICAL RIGHT SQUARE BRACKET (0xfe48 Pe)
case u'﹉': // DASHED OVERLINE (0xfe49 Po)
case u'﹊': // CENTRELINE OVERLINE (0xfe4a Po)
case u'﹋': // WAVY OVERLINE (0xfe4b Po)
case u'﹌': // DOUBLE WAVY OVERLINE (0xfe4c Po)
case u'﹍': // DASHED LOW LINE (0xfe4d Pc)
case u'﹎': // CENTRELINE LOW LINE (0xfe4e Pc)
case u'﹏': // WAVY LOW LINE (0xfe4f Pc)
case u'﹐': // SMALL COMMA (0xfe50 Po)
case u'﹑': // SMALL IDEOGRAPHIC COMMA (0xfe51 Po)
case u'﹒': // SMALL FULL STOP (0xfe52 Po)
case u'﹔': // SMALL SEMICOLON (0xfe54 Po)
case u'﹕': // SMALL COLON (0xfe55 Po)
case u'﹖': // SMALL QUESTION MARK (0xfe56 Po)
case u'﹗': // SMALL EXCLAMATION MARK (0xfe57 Po)
case u'﹘': // SMALL EM DASH (0xfe58 Pd)
case u'﹙': // SMALL LEFT PARENTHESIS (0xfe59 Ps)
case u'﹚': // SMALL RIGHT PARENTHESIS (0xfe5a Pe)
case u'﹛': // SMALL LEFT CURLY BRACKET (0xfe5b Ps)
case u'﹜': // SMALL RIGHT CURLY BRACKET (0xfe5c Pe)
case u'﹝': // SMALL LEFT TORTOISE SHELL BRACKET (0xfe5d Ps)
case u'﹞': // SMALL RIGHT TORTOISE SHELL BRACKET (0xfe5e Pe)
case u'﹟': // SMALL NUMBER SIGN (0xfe5f Po)
case u'﹠': // SMALL AMPERSAND (0xfe60 Po)
case u'﹡': // SMALL ASTERISK (0xfe61 Po)
case u'﹣': // SMALL HYPHEN-MINUS (0xfe63 Pd)
case u'﹨': // SMALL REVERSE SOLIDUS (0xfe68 Po)
case u'﹪': // SMALL PERCENT SIGN (0xfe6a Po)
case u'﹫': // SMALL COMMERCIAL AT (0xfe6b Po)
case u'！': // FULLWIDTH EXCLAMATION MARK (0xff01 Po)
case u'＂': // FULLWIDTH QUOTATION MARK (0xff02 Po)
case u'＃': // FULLWIDTH NUMBER SIGN (0xff03 Po)
case u'％': // FULLWIDTH PERCENT SIGN (0xff05 Po)
case u'＆': // FULLWIDTH AMPERSAND (0xff06 Po)
case u'＇': // FULLWIDTH APOSTROPHE (0xff07 Po)
case u'（': // FULLWIDTH LEFT PARENTHESIS (0xff08 Ps)
case u'）': // FULLWIDTH RIGHT PARENTHESIS (0xff09 Pe)
case u'＊': // FULLWIDTH ASTERISK (0xff0a Po)
case u'，': // FULLWIDTH COMMA (0xff0c Po)
case u'－': // FULLWIDTH HYPHEN-MINUS (0xff0d Pd)
case u'．': // FULLWIDTH FULL STOP (0xff0e Po)
case u'／': // FULLWIDTH SOLIDUS (0xff0f Po)
case u'：': // FULLWIDTH COLON (0xff1a Po)
case u'；': // FULLWIDTH SEMICOLON (0xff1b Po)
case u'？': // FULLWIDTH QUESTION MARK (0xff1f Po)
case u'＠': // FULLWIDTH COMMERCIAL AT (0xff20 Po)
case u'［': // FULLWIDTH LEFT SQUARE BRACKET (0xff3b Ps)
case u'＼': // FULLWIDTH REVERSE SOLIDUS (0xff3c Po)
case u'］': // FULLWIDTH RIGHT SQUARE BRACKET (0xff3d Pe)
case u'＿': // FULLWIDTH LOW LINE (0xff3f Pc)
case u'｛': // FULLWIDTH LEFT CURLY BRACKET (0xff5b Ps)
case u'｝': // FULLWIDTH RIGHT CURLY BRACKET (0xff5d Pe)
case u'｟': // FULLWIDTH LEFT WHITE PARENTHESIS (0xff5f Ps)
case u'｠': // FULLWIDTH RIGHT WHITE PARENTHESIS (0xff60 Pe)
case u'｡': // HALFWIDTH IDEOGRAPHIC FULL STOP (0xff61 Po)
case u'｢': // HALFWIDTH LEFT CORNER BRACKET (0xff62 Ps)
case u'｣': // HALFWIDTH RIGHT CORNER BRACKET (0xff63 Pe)
case u'､': // HALFWIDTH IDEOGRAPHIC COMMA (0xff64 Po)
case u'･': // HALFWIDTH KATAKANA MIDDLE DOT (0xff65 Po)
return 1;
default:
return 0;
}
} }

37
libc/str/iswspace.c
View file

@ -18,6 +18,39 @@
╚─────────────────────────────────────────────────────────────────────────────*/ ╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/str/str.h" #include "libc/str/str.h"
int iswspace(wint_t wc) { /**
return isspace(wc); * Returns nonzero if c is space character.
*
* We define this as invisible characters which move the cursor. That
* means `\t\r\n\f\v` and unicodes whose category begins with `Z` but
* not ogham since it's not invisible and non-breaking spaces neither
* since they're not invisible to emacs users.
*/
int iswspace(wint_t c) {
switch (c) {
case '\t': // CHARACTER TABULATION
case '\n': // LINE FEED
case '\f': // FORM FEED
case '\v': // LINE TABULATION
case '\r': // CARRIAGE RETURN
case ' ': // SPACE
case 0x2000: // EN QUAD (Zs)
case 0x2001: // EM QUAD (Zs)
case 0x2002: // EN SPACE (Zs)
case 0x2003: // EM SPACE (Zs)
case 0x2004: // THREE-PER-EM SPACE (Zs)
case 0x2005: // FOUR-PER-EM SPACE (Zs)
case 0x2006: // SIX-PER-EM SPACE (Zs)
case 0x2007: // FIGURE SPACE (Zs)
case 0x2008: // PUNCTUATION SPACE (Zs)
case 0x2009: // THIN SPACE (Zs)
case 0x200a: // HAIR SPACE (Zs)
case 0x2028: // LINE SEPARATOR (Zl)
case 0x2029: // PARAGRAPH SEPARATOR (Zp)
case 0x205f: // MEDIUM MATHEMATICAL SPACE (Zs)
case 0x3000: // IDEOGRAPHIC SPACE (Zs)
return 1;
default:
return 0;
}
} }

1774
libc/str/iswupper.c
View file

File diff suppressed because it is too large Load diff

8
libc/str/iswxdigit.c
View file

@ -18,6 +18,10 @@
╚─────────────────────────────────────────────────────────────────────────────*/ ╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/str/str.h" #include "libc/str/str.h"
int iswxdigit(wint_t wc) { /**
return isxdigit(wc); * Returns nonzero if c is ascii hex digit.
*/
int iswxdigit(wint_t c) {
return ('0' <= c && c <= '9') || ('A' <= c && c <= 'F') ||
('a' <= c && c <= 'f');
} }

3
libc/str/isxdigit.c
View file

@ -16,6 +16,9 @@
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
│ PERFORMANCE OF THIS SOFTWARE. │ │ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/ ╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/assert.h"
#include "libc/calls/calls.h"
#include "libc/limits.h"
#include "libc/str/str.h" #include "libc/str/str.h"
/** /**

6
libc/str/str.mk
View file

@ -62,6 +62,12 @@ o/$(MODE)/libc/str/getziplfileuncompressedsize.o: \
OVERRIDE_CFLAGS += \ OVERRIDE_CFLAGS += \
-Os -Os
o/$(MODE)/libc/str/iswpunct.o \
o/$(MODE)/libc/str/iswupper.o \
o/$(MODE)/libc/str/iswlower.o: \
OVERRIDE_CFLAGS += \
-fno-jump-tables
LIBC_STR_LIBS = $(foreach x,$(LIBC_STR_ARTIFACTS),$($(x))) LIBC_STR_LIBS = $(foreach x,$(LIBC_STR_ARTIFACTS),$($(x)))
LIBC_STR_SRCS = $(foreach x,$(LIBC_STR_ARTIFACTS),$($(x)_SRCS)) LIBC_STR_SRCS = $(foreach x,$(LIBC_STR_ARTIFACTS),$($(x)_SRCS))
LIBC_STR_HDRS = $(foreach x,$(LIBC_STR_ARTIFACTS),$($(x)_HDRS)) LIBC_STR_HDRS = $(foreach x,$(LIBC_STR_ARTIFACTS),$($(x)_HDRS))

4
libc/str/strrchr.c
View file

@ -26,4 +26,6 @@
* @return address of last c in s, or NULL if not found * @return address of last c in s, or NULL if not found
* @asyncsignalsafe * @asyncsignalsafe
*/ */
char *(strrchr)(const char *s, int c) { return memrchr(s, c, strlen(s)); } char *strrchr(const char *s, int c) {
return memrchr(s, c, strlen(s));
}

2
libc/str/tolower.c
View file

@ -19,7 +19,7 @@
#include "libc/str/str.h" #include "libc/str/str.h"
/** /**
* Converts character to lower case. * Converts character to ascii lower case.
*/ */
int tolower(int c) { int tolower(int c) {
return 'A' <= c && c <= 'Z' ? c + ('a' - 'A') : c; return 'A' <= c && c <= 'Z' ? c + ('a' - 'A') : c;

1644
libc/str/towlower.c
View file

File diff suppressed because it is too large Load diff

1645
libc/str/towupper.c
View file

File diff suppressed because it is too large Load diff

59
libc/str/wctype.c Normal file
View file

@ -0,0 +1,59 @@
/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│
╞══════════════════════════════════════════════════════════════════════════════╡
│ Copyright 2021 Justine Alexandra Roberts Tunney │
│ │
│ Permission to use, copy, modify, and/or distribute this software for │
│ any purpose with or without fee is hereby granted, provided that the │
│ above copyright notice and this permission notice appear in all copies. │
│ │
│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │
│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │
│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │
│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │
│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │
│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
│ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/bits/bits.h"
#include "libc/macros.internal.h"
#include "libc/str/str.h"
static const char kWcTypeNames[][8] = {
"alnum", //
"alpha", //
"blank", //
"cntrl", //
"digit", //
"graph", //
"lower", //
"print", //
"punct", //
"space", //
"upper", //
"xdigit", //
};
/**
* Returns number representing character class name.
*
* @param s can be "alnum", "alpha", "blank", "cntrl", "digit", "graph",
* "lower", "print", "punct", "space", "upper", "xdigit"
* @return nonzero id or 0 if not found
*/
wctype_t wctype(const char *s) {
int i;
char b[8];
for (i = 0; i < 8; ++i) {
b[i] = *s ? *s++ : 0;
}
if (!*s) {
for (i = 0; i < ARRAYLEN(kWcTypeNames); ++i) {
if (READ64LE(b) == READ64LE(kWcTypeNames[i])) {
return i + 1;
}
}
}
return 0;
}

12
libc/sysv/consts.sh
View file

@ -160,20 +160,20 @@ syscon compat EWOULDBLOCK 11 35 35 35 35 10035 # same as EWOULDBL
# #
# group name GNU/Systemd XNU's Not UNIX! FreeBSD OpenBSD NetBSD XENIX Commentary # group name GNU/Systemd XNU's Not UNIX! FreeBSD OpenBSD NetBSD XENIX Commentary
syscon sig SIGHUP 1 1 1 1 1 1 # terminal hangup or daemon reload; resumable; auto-broadcasted to process group; unix consensus & faked on nt syscon sig SIGHUP 1 1 1 1 1 1 # terminal hangup or daemon reload; resumable; auto-broadcasted to process group; unix consensus & faked on nt
syscon sig SIGINT 2 2 2 2 2 2 # terminal ctrl-c keystroke; resumable; auto-broadcasted to process group; unix consensus & faked on nt syscon sig SIGINT 2 2 2 2 2 2 # terminal ctrl-c keystroke; resumable; auto-broadcasted to process group; unix consensus & faked on nt; X3.159-1988
syscon sig SIGQUIT 3 3 3 3 3 3 # terminal ctrl-\ keystroke; resumable; unix consensus & faked on nt syscon sig SIGQUIT 3 3 3 3 3 3 # terminal ctrl-\ keystroke; resumable; unix consensus & faked on nt
syscon sig SIGILL 4 4 4 4 4 4 # illegal instruction; unresumable (unless you longjmp() or edit ucontex->rip+=ild(ucontex->rip)); unix consensus & faked on nt syscon sig SIGILL 4 4 4 4 4 4 # illegal instruction; unresumable (unless you longjmp() or edit ucontex->rip+=ild(ucontex->rip)); unix consensus & faked on nt; X3.159-1988
syscon sig SIGTRAP 5 5 5 5 5 5 # int3 instruction; resumable; unix consensus & faked on nt syscon sig SIGTRAP 5 5 5 5 5 5 # int3 instruction; resumable; unix consensus & faked on nt
syscon sig SIGABRT 6 6 6 6 6 6 # process aborted; resumable; unix consensus & faked on nt syscon sig SIGABRT 6 6 6 6 6 6 # process aborted; resumable; unix consensus & faked on nt; X3.159-1988
syscon sig SIGBUS 7 10 10 10 10 7 # valid memory access that went beyond underlying end of file; bsd consensus syscon sig SIGBUS 7 10 10 10 10 7 # valid memory access that went beyond underlying end of file; bsd consensus
syscon sig SIGFPE 8 8 8 8 8 8 # illegal math; unresumable (unless you longjmp() or edit ucontex->rip+=ild(ucontex->rip)); unix consensus & faked on nt syscon sig SIGFPE 8 8 8 8 8 8 # illegal math; unresumable (unless you longjmp() or edit ucontex->rip+=ild(ucontex->rip)); unix consensus & faked on nt; X3.159-1988
syscon sig SIGKILL 9 9 9 9 9 9 # terminate with extreme prejudice; unreceivable; unix consensus & faked on nt syscon sig SIGKILL 9 9 9 9 9 9 # terminate with extreme prejudice; unreceivable; unix consensus & faked on nt
syscon sig SIGUSR1 10 30 30 30 30 10 # do whatever you want; bsd consensus syscon sig SIGUSR1 10 30 30 30 30 10 # do whatever you want; bsd consensus
syscon sig SIGSEGV 11 11 11 11 11 11 # invalid memory access; unresumable (unless you longjmp() or edit ucontex->rip+=ild(ucontex->rip)); unix consensus & faked on nt syscon sig SIGSEGV 11 11 11 11 11 11 # invalid memory access; unresumable (unless you longjmp() or edit ucontex->rip+=ild(ucontex->rip)); unix consensus & faked on nt; X3.159-1988
syscon sig SIGUSR2 12 31 31 31 31 12 # do whatever you want; bsd consensus syscon sig SIGUSR2 12 31 31 31 31 12 # do whatever you want; bsd consensus
syscon sig SIGPIPE 13 13 13 13 13 13 # write to closed file descriptor; unix consensus & faked on nt syscon sig SIGPIPE 13 13 13 13 13 13 # write to closed file descriptor; unix consensus & faked on nt
syscon sig SIGALRM 14 14 14 14 14 14 # sent by setitimer(2) or timer_settime(2); unix consensus & faked on nt syscon sig SIGALRM 14 14 14 14 14 14 # sent by setitimer(2) or timer_settime(2); unix consensus & faked on nt
syscon sig SIGTERM 15 15 15 15 15 15 # terminate; resumable; unix consensus & faked on nt syscon sig SIGTERM 15 15 15 15 15 15 # terminate; resumable; unix consensus & faked on nt; X3.159-1988
syscon sig SIGCHLD 17 20 20 20 20 17 # child process exited or terminated and is now a zombie (unless this is SIG_IGN or SA_NOCLDWAIT) or child process stopped due to terminal i/o or profiling/debugging (unless you used SA_NOCLDSTOP); bsd consensus syscon sig SIGCHLD 17 20 20 20 20 17 # child process exited or terminated and is now a zombie (unless this is SIG_IGN or SA_NOCLDWAIT) or child process stopped due to terminal i/o or profiling/debugging (unless you used SA_NOCLDSTOP); bsd consensus
syscon sig SIGCONT 18 19 19 19 19 18 # child process resumed from profiling/debugging; bsd consensus syscon sig SIGCONT 18 19 19 19 19 18 # child process resumed from profiling/debugging; bsd consensus
syscon sig SIGSTOP 19 17 17 17 17 19 # child process stopped due to profiling/debugging; bsd consensus syscon sig SIGSTOP 19 17 17 17 17 19 # child process stopped due to profiling/debugging; bsd consensus

54
net/http/parseurl.c
View file

@ -41,19 +41,26 @@ static void EmitLatin1(struct UrlParser *u, int c) {
u->p += 2; u->p += 2;
} }
static void EmitKey(struct UrlParser *u, struct UrlParams *h) { static bool EmitKey(struct UrlParser *u, struct UrlParams *h) {
h->p = xrealloc(h->p, ++h->n * sizeof(*h->p)); struct UrlParam *p;
h->p[h->n - 1].key.p = u->q; if ((p = realloc(h->p, ++h->n * sizeof(*h->p)))) {
h->p[h->n - 1].key.n = u->p - u->q; p[h->n - 1].key.p = u->q;
u->q = u->p; p[h->n - 1].key.n = u->p - u->q;
u->q = u->p;
h->p = p;
return true;
} else {
return false;
}
} }
static void EmitVal(struct UrlParser *u, struct UrlParams *h, bool t) { static void EmitVal(struct UrlParser *u, struct UrlParams *h, bool t) {
if (!t) { if (!t) {
if (u->p > u->q || u->c != '?') { if (u->p > u->q || u->c != '?') {
EmitKey(u, h); if (EmitKey(u, h)) {
h->p[h->n - 1].val.p = NULL; h->p[h->n - 1].val.p = NULL;
h->p[h->n - 1].val.n = 0; h->p[h->n - 1].val.n = 0;
}
} }
} else { } else {
h->p[h->n - 1].val.p = u->q; h->p[h->n - 1].val.p = u->q;
@ -214,8 +221,7 @@ static void ParseQuery(struct UrlParser *u, struct UrlParams *h) {
t = false; t = false;
} else if (u->c == '=') { } else if (u->c == '=') {
if (!t) { if (!t) {
EmitKey(u, h); t = EmitKey(u, h);
t = true;
} else { } else {
*u->p++ = '='; *u->p++ = '=';
} }
@ -257,12 +263,14 @@ static char *ParseUrlImpl(const char *data, size_t size, struct Url *h,
u.data = data; u.data = data;
u.size = size; u.size = size;
memset(h, 0, sizeof(*h)); memset(h, 0, sizeof(*h));
u.q = u.p = m = xmalloc(latin1 ? u.size * 2 : u.size); if ((m = malloc(latin1 ? u.size * 2 : u.size))) {
if (ParseScheme(&u, h)) ParseAuthority(&u, h); u.q = u.p = m;
if (u.c != '#' && u.c != '?') ParsePath(&u, &h->path); if (ParseScheme(&u, h)) ParseAuthority(&u, h);
if (u.c == '?') ParseQuery(&u, &h->params); if (u.c != '#' && u.c != '?') ParsePath(&u, &h->path);
if (u.c == '#') ParseFragment(&u, &h->fragment); if (u.c == '?') ParseQuery(&u, &h->params);
return xrealloc(m, u.p - m); if (u.c == '#') ParseFragment(&u, &h->fragment);
}
return m;
} }
/** /**
@ -355,8 +363,10 @@ char *ParseParams(const char *data, size_t size, struct UrlParams *h) {
u.isopaque = false; u.isopaque = false;
u.data = data; u.data = data;
u.size = size; u.size = size;
u.q = u.p = m = xmalloc(u.size); if ((m = malloc(u.size))) {
ParseQuery(&u, h); u.q = u.p = m;
ParseQuery(&u, h);
}
return m; return m;
} }
@ -395,7 +405,9 @@ char *ParseHost(const char *data, size_t size, struct Url *h) {
u.isopaque = false; u.isopaque = false;
u.data = data; u.data = data;
u.size = size; u.size = size;
u.q = u.p = m = xmalloc(u.size * 2); if ((m = malloc(u.size * 2))) {
ParseAuthority(&u, h); u.q = u.p = m;
return xrealloc(m, u.p - m); ParseAuthority(&u, h);
}
return m;
} }

14
test/libc/str/regex_test.c
View file

@ -83,24 +83,29 @@ TEST(regex, testIpExtended) {
regfree(&rx); regfree(&rx);
} }
TEST(regex, testUnicodeCharacterClass) {
regex_t rx;
EXPECT_EQ(REG_OK, regcomp(&rx, "^[[:alpha:]][[:alpha:]]$", 0));
EXPECT_EQ(REG_OK, regexec(&rx, "𝐵𝑏", 0, 0, 0));
EXPECT_NE(REG_OK, regexec(&rx, "₀₁", 0, 0, 0));
regfree(&rx);
}
void A(void) { void A(void) {
regex_t rx; regex_t rx;
regcomp(&rx, "^[-._0-9A-Za-z]*$", REG_EXTENDED); regcomp(&rx, "^[-._0-9A-Za-z]*$", REG_EXTENDED);
regexec(&rx, "foo.com", 0, NULL, 0); regexec(&rx, "foo.com", 0, NULL, 0);
regfree(&rx); regfree(&rx);
} }
void B(regex_t *rx) { void B(regex_t *rx) {
regexec(rx, "foo.com", 0, NULL, 0); regexec(rx, "foo.com", 0, NULL, 0);
} }
void C(void) { void C(void) {
regex_t rx; regex_t rx;
regcomp(&rx, "^[-._0-9A-Za-z]*$", 0); regcomp(&rx, "^[-._0-9A-Za-z]*$", 0);
regexec(&rx, "foo.com", 0, NULL, 0); regexec(&rx, "foo.com", 0, NULL, 0);
regfree(&rx); regfree(&rx);
} }
void D(regex_t *rx, regmatch_t *m) { void D(regex_t *rx, regmatch_t *m) {
regexec(rx, "127.0.0.1", rx->re_nsub + 1, m, 0); regexec(rx, "127.0.0.1", rx->re_nsub + 1, m, 0);
} }
@ -113,7 +118,6 @@ BENCH(regex, bench) {
regfree(&rx); regfree(&rx);
EZBENCH2("easy api extended", donothing, A()); EZBENCH2("easy api extended", donothing, A());
EZBENCH2("easy api basic", donothing, C()); EZBENCH2("easy api basic", donothing, C());
EXPECT_EQ(REG_OK, regcomp(&rx, EXPECT_EQ(REG_OK, regcomp(&rx,
"^" "^"
"\\([0-9][0-9]*\\)\\." "\\([0-9][0-9]*\\)\\."
@ -126,7 +130,6 @@ BENCH(regex, bench) {
EZBENCH2("precompiled basic match", donothing, D(&rx, m)); EZBENCH2("precompiled basic match", donothing, D(&rx, m));
free(m); free(m);
regfree(&rx); regfree(&rx);
EXPECT_EQ(REG_OK, regcomp(&rx, EXPECT_EQ(REG_OK, regcomp(&rx,
"^" "^"
"([0-9]{1,3})\\." "([0-9]{1,3})\\."
@ -139,7 +142,6 @@ BENCH(regex, bench) {
EZBENCH2("precompiled extended match", donothing, D(&rx, m)); EZBENCH2("precompiled extended match", donothing, D(&rx, m));
free(m); free(m);
regfree(&rx); regfree(&rx);
EXPECT_EQ(REG_OK, regcomp(&rx, EXPECT_EQ(REG_OK, regcomp(&rx,
"^" "^"
"([0-9]{1,3})\\." "([0-9]{1,3})\\."

74
test/libc/str/towupper_test.c Normal file
View file

@ -0,0 +1,74 @@
/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│
╞══════════════════════════════════════════════════════════════════════════════╡
│ Copyright 2021 Justine Alexandra Roberts Tunney │
│ │
│ Permission to use, copy, modify, and/or distribute this software for │
│ any purpose with or without fee is hereby granted, provided that the │
│ above copyright notice and this permission notice appear in all copies. │
│ │
│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │
│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │
│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │
│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │
│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │
│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
│ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/dce.h"
#include "libc/str/str.h"
#include "libc/testlib/ezbench.h"
#include "libc/testlib/testlib.h"
TEST(towupper, test) {
EXPECT_EQ(u'!', towupper(u'!'));
EXPECT_EQ(u'A', towupper(u'a'));
EXPECT_EQ(u'À', towupper(u'à'));
if (IsTiny()) return;
EXPECT_EQ(L'𝛥', towupper(L'𝛿'));
EXPECT_EQ(L'Ｂ', towupper(L'ｂ'));
}
TEST(towlower, test) {
EXPECT_EQ(u'!', towlower(u'!'));
EXPECT_EQ(u'a', towlower(u'A'));
EXPECT_EQ(u'à', towlower(u'À'));
if (IsTiny()) return;
EXPECT_EQ(L'𝛿', towlower(L'𝛥'));
EXPECT_EQ(L'ｂ', towlower(L'Ｂ'));
}
BENCH(towupper, bench) {
EZBENCH2("towupper ascii", donothing, EXPROPRIATE(towupper(VEIL("r", L'a'))));
EZBENCH2("towupper latin1", donothing,
EXPROPRIATE(towupper(VEIL("r", u'A'))));
if (IsTiny()) return;
EZBENCH2("towupper astral", donothing,
EXPROPRIATE(towupper(VEIL("r", L'𝛿'))));
}
BENCH(towlower, bench) {
EZBENCH2("towlower ascii", donothing, EXPROPRIATE(towlower(VEIL("r", L'a'))));
EZBENCH2("towlower latin1", donothing,
EXPROPRIATE(towlower(VEIL("r", u'A'))));
if (IsTiny()) return;
EZBENCH2("towlower astral", donothing,
EXPROPRIATE(towlower(VEIL("r", L'𝛿'))));
}
BENCH(iswupper, bench) {
EZBENCH2("iswupper ascii", donothing, EXPROPRIATE(iswupper(VEIL("r", L'A'))));
EZBENCH2("iswupper latin1", donothing,
EXPROPRIATE(iswupper(VEIL("r", u'A'))));
EZBENCH2("iswupper astral", donothing,
EXPROPRIATE(iswupper(VEIL("r", L'𝛿'))));
}
BENCH(iswlower, bench) {
EZBENCH2("iswlower ascii", donothing, EXPROPRIATE(iswlower(VEIL("r", L'a'))));
EZBENCH2("iswlower latin1", donothing,
EXPROPRIATE(iswlower(VEIL("r", u'A'))));
EZBENCH2("iswlower astral", donothing,
EXPROPRIATE(iswlower(VEIL("r", L'𝛿'))));
}

61
test/tool/net/redbean_test.c
View file

@ -32,6 +32,7 @@
#include "libc/sysv/consts/shut.h" #include "libc/sysv/consts/shut.h"
#include "libc/sysv/consts/sig.h" #include "libc/sysv/consts/sig.h"
#include "libc/sysv/consts/sock.h" #include "libc/sysv/consts/sock.h"
#include "libc/sysv/consts/tcp.h"
#include "libc/testlib/testlib.h" #include "libc/testlib/testlib.h"
#include "libc/x/x.h" #include "libc/x/x.h"
#include "third_party/regex/regex.h" #include "third_party/regex/regex.h"
@ -58,13 +59,27 @@ void SetUpOnce(void) {
close(fdin); close(fdin);
} }
void Tune(int fd, int a, int b, int x) {
if (!b) return;
setsockopt(fd, a, b, &x, sizeof(x));
}
int Socket(void) {
int fd;
if ((fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) != -1) {
Tune(fd, IPPROTO_TCP, TCP_CORK, 0);
Tune(fd, IPPROTO_TCP, TCP_NODELAY, 1);
}
return fd;
}
char *SendHttpRequest(const char *s) { char *SendHttpRequest(const char *s) {
int fd; int fd;
char *p; char *p;
size_t n; size_t n;
ssize_t rc; ssize_t rc;
struct sockaddr_in addr = {AF_INET, htons(port), {htonl(INADDR_LOOPBACK)}}; struct sockaddr_in addr = {AF_INET, htons(port), {htonl(INADDR_LOOPBACK)}};
EXPECT_NE(-1, (fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP))); EXPECT_NE(-1, (fd = Socket()));
EXPECT_NE(-1, connect(fd, &addr, sizeof(addr))); EXPECT_NE(-1, connect(fd, &addr, sizeof(addr)));
n = strlen(s); n = strlen(s);
EXPECT_EQ(n, write(fd, s, n)); EXPECT_EQ(n, write(fd, s, n));
@ -114,10 +129,52 @@ TEST(redbean, testOptions) {
"Accept-Charset: utf-8,ISO-8859-1;q=0\\.7,\\*;q=0\\.5\r\n" "Accept-Charset: utf-8,ISO-8859-1;q=0\\.7,\\*;q=0\\.5\r\n"
"Allow: GET, HEAD, POST, PUT, DELETE, OPTIONS\r\n" "Allow: GET, HEAD, POST, PUT, DELETE, OPTIONS\r\n"
"Date: .*\r\n" "Date: .*\r\n"
"Server: redbean/0\\.4\r\n" "Server: redbean/.*\r\n"
"Content-Length: 0\r\n" "Content-Length: 0\r\n"
"\r\n", "\r\n",
gc(SendHttpRequest("OPTIONS * HTTP/1.1\n\n")))); gc(SendHttpRequest("OPTIONS * HTTP/1.1\n\n"))));
EXPECT_NE(-1, kill(pid, SIGTERM)); EXPECT_NE(-1, kill(pid, SIGTERM));
EXPECT_NE(-1, wait(0)); EXPECT_NE(-1, wait(0));
} }
TEST(redbean, testPipeline) {
if (IsWindows()) return;
char portbuf[16];
int pid, pipefds[2];
sigset_t chldmask, savemask;
sigaddset(&chldmask, SIGCHLD);
sigprocmask(SIG_BLOCK, &chldmask, &savemask);
ASSERT_NE(-1, pipe(pipefds));
ASSERT_NE(-1, (pid = vfork()));
if (!pid) {
close(pipefds[0]);
dup2(pipefds[1], 1);
sigprocmask(SIG_SETMASK, &savemask, NULL);
execv("bin/redbean.com",
(char *const[]){"bin/redbean.com", "-szp0", "-l127.0.0.1", 0});
_exit(127);
}
EXPECT_NE(-1, close(pipefds[1]));
EXPECT_NE(-1, read(pipefds[0], portbuf, sizeof(portbuf)));
port = atoi(portbuf);
EXPECT_TRUE(Matches("HTTP/1\\.1 200 OK\r\n"
"Accept: \\*/\\*\r\n"
"Accept-Charset: utf-8,ISO-8859-1;q=0\\.7,\\*;q=0\\.5\r\n"
"Allow: GET, HEAD, POST, PUT, DELETE, OPTIONS\r\n"
"Date: .*\r\n"
"Server: redbean/.*\r\n"
"Content-Length: 0\r\n"
"\r\n"
"HTTP/1\\.1 200 OK\r\n"
"Accept: \\*/\\*\r\n"
"Accept-Charset: utf-8,ISO-8859-1;q=0\\.7,\\*;q=0\\.5\r\n"
"Allow: GET, HEAD, POST, PUT, DELETE, OPTIONS\r\n"
"Date: .*\r\n"
"Server: redbean/.*\r\n"
"Content-Length: 0\r\n"
"\r\n",
gc(SendHttpRequest("OPTIONS * HTTP/1.1\n\n"
"OPTIONS * HTTP/1.1\n\n"))));
EXPECT_NE(-1, kill(pid, SIGTERM));
EXPECT_NE(-1, wait(0));
}

1
third_party/chibicc/test/alignof_test.c vendored
View file

@ -1,4 +1,5 @@
#include "third_party/chibicc/test/test.h" #include "third_party/chibicc/test/test.h"
#
int _Alignas(512) g1; int _Alignas(512) g1;
int _Alignas(512) g2; int _Alignas(512) g2;

191
tool/decode/scrubdox.c Normal file
View file

@ -0,0 +1,191 @@
/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│
╞══════════════════════════════════════════════════════════════════════════════╡
│ Copyright 2021 Justine Alexandra Roberts Tunney │
│ │
│ Permission to use, copy, modify, and/or distribute this software for │
│ any purpose with or without fee is hereby granted, provided that the │
│ above copyright notice and this permission notice appear in all copies. │
│ │
│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │
│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │
│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │
│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │
│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │
│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
│ PERFORMANCE OF THIS SOFTWARE. │
╚──────────────────────────────────────────────────────────────────────────────┘
THIS PROGRAM TURNS TEXT LIKE THIS
+------------------------------------------------------------------------+
| Button | Name | Go to | From 1.2.3 |
| | | | go to |
|------------+-------------+--------------------------------+------------|
| [ < ] | Back | previous section in reading | 1.2.2 |
| | | order | |
|------------+-------------+--------------------------------+------------|
| [ > ] | Forward | next section in reading order | 1.2.4 |
|------------+-------------+--------------------------------+------------|
| [ << ] | FastBack | previous or up-and-previous | 1.1 |
| | | section | |
|------------+-------------+--------------------------------+------------|
| [ Up ] | Up | up section | 1.2 |
|------------+-------------+--------------------------------+------------|
| [ >> ] | FastForward | next or up-and-next section | 1.3 |
|------------+-------------+--------------------------------+------------|
| [Top] | Top | cover (top) of document | |
|------------+-------------+--------------------------------+------------|
| [Contents] | Contents | table of contents | |
|------------+-------------+--------------------------------+------------|
| [Index] | Index | concept index | |
|------------+-------------+--------------------------------+------------|
| [ ? ] | About | this page | |
+------------------------------------------------------------------------+
INTO THIS
┌────────────┬─────────────┬────────────────────────────────┬────────────┐
│ Button │ Name │ Go to │ From 1.2.3 │
│ │ │ │ go to │
├────────────┼─────────────┼────────────────────────────────┼────────────┤
│ [ < ] │ Back │ previous section in reading │ 1.2.2 │
│ │ │ order │ │
├────────────┼─────────────┼────────────────────────────────┼────────────┤
│ [ > ] │ Forward │ next section in reading order │ 1.2.4 │
├────────────┼─────────────┼────────────────────────────────┼────────────┤
│ [ << ] │ FastBack │ previous or up─and─previous │ 1.1 │
│ │ │ section │ │
├────────────┼─────────────┼────────────────────────────────┼────────────┤
│ [ Up ] │ Up │ up section │ 1.2 │
├────────────┼─────────────┼────────────────────────────────┼────────────┤
│ [ >> ] │ FastForward │ next or up─and─next section │ 1.3 │
├────────────┼─────────────┼────────────────────────────────┼────────────┤
│ [Top] │ Top │ cover (top) of document │ │
├────────────┼─────────────┼────────────────────────────────┼────────────┤
│ [Contents] │ Contents │ table of contents │ │
├────────────┼─────────────┼────────────────────────────────┼────────────┤
│ [Index] │ Index │ concept index │ │
├────────────┼─────────────┼────────────────────────────────┼────────────┤
│ [ ? ] │ About │ this page │ │
└────────────┴─────────────┴────────────────────────────────┴────────────┘ */
#include "libc/log/log.h"
#include "libc/macros.internal.h"
#include "libc/runtime/gc.internal.h"
#include "libc/stdio/stdio.h"
#include "libc/str/str.h"
#include "libc/x/x.h"
#define IsSpace(C) ((C) == ' ')
#define IsPipe(C) ((C) == '|' || (C) == u'│')
#define IsPlus(C) ((C) == '+' || (C) == u'┼')
#define IsHyphen(C) ((C) == '-' || (C) == u'─')
#define IsTick(C) ((C) == '`' || (C) == u'└')
int n;
int yn;
int xn;
FILE *f;
bool *V;
char **T;
char16_t **L;
static void DoIt(int y, int x) {
if (V[y * (xn + 1) + x]) return;
V[y * (xn + 1) + x] = 1;
if (IsPipe(L[y - 1][x]) && IsHyphen(L[y][x - 1]) && IsPlus(L[y][x]) &&
IsHyphen(L[y][x + 1]) && IsPipe(L[y + 1][x])) {
L[y][x] = u'┼';
} else if (IsSpace(L[y - 1][x]) && IsHyphen(L[y][x - 1]) &&
IsHyphen(L[y][x]) && IsHyphen(L[y][x + 1]) &&
IsPipe(L[y + 1][x])) {
L[y][x] = u'┬';
} else if (IsPipe(L[y - 1][x]) && IsHyphen(L[y][x - 1]) &&
IsHyphen(L[y][x]) && IsHyphen(L[y][x + 1]) &&
IsSpace(L[y + 1][x])) {
L[y][x] = u'┴';
} else if (IsPipe(L[y - 1][x]) && IsSpace(L[y][x - 1]) && IsPipe(L[y][x]) &&
IsHyphen(L[y][x + 1]) && IsPipe(L[y + 1][x])) {
L[y][x] = u'├';
} else if (IsPipe(L[y - 1][x]) && IsHyphen(L[y][x - 1]) && IsPipe(L[y][x]) &&
IsSpace(L[y][x + 1]) && IsPipe(L[y + 1][x])) {
L[y][x] = u'┤';
} else if (IsSpace(L[y - 1][x]) && IsSpace(L[y][x - 1]) && IsPlus(L[y][x]) &&
IsHyphen(L[y][x + 1]) && IsPipe(L[y + 1][x])) {
L[y][x] = u'┌';
} else if (IsPipe(L[y - 1][x]) && IsHyphen(L[y][x - 1]) && IsPlus(L[y][x]) &&
IsSpace(L[y][x + 1]) && IsSpace(L[y + 1][x])) {
L[y][x] = u'┘';
} else if (IsSpace(L[y - 1][x]) && IsHyphen(L[y][x - 1]) && IsPlus(L[y][x]) &&
IsSpace(L[y][x + 1]) && IsPipe(L[y + 1][x])) {
L[y][x] = u'┐';
} else if (IsPipe(L[y - 1][x]) && IsSpace(L[y][x - 1]) && IsPlus(L[y][x]) &&
IsHyphen(L[y][x + 1]) && IsSpace(L[y + 1][x])) {
L[y][x] = u'└';
} else if (IsTick(L[y][x]) && IsPipe(L[y - 1][x]) && IsHyphen(L[y][x + 1]) &&
IsSpace(L[y + 1][x]) && IsSpace(L[y][x - 1])) {
L[y][x] = u'└';
} else if (L[y][x] == '-') {
L[y][x] = u'─';
} else if (L[y][x] == '|') {
L[y][x] = u'│';
} else {
return;
}
DoIt(y - 1, x + 0);
DoIt(y + 1, x + 0);
DoIt(y + 0, x - 1);
DoIt(y + 0, x + 1);
}
int main(int argc, char *argv[]) {
char *s;
int y, x;
showcrashreports();
f = stdin;
while ((s = chomp(xgetline(f)))) {
n = strwidth(s, 0);
xn = MAX(xn, n);
T = xrealloc(T, ++yn * sizeof(*T));
T[yn - 1] = s;
}
xn += 1000;
L = xmalloc((yn + 2) * sizeof(*L));
L[0] = utf8toutf16(gc(xasprintf(" %*s ", xn, " ")), -1, 0);
for (y = 0; y < yn; ++y) {
s = xasprintf(" %s%*s ", T[y], xn - n, " ");
L[y + 1] = utf8toutf16(s, -1, 0);
free(T[y]);
free(s);
}
L[yn + 2 - 1] = utf8toutf16(gc(xasprintf(" %*s ", xn, " ")), -1, 0);
free(T);
V = xcalloc((yn + 1) * (xn + 1), 1);
for (y = 1; y <= yn; ++y) {
for (x = 1; x <= xn; ++x) {
if (IsPipe(L[y - 1][x]) && IsHyphen(L[y][x - 1]) && IsPlus(L[y][x]) &&
IsHyphen(L[y][x + 1]) && IsPipe(L[y + 1][x])) {
DoIt(y, x);
}
if (IsTick(L[y][x]) && IsPipe(L[y - 1][x]) && IsHyphen(L[y][x + 1]) &&
IsSpace(L[y + 1][x]) && IsSpace(L[y][x - 1])) {
DoIt(y, x);
}
}
}
for (y = 1; y + 1 < yn; ++y) {
s = utf16toutf8(L[y], -1, 0);
n = strlen(s);
while (n && s[n - 1] == ' ') s[n - 1] = 0, --n;
puts(s + 1);
free(s);
}
for (y = 0; y < yn; ++y) {
free(L[y]);
}
free(L);
free(V);
return 0;
}

49
tool/emacs/cosmo-c-constants.el
View file

@ -1,22 +1,30 @@
(defconst cosmo-c-constants-ansi
'("EOF"
"WEOF"
"NDEBUG"
"HUGE_VAL"
"CLK_TCK"))
(defconst cosmo-c-constants-c11 (defconst cosmo-c-constants-c11
'("__func__" '("__func__"
"__VA_ARGS__" "__VA_ARGS__"
"__STDC__" "__STDC__"
"__STDC_HOSTED__" "__STDC_HOSTED__"
"__STDC_VERSION__" "__STDC_VERSION__"
"__TIME__" "__TIME__"
"__STDC_ISO_10646__" "__STDC_ISO_10646__"
"__STDC_MB_MIGHT_NEQ_WC__" "__STDC_MB_MIGHT_NEQ_WC__"
"__STDC_UTF_16__" "__STDC_UTF_16__"
"__STDC_UTF_32__" "__STDC_UTF_32__"
"__STDC_ANALYZABLE__" "__STDC_ANALYZABLE__"
"__STDC_IEC_559_COMPLEX__" "__STDC_IEC_559_COMPLEX__"
"__STDC_LIB_EXT1__" "__STDC_LIB_EXT1__"
"__STDC_NO_ATOMICS__" "__STDC_NO_ATOMICS__"
"__STDC_NO_COMPLEX__" "__STDC_NO_COMPLEX__"
"__STDC_NO_THREADS__" "__STDC_NO_THREADS__"
"__STDC_NO_VLA__" "__STDC_NO_VLA__"
"__STDC_WANT_LIB_EXT1__")) "__STDC_WANT_LIB_EXT1__"))
(defconst cosmo-c-constants-limits (defconst cosmo-c-constants-limits
'("IMAGE_BASE_VIRTUAL" '("IMAGE_BASE_VIRTUAL"
@ -24,6 +32,7 @@
"IMAGE_BASE_PHYSICAL" "IMAGE_BASE_PHYSICAL"
"CHAR_MAX" "CHAR_MAX"
"SCHAR_MAX" "SCHAR_MAX"
"UCHAR_MAX"
"SHRT_MAX" "SHRT_MAX"
"INT_MAX" "INT_MAX"
"LONG_MAX" "LONG_MAX"
@ -40,6 +49,7 @@
"INTPTR_MAX" "INTPTR_MAX"
"PTRDIFF_MAX" "PTRDIFF_MAX"
"SCHAR_MIN" "SCHAR_MIN"
"UCHAR_MIN"
"SHRT_MIN" "SHRT_MIN"
"UINT_MIN" "UINT_MIN"
"INT_MIN" "INT_MIN"
@ -152,7 +162,8 @@
(defconst cosmo-c-constants-regex (defconst cosmo-c-constants-regex
(concat "\\_<" (concat "\\_<"
(regexp-opt (append cosmo-c-constants-c11 (regexp-opt (append cosmo-c-constants-ansi
cosmo-c-constants-c11
cosmo-c-constants-limits cosmo-c-constants-limits
cosmo-c-constants-math)) cosmo-c-constants-math))
"\\_>")) "\\_>"))

66
tool/net/redbean.c
View file

@ -26,6 +26,7 @@
#include "libc/calls/struct/rusage.h" #include "libc/calls/struct/rusage.h"
#include "libc/calls/struct/sigaction.h" #include "libc/calls/struct/sigaction.h"
#include "libc/calls/struct/stat.h" #include "libc/calls/struct/stat.h"
#include "libc/dos.h"
#include "libc/errno.h" #include "libc/errno.h"
#include "libc/fmt/conv.h" #include "libc/fmt/conv.h"
#include "libc/fmt/itoa.h" #include "libc/fmt/itoa.h"
@ -83,11 +84,6 @@
#define HASH_LOAD_FACTOR /* 1. / */ 4 #define HASH_LOAD_FACTOR /* 1. / */ 4
#define DEFAULT_PORT 8080 #define DEFAULT_PORT 8080
#define DOS_DATE(YEAR, MONTH_IDX1, DAY_IDX1) \
(((YEAR)-1980) << 9 | (MONTH_IDX1) << 5 | (DAY_IDX1))
#define DOS_TIME(HOUR, MINUTE, SECOND) \
((HOUR) << 11 | (MINUTE) << 5 | (SECOND) >> 1)
#define read(F, P, N) readv(F, &(struct iovec){P, N}, 1) #define read(F, P, N) readv(F, &(struct iovec){P, N}, 1)
#define LockInc(P) asm volatile("lock incq\t%0" : "=m"(*(P))) #define LockInc(P) asm volatile("lock incq\t%0" : "=m"(*(P)))
#define AppendCrlf(P) mempcpy(P, "\r\n", 2) #define AppendCrlf(P) mempcpy(P, "\r\n", 2)
@ -132,11 +128,15 @@ static const struct ContentTypeExtension {
{"atom", "application/atom+xml"}, // {"atom", "application/atom+xml"}, //
{"avi", "video/x-msvideo"}, // {"avi", "video/x-msvideo"}, //
{"avif", "image/avif"}, // {"avif", "image/avif"}, //
{"azw", "application/vnd.amazon.ebook"}, //
{"bmp", "image/bmp"}, // {"bmp", "image/bmp"}, //
{"bz2", "application/x-bzip2"}, //
{"c", "text/plain"}, // {"c", "text/plain"}, //
{"cc", "text/plain"}, // {"cc", "text/plain"}, //
{"css", "text/css"}, // {"css", "text/css"}, //
{"csv", "text/csv"}, // {"csv", "text/csv"}, //
{"doc", "application/msword"}, //
{"epub", "application/epub+zip"}, //
{"gif", "image/gif"}, // {"gif", "image/gif"}, //
{"gz", "application/gzip"}, // {"gz", "application/gzip"}, //
{"h", "text/plain"}, // {"h", "text/plain"}, //
@ -147,11 +147,13 @@ static const struct ContentTypeExtension {
{"jar", "application/java-archive"}, // {"jar", "application/java-archive"}, //
{"jpeg", "image/jpeg"}, // {"jpeg", "image/jpeg"}, //
{"jpg", "image/jpeg"}, // {"jpg", "image/jpeg"}, //
{"js", "application/javascript"}, // {"js", "text/javascript"}, //
{"json", "application/json"}, // {"json", "application/json"}, //
{"m4a", "audio/mpeg"}, // {"m4a", "audio/mpeg"}, //
{"markdown", "text/plain"}, // {"markdown", "text/plain"}, //
{"md", "text/plain"}, // {"md", "text/plain"}, //
{"mid", "audio/midi"}, //
{"midi", "audio/midi"}, //
{"mp2", "audio/mpeg"}, // {"mp2", "audio/mpeg"}, //
{"mp3", "audio/mpeg"}, // {"mp3", "audio/mpeg"}, //
{"mp4", "video/mp4"}, // {"mp4", "video/mp4"}, //
@ -192,9 +194,11 @@ static const struct ContentTypeExtension {
{"xml", "application/xml"}, // {"xml", "application/xml"}, //
{"xsl", "application/xslt+xml"}, // {"xsl", "application/xslt+xml"}, //
{"xslt", "application/xslt+xml"}, // {"xslt", "application/xslt+xml"}, //
{"xz", "application/x-xz"}, //
{"z", "application/zlib"}, // {"z", "application/zlib"}, //
{"zip", "application/zip"}, // {"zip", "application/zip"}, //
{"zst", "application/zstd"}, // {"zst", "application/zstd"}, //
{"zst", "application/zstd"}, //
}; };
static const char kRegCode[][8] = { static const char kRegCode[][8] = {
@ -638,7 +642,7 @@ static void UseOutput(void) {
} }
static void DropOutput(void) { static void DropOutput(void) {
free(outbuf.p); FreeLater(outbuf.p);
outbuf.p = 0; outbuf.p = 0;
outbuf.n = 0; outbuf.n = 0;
outbuf.c = 0; outbuf.c = 0;
@ -806,13 +810,16 @@ static char *DescribeServer(void) {
} }
static void ProgramBrand(const char *s) { static void ProgramBrand(const char *s) {
char *p;
free(brand); free(brand);
free(serverheader); free(serverheader);
brand = strdup(s); if (!(p = EncodeHttpHeaderValue(s, -1, 0))) {
if (!(serverheader = EncodeHttpHeaderValue(brand, -1, 0))) { fprintf(stderr, "error: brand isn't latin1 encodable: %`'s", s);
fprintf(stderr, "error: brand isn't latin1 encodable: %`'s", brand);
exit(1); exit(1);
} }
brand = strdup(s);
serverheader = xasprintf("Server: %s\r\n", p);
free(p);
} }
static void ProgramLinger(long sec) { static void ProgramLinger(long sec) {
@ -1194,7 +1201,7 @@ static void ReapZombies(void) {
} while (!terminated); } while (!terminated);
} }
static inline ssize_t WritevAll(int fd, struct iovec *iov, int iovlen) { static ssize_t WritevAll(int fd, struct iovec *iov, int iovlen) {
ssize_t rc; ssize_t rc;
size_t wrote; size_t wrote;
do { do {
@ -1286,14 +1293,6 @@ forceinline int GetMode(struct Asset *a) {
return a->file ? a->file->st.st_mode : GetZipCfileMode(zmap + a->cf); return a->file ? a->file->st.st_mode : GetZipCfileMode(zmap + a->cf);
} }
forceinline bool IsNotModified(struct Asset *a) {
if (msg.version < 10) return false;
if (!HasHeader(kHttpIfModifiedSince)) return false;
return a->lastmodified >=
ParseHttpDateTime(HeaderData(kHttpIfModifiedSince),
HeaderLength(kHttpIfModifiedSince));
}
static char *FormatUnixHttpDateTime(char *s, int64_t t) { static char *FormatUnixHttpDateTime(char *s, int64_t t) {
struct tm tm; struct tm tm;
gmtime_r(&t, &tm); gmtime_r(&t, &tm);
@ -1305,7 +1304,7 @@ forceinline bool IsCompressionMethodSupported(int method) {
return method == kZipCompressionNone || method == kZipCompressionDeflate; return method == kZipCompressionNone || method == kZipCompressionDeflate;
} }
static unsigned Hash(const void *p, unsigned long n) { static inline unsigned Hash(const void *p, unsigned long n) {
unsigned h, i; unsigned h, i;
for (h = i = 0; i < n; i++) { for (h = i = 0; i < n; i++) {
h += ((unsigned char *)p)[i]; h += ((unsigned char *)p)[i];
@ -1468,12 +1467,6 @@ static char *AppendCache(char *p, int64_t seconds) {
return AppendExpires(p, (int64_t)shared->nowish + seconds); return AppendExpires(p, (int64_t)shared->nowish + seconds);
} }
static inline char *AppendServer(char *p, const char *s) {
p = stpcpy(p, "Server: ");
p = stpcpy(p, s);
return AppendCrlf(p);
}
static inline char *AppendContentLength(char *p, size_t n) { static inline char *AppendContentLength(char *p, size_t n) {
p = stpcpy(p, "Content-Length: "); p = stpcpy(p, "Content-Length: ");
p += uint64toarray_radix10(n, p); p += uint64toarray_radix10(n, p);
@ -3059,8 +3052,8 @@ static int LuaIsAcceptablePort(lua_State *L) {
return LuaIsValid(L, IsAcceptablePort); return LuaIsValid(L, IsAcceptablePort);
} }
static int LuaCoderImpl(lua_State *L, static noinline int LuaCoderImpl(lua_State *L,
char *Coder(const char *, size_t, size_t *)) { char *Coder(const char *, size_t, size_t *)) {
void *p; void *p;
size_t n; size_t n;
p = luaL_checklstring(L, 1, &n); p = luaL_checklstring(L, 1, &n);
@ -3070,7 +3063,8 @@ static int LuaCoderImpl(lua_State *L,
return 1; return 1;
} }
static int LuaCoder(lua_State *L, char *Coder(const char *, size_t, size_t *)) { static noinline int LuaCoder(lua_State *L,
char *Coder(const char *, size_t, size_t *)) {
return LuaCoderImpl(L, Coder); return LuaCoderImpl(L, Coder);
} }
@ -3220,7 +3214,7 @@ static int LuaCrc32c(lua_State *L) {
return LuaHash(L, crc32c); return LuaHash(L, crc32c);
} }
static int LuaProgramInt(lua_State *L, void Program(long)) { static noinline int LuaProgramInt(lua_State *L, void Program(long)) {
Program(luaL_checkinteger(L, 1)); Program(luaL_checkinteger(L, 1));
return 0; return 0;
} }
@ -4208,7 +4202,7 @@ static inline int CompareInts(const uint64_t x, uint64_t y) {
return x > y ? 1 : x < y ? -1 : 0; return x > y ? 1 : x < y ? -1 : 0;
} }
static inline const char *BisectContentType(uint64_t ext) { static const char *BisectContentType(uint64_t ext) {
int c, m, l, r; int c, m, l, r;
l = 0; l = 0;
r = ARRAYLEN(kContentTypeExtension) - 1; r = ARRAYLEN(kContentTypeExtension) - 1;
@ -4251,6 +4245,14 @@ static const char *GetContentType(struct Asset *a, const char *path, size_t n) {
a->istext ? "text/plain" : "application/octet-stream")); a->istext ? "text/plain" : "application/octet-stream"));
} }
static bool IsNotModified(struct Asset *a) {
if (msg.version < 10) return false;
if (!HasHeader(kHttpIfModifiedSince)) return false;
return a->lastmodified >=
ParseHttpDateTime(HeaderData(kHttpIfModifiedSince),
HeaderLength(kHttpIfModifiedSince));
}
static char *ServeAsset(struct Asset *a, const char *path, size_t pathlen) { static char *ServeAsset(struct Asset *a, const char *path, size_t pathlen) {
char *p; char *p;
uint32_t crc; uint32_t crc;
@ -4392,7 +4394,7 @@ static bool HandleMessage(void) {
} }
if (msg.version >= 10) { if (msg.version >= 10) {
p = AppendCrlf(stpcpy(stpcpy(p, "Date: "), shared->currentdate)); p = AppendCrlf(stpcpy(stpcpy(p, "Date: "), shared->currentdate));
if (!branded) p = AppendServer(p, serverheader); if (!branded) p = stpcpy(p, serverheader);
if (extrahdrs) p = stpcpy(p, extrahdrs); if (extrahdrs) p = stpcpy(p, extrahdrs);
if (connectionclose) { if (connectionclose) {
p = stpcpy(p, "Connection: close\r\n"); p = stpcpy(p, "Connection: close\r\n");

26
tool/viz/life.c
View file

@ -835,6 +835,26 @@ static void OnMouse(char *p) {
} }
} }
static void Rando1(void) {
long i, n;
n = (byn * bxn) >> 6;
for (i = 0; i < n; ++i) {
board[i] = rand64();
}
}
static void Rando2(void) {
long i, n;
n = (byn * bxn) >> 6;
for (i = 0; i < n; ++i) {
board[i] = rand();
board[i] <<= 31;
board[i] |= rand();
board[i] <<= 2;
board[i] |= rand() & 0b11;
}
}
static void ReadKeyboard(void) { static void ReadKeyboard(void) {
char buf[32], *p = buf; char buf[32], *p = buf;
memset(buf, 0, sizeof(buf)); memset(buf, 0, sizeof(buf));
@ -861,6 +881,12 @@ static void ReadKeyboard(void) {
case CTRL('V'): case CTRL('V'):
OnPageDown(); OnPageDown();
break; break;
case CTRL('R'):
Rando1();
break;
case CTRL('G'):
Rando2();
break;
case 'M': case 'M':
if (mousemode) { if (mousemode) {
DisableMouse(); DisableMouse();