diff options
109 files changed, 269 insertions, 269 deletions
diff --git a/gen/prop/age b/gen/prop/age index d0f742f..c6aac06 100755 --- a/gen/prop/age +++ b/gen/prop/age @@ -10,7 +10,7 @@ BEGIN { print "/* This file is autogenerated by gen/prop/age; DO NOT EDIT. */" print "" - print "#include \"__bsearch.h\"" + print "#include \"_bsearch.h\"" print "#include \"rune.h\"" print "#include \"unicode/prop.h\"" print "" @@ -44,7 +44,7 @@ END { print "};" print "" - print "__MLIB_DEFINE_BSEARCH(enum uprop_age, lookup, AGE_NA)" + print "_MLIB_DEFINE_BSEARCH(enum uprop_age, lookup, AGE_NA)" print "" print "enum uprop_age" print "uprop_get_age(rune ch)" diff --git a/gen/prop/bc b/gen/prop/bc index ccaf55a..fdb8c3f 100755 --- a/gen/prop/bc +++ b/gen/prop/bc @@ -10,7 +10,7 @@ BEGIN { print "/* This file is autogenerated by gen/prop/bc; DO NOT EDIT. */" print "" - print "#include \"__bsearch.h\"" + print "#include \"_bsearch.h\"" print "#include \"macros.h\"" print "#include \"rune.h\"" print "#include \"unicode/prop.h\"" @@ -54,7 +54,7 @@ END { print "};" print "" - print "__MLIB_DEFINE_BSEARCH(enum uprop_bc, lookup, BC_L)" + print "_MLIB_DEFINE_BSEARCH(enum uprop_bc, lookup, BC_L)" print "" print "enum uprop_bc" print "uprop_get_bc(rune ch)" diff --git a/gen/prop/blk b/gen/prop/blk index 574f5af..a3bf56d 100755 --- a/gen/prop/blk +++ b/gen/prop/blk @@ -339,7 +339,7 @@ BEGIN { print "/* This file is autogenerated by gen/prop/blk; DO NOT EDIT. */" print "" - print "#include \"__bsearch.h\"" + print "#include \"_bsearch.h\"" print "#include \"macros.h\"" print "#include \"rune.h\"" print "#include \"unicode/prop.h\"" @@ -384,7 +384,7 @@ END { print "};" print "" - print "__MLIB_DEFINE_BSEARCH(enum uprop_blk, lookup, BLK_NB)" + print "_MLIB_DEFINE_BSEARCH(enum uprop_blk, lookup, BLK_NB)" print "" print "enum uprop_blk" print "uprop_get_blk(rune ch)" diff --git a/gen/prop/bmg b/gen/prop/bmg index ae5beff..67124cd 100755 --- a/gen/prop/bmg +++ b/gen/prop/bmg @@ -10,7 +10,7 @@ BEGIN { print "/* This file is autogenerated by gen/prop/bmg; DO NOT EDIT. */" print "" - print "#include \"__bsearch.h\"" + print "#include \"_bsearch.h\"" print "#include \"macros.h\"" print "#include \"rune.h\"" print "#include \"unicode/prop.h\"" @@ -43,7 +43,7 @@ END { print "};" print "" - print "__MLIB_DEFINE_BSEARCH_KV(rune, lookup, 0)" + print "_MLIB_DEFINE_BSEARCH_KV(rune, lookup, 0)" print "" print "rune" print "uprop_get_bmg(rune ch)" diff --git a/gen/prop/bool-props.awk b/gen/prop/bool-props.awk index d9c6299..6362dea 100644 --- a/gen/prop/bool-props.awk +++ b/gen/prop/bool-props.awk @@ -3,7 +3,7 @@ BEGIN { print "/* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */" print "" - print "#include \"__bsearch.h\"" + print "#include \"_bsearch.h\"" print "#include \"bitset.h\"" print "#include \"rune.h\"" print "#include \"unicode/prop.h\"" @@ -62,7 +62,7 @@ END { print "};" print "" - print "__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)" + print "_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)" print "" } diff --git a/gen/prop/bpb b/gen/prop/bpb index c6fdf5d..8c0b696 100755 --- a/gen/prop/bpb +++ b/gen/prop/bpb @@ -10,7 +10,7 @@ BEGIN { print "/* This file is autogenerated by gen/prop/bpb; DO NOT EDIT. */" print "" - print "#include \"__bsearch.h\"" + print "#include \"_bsearch.h\"" print "#include \"macros.h\"" print "#include \"rune.h\"" print "#include \"unicode/prop.h\"" @@ -41,7 +41,7 @@ END { print "};" print "" - print "__MLIB_DEFINE_BSEARCH_KV(rune, lookup, 0)" + print "_MLIB_DEFINE_BSEARCH_KV(rune, lookup, 0)" print "" print "rune" print "uprop_get_bpb(rune ch)" diff --git a/gen/prop/bpt b/gen/prop/bpt index c9726a6..1ad1741 100755 --- a/gen/prop/bpt +++ b/gen/prop/bpt @@ -10,7 +10,7 @@ BEGIN { print "/* This file is autogenerated by gen/prop/bpt; DO NOT EDIT. */" print "" - print "#include \"__bsearch.h\"" + print "#include \"_bsearch.h\"" print "#include \"macros.h\"" print "#include \"rune.h\"" print "#include \"unicode/prop.h\"" @@ -42,7 +42,7 @@ END { print "};" print "" - print "__MLIB_DEFINE_BSEARCH_KV(enum uprop_bpt, lookup, BPT_N)" + print "_MLIB_DEFINE_BSEARCH_KV(enum uprop_bpt, lookup, BPT_N)" print "" print "enum uprop_bpt" print "uprop_get_bpt(rune ch)" diff --git a/gen/prop/dt b/gen/prop/dt index eb4884c..12881c5 100755 --- a/gen/prop/dt +++ b/gen/prop/dt @@ -29,7 +29,7 @@ BEGIN { print "/* This file is autogenerated by gen/prop/dt; DO NOT EDIT. */" print "" - print "#include \"__bsearch.h\"" + print "#include \"_bsearch.h\"" print "#include \"macros.h\"" print "#include \"rune.h\"" print "#include \"unicode/prop.h\"" @@ -73,7 +73,7 @@ END { print "};" print "" - print "__MLIB_DEFINE_BSEARCH(enum uprop_dt, lookup, DT_NONE)" + print "_MLIB_DEFINE_BSEARCH(enum uprop_dt, lookup, DT_NONE)" print "" print "enum uprop_dt" print "uprop_get_dt(rune ch)" diff --git a/gen/prop/ea b/gen/prop/ea index a72ff10..0d7f357 100755 --- a/gen/prop/ea +++ b/gen/prop/ea @@ -10,7 +10,7 @@ BEGIN { print "/* This file is autogenerated by gen/prop/ea; DO NOT EDIT. */" print "" - print "#include \"__bsearch.h\"" + print "#include \"_bsearch.h\"" print "#include \"macros.h\"" print "#include \"rune.h\"" print "#include \"unicode/prop.h\"" @@ -54,7 +54,7 @@ END { print "};" print "" - print "__MLIB_DEFINE_BSEARCH(enum uprop_ea, lookup, EA_NA)" + print "_MLIB_DEFINE_BSEARCH(enum uprop_ea, lookup, EA_NA)" print "" print "enum uprop_ea" print "uprop_get_ea(rune ch)" diff --git a/gen/prop/gc b/gen/prop/gc index c027754..4b4409f 100755 --- a/gen/prop/gc +++ b/gen/prop/gc @@ -10,7 +10,7 @@ BEGIN { print "/* This file is autogenerated by gen/prop/gc; DO NOT EDIT. */" print "" - print "#include \"__bsearch.h\"" + print "#include \"_bsearch.h\"" print "#include \"macros.h\"" print "#include \"rune.h\"" print "#include \"unicode/prop.h\"" @@ -57,7 +57,7 @@ END { print "};" print "" - print "__MLIB_DEFINE_BSEARCH(enum uprop_gc, lookup, GC_CN)" + print "_MLIB_DEFINE_BSEARCH(enum uprop_gc, lookup, GC_CN)" print "" print "enum uprop_gc" print "uprop_get_gc(rune ch)" diff --git a/gen/prop/lb b/gen/prop/lb index 251a947..2abab6c 100755 --- a/gen/prop/lb +++ b/gen/prop/lb @@ -10,7 +10,7 @@ BEGIN { print "/* This file is autogenerated by gen/prop/lb; DO NOT EDIT. */" print "" - print "#include \"__bsearch.h\"" + print "#include \"_bsearch.h\"" print "#include \"macros.h\"" print "#include \"rune.h\"" print "#include \"unicode/prop.h\"" @@ -54,7 +54,7 @@ END { print "};" print "" - print "__MLIB_DEFINE_BSEARCH(enum uprop_lb, lookup, LB_XX)" + print "_MLIB_DEFINE_BSEARCH(enum uprop_lb, lookup, LB_XX)" print "" print "enum uprop_lb" print "uprop_get_lb(rune ch)" diff --git a/gen/prop/na1 b/gen/prop/na1 index 855f1de..776bf11 100755 --- a/gen/prop/na1 +++ b/gen/prop/na1 @@ -10,7 +10,7 @@ BEGIN { print "/* This file is autogenerated by gen/prop/na1; DO NOT EDIT. */" print "" - print "#include \"__bsearch.h\"" + print "#include \"_bsearch.h\"" print "#include \"macros.h\"" print "#include \"rune.h\"" print "#include \"unicode/prop.h\"" @@ -33,7 +33,7 @@ length($11) > 0 { END { print "};" print "" - print "__MLIB_DEFINE_BSEARCH_KV(struct u8view, lookup, (struct u8view){})" + print "_MLIB_DEFINE_BSEARCH_KV(struct u8view, lookup, (struct u8view){})" print "" print "struct u8view" print "uprop_get_na1(rune ch)" diff --git a/gen/prop/nt b/gen/prop/nt index 720baf2..835bc3f 100755 --- a/gen/prop/nt +++ b/gen/prop/nt @@ -14,7 +14,7 @@ BEGIN { print "/* This file is autogenerated by gen/prop/nt; DO NOT EDIT. */" print "" - print "#include \"__bsearch.h\"" + print "#include \"_bsearch.h\"" print "#include \"macros.h\"" print "#include \"rune.h\"" print "#include \"unicode/prop.h\"" @@ -58,7 +58,7 @@ END { print "};" print "" - print "__MLIB_DEFINE_BSEARCH(enum uprop_nt, lookup, NT_NONE)" + print "_MLIB_DEFINE_BSEARCH(enum uprop_nt, lookup, NT_NONE)" print "" print "enum uprop_nt" print "uprop_get_nt(rune ch)" diff --git a/gen/prop/nv b/gen/prop/nv index 9cb6ba9..f8c3e31 100755 --- a/gen/prop/nv +++ b/gen/prop/nv @@ -12,7 +12,7 @@ BEGIN { print "" print "#include <float.h>" print "" - print "#include \"__bsearch.h\"" + print "#include \"_bsearch.h\"" print "#include \"macros.h\"" print "#include \"rune.h\"" print "#include \"unicode/prop.h\"" @@ -54,7 +54,7 @@ END { print "};" print "" - print "__MLIB_DEFINE_BSEARCH_KV(double, lookup, NAN)" + print "_MLIB_DEFINE_BSEARCH_KV(double, lookup, NAN)" print "" print "double" print "uprop_get_nv(rune ch)" diff --git a/gen/prop/sc b/gen/prop/sc index 40fc39b..ac8cbf6 100755 --- a/gen/prop/sc +++ b/gen/prop/sc @@ -177,7 +177,7 @@ BEGIN { print "/* This file is autogenerated by gen/prop/sc; DO NOT EDIT. */" print "" - print "#include \"__bsearch.h\"" + print "#include \"_bsearch.h\"" print "#include \"macros.h\"" print "#include \"rune.h\"" print "#include \"unicode/prop.h\"" @@ -221,7 +221,7 @@ END { print "};" print "" - print "__MLIB_DEFINE_BSEARCH(enum uprop_sc, lookup, SC_ZZZZ)" + print "_MLIB_DEFINE_BSEARCH(enum uprop_sc, lookup, SC_ZZZZ)" print "" print "enum uprop_sc" print "uprop_get_sc(rune ch)" diff --git a/gen/prop/scf b/gen/prop/scf index c2a2b9d..8dcfcec 100755 --- a/gen/prop/scf +++ b/gen/prop/scf @@ -10,7 +10,7 @@ BEGIN { print "/* This file is autogenerated by gen/prop/scf; DO NOT EDIT. */" print "" - print "#include \"__bsearch.h\"" + print "#include \"_bsearch.h\"" print "#include \"macros.h\"" print "#include \"rune.h\"" print "#include \"unicode/prop.h\"" @@ -42,7 +42,7 @@ END { print "};" print "" - print "__MLIB_DEFINE_BSEARCH_KV(rune, lookup, ch)" + print "_MLIB_DEFINE_BSEARCH_KV(rune, lookup, ch)" print "" print "rune" print "uprop_get_scf(rune ch, bool az_or_tr)" diff --git a/gen/prop/slc b/gen/prop/slc index c7019e4..8142be8 100755 --- a/gen/prop/slc +++ b/gen/prop/slc @@ -10,7 +10,7 @@ BEGIN { print "/* This file is autogenerated by gen/prop/slc; DO NOT EDIT. */" print "" - print "#include \"__bsearch.h\"" + print "#include \"_bsearch.h\"" print "#include \"macros.h\"" print "#include \"rune.h\"" print "#include \"unicode/prop.h\"" @@ -42,7 +42,7 @@ END { print "};" print "" - print "__MLIB_DEFINE_BSEARCH_KV(rune, lookup, ch)" + print "_MLIB_DEFINE_BSEARCH_KV(rune, lookup, ch)" print "" print "rune" print "uprop_get_slc(rune ch)" diff --git a/gen/prop/stc b/gen/prop/stc index 252cfa5..eb65d07 100755 --- a/gen/prop/stc +++ b/gen/prop/stc @@ -10,7 +10,7 @@ BEGIN { print "/* This file is autogenerated by gen/prop/stc; DO NOT EDIT. */" print "" - print "#include \"__bsearch.h\"" + print "#include \"_bsearch.h\"" print "#include \"macros.h\"" print "#include \"rune.h\"" print "#include \"unicode/prop.h\"" @@ -34,7 +34,7 @@ END { print "};" print "" - print "__MLIB_DEFINE_BSEARCH_KV(rune, lookup, uprop_get_suc(ch))" + print "_MLIB_DEFINE_BSEARCH_KV(rune, lookup, uprop_get_suc(ch))" print "" print "rune" print "uprop_get_stc(rune ch)" diff --git a/gen/prop/suc b/gen/prop/suc index 1ae4ad4..9448dbc 100755 --- a/gen/prop/suc +++ b/gen/prop/suc @@ -10,7 +10,7 @@ BEGIN { print "/* This file is autogenerated by gen/prop/suc; DO NOT EDIT. */" print "" - print "#include \"__bsearch.h\"" + print "#include \"_bsearch.h\"" print "#include \"macros.h\"" print "#include \"rune.h\"" print "#include \"unicode/prop.h\"" @@ -42,7 +42,7 @@ END { print "};" print "" - print "__MLIB_DEFINE_BSEARCH_KV(rune, lookup, ch)" + print "_MLIB_DEFINE_BSEARCH_KV(rune, lookup, ch)" print "" print "rune" print "uprop_get_suc(rune ch)" diff --git a/gen/string/gbrk b/gen/string/gbrk index ecde7f5..18f7cd4 100755 --- a/gen/string/gbrk +++ b/gen/string/gbrk @@ -2,17 +2,17 @@ set -e cd "${0%/*}/../.." -exec >include/unicode/__gbrk.h +exec >include/unicode/_gbrk.h cat <<C /* This file is autogenerated by gen/string/gbrk; DO NOT EDIT. */ -#ifndef MLIB_UNICODE___GBRK_H -#define MLIB_UNICODE___GBRK_H +#ifndef MLIB_UNICODE__GBRK_H +#define MLIB_UNICODE__GBRK_H /* clang-format off */ -#include "__rune.h" +#include "_rune.h" typedef enum { GBP_OTHER = 0, @@ -93,5 +93,5 @@ END { cat <<C }; -#endif /* !MLIB_UNICODE___GBRK_H */ +#endif /* !MLIB_UNICODE__GBRK_H */ C diff --git a/include/__rune.h b/include/__rune.h deleted file mode 100644 index 4011411..0000000 --- a/include/__rune.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef MLIB___RUNE_H -#define MLIB___RUNE_H - -#include <stdint.h> - -typedef uint_least32_t rune; - -#endif /* !MLIB___RUNE_H */ diff --git a/include/__u8view.h b/include/__u8view.h deleted file mode 100644 index c6073c7..0000000 --- a/include/__u8view.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef MLIB___U8VIEW_H -#define MLIB___U8VIEW_H - -#include <stddef.h> - -#include "__charN_t.h" - -struct u8view { - const char8_t *p; - size_t len; -}; - -#endif /* !MLIB___U8VIEW_H */ diff --git a/include/__bsearch.h b/include/_bsearch.h index 6abcff6..ce8f118 100644 --- a/include/__bsearch.h +++ b/include/_bsearch.h @@ -2,7 +2,7 @@ #include "macros.h" -#define __MLIB_DEFINE_BSEARCH(TYPE, TABLE, DEFAULT) \ +#define _MLIB_DEFINE_BSEARCH(TYPE, TABLE, DEFAULT) \ static TYPE mlib_lookup(rune ch) \ { \ ptrdiff_t i, lo, hi; \ @@ -21,7 +21,7 @@ return DEFAULT; \ } -#define __MLIB_DEFINE_BSEARCH_CONTAINS(TABLE) \ +#define _MLIB_DEFINE_BSEARCH_CONTAINS(TABLE) \ static bool mlib_lookup_contains(rune ch) \ { \ ptrdiff_t i, lo, hi; \ @@ -40,7 +40,7 @@ return false; \ } -#define __MLIB_DEFINE_BSEARCH_KV(TYPE, TABLE, DEFAULT) \ +#define _MLIB_DEFINE_BSEARCH_KV(TYPE, TABLE, DEFAULT) \ static TYPE mlib_lookup_kv(rune ch) \ { \ ptrdiff_t i, lo, hi; \ diff --git a/include/__charN_t.h b/include/_charN_t.h index eca16b9..5397fb3 100644 --- a/include/__charN_t.h +++ b/include/_charN_t.h @@ -1,5 +1,5 @@ -#ifndef MLIB___CHARN_T_H -#define MLIB___CHARN_T_H +#ifndef MLIB__CHARN_T_H +#define MLIB__CHARN_T_H #include <stdint.h> @@ -7,4 +7,4 @@ typedef unsigned char char8_t; typedef uint_least16_t char16_t; typedef uint_least32_t char32_t; -#endif /* !MLIB___CHARN_T_H */ +#endif /* !MLIB__CHARN_T_H */ diff --git a/include/__qmacros.h b/include/_qmacros.h index fd7b803..d496581 100644 --- a/include/__qmacros.h +++ b/include/_qmacros.h @@ -1,5 +1,5 @@ -#ifndef MLIB___QMACROS_H -#define MLIB___QMACROS_H +#ifndef MLIB__QMACROS_H +#define MLIB__QMACROS_H /* Macros for qualifier-preserving functions. These are used to create wrappers around some functions which will return a const-qualified pointer if the @@ -9,18 +9,18 @@ The macros are taken from the N3020 proposal for C23. */ /* clang-format off */ -#define __MLIB_PTR_IS_CONST(P) \ +#define _MLIB_PTR_IS_CONST(P) \ _Generic(1 ? (P) : (void *)(P), \ const void *: 1, \ default: 0) -#define __MLIB_STATIC_IF(P, T, E) \ +#define _MLIB_STATIC_IF(P, T, E) \ _Generic(&(char[!!(P) + 1]){0}, \ char(*)[2]: T, \ char(*)[1]: E) -#define __MLIB_Q_PTR(T, F, S, ...) \ - __MLIB_STATIC_IF(__MLIB_PTR_IS_CONST((S)), \ +#define _MLIB_Q_PTR(T, F, S, ...) \ + _MLIB_STATIC_IF(_MLIB_PTR_IS_CONST((S)), \ (const T *)(F)(__VA_ARGS__), \ (T *)(F)(__VA_ARGS__)) /* clang-format on */ -#endif /* !MLIB___QMACROS_H */ +#endif /* !MLIB__QMACROS_H */ diff --git a/include/_rune.h b/include/_rune.h new file mode 100644 index 0000000..26c0df1 --- /dev/null +++ b/include/_rune.h @@ -0,0 +1,8 @@ +#ifndef MLIB__RUNE_H +#define MLIB__RUNE_H + +#include <stdint.h> + +typedef uint_least32_t rune; + +#endif /* !MLIB__RUNE_H */ diff --git a/include/_u8view.h b/include/_u8view.h new file mode 100644 index 0000000..5d6a9b8 --- /dev/null +++ b/include/_u8view.h @@ -0,0 +1,13 @@ +#ifndef MLIB__U8VIEW_H +#define MLIB__U8VIEW_H + +#include <stddef.h> + +#include "_charN_t.h" + +struct u8view { + const char8_t *p; + size_t len; +}; + +#endif /* !MLIB__U8VIEW_H */ diff --git a/include/bitset.h b/include/bitset.h index 6be07d6..4945d5b 100644 --- a/include/bitset.h +++ b/include/bitset.h @@ -3,14 +3,14 @@ #include <limits.h> -#define __MLIB_BITSLOT(x) ((x) / CHAR_BIT) -#define __MLIB_BITMASK(x) (1 << ((x) % CHAR_BIT)) +#define _MLIB_BITSLOT(x) ((x) / CHAR_BIT) +#define _MLIB_BITMASK(x) (1 << ((x) % CHAR_BIT)) #define bitset(name, n) unsigned char name[(n + CHAR_BIT - 1) / CHAR_BIT] -#define CLRBIT(bs, x) ((bs)[__MLIB_BITSLOT(x)] &= ~__MLIB_BITMASK(x)) -#define SETBIT(bs, x) ((bs)[__MLIB_BITSLOT(x)] |= __MLIB_BITMASK(x)) -#define TOGLBIT(bs, x) ((bs)[__MLIB_BITSLOT(x)] ^= __MLIB_BITMASK(x)) -#define TESTBIT(bs, x) ((bool)((bs)[__MLIB_BITSLOT(x)] & __MLIB_BITMASK(x))) +#define CLRBIT(bs, x) ((bs)[_MLIB_BITSLOT(x)] &= ~_MLIB_BITMASK(x)) +#define SETBIT(bs, x) ((bs)[_MLIB_BITSLOT(x)] |= _MLIB_BITMASK(x)) +#define TOGLBIT(bs, x) ((bs)[_MLIB_BITSLOT(x)] ^= _MLIB_BITMASK(x)) +#define TESTBIT(bs, x) ((bool)((bs)[_MLIB_BITSLOT(x)] & _MLIB_BITMASK(x))) #endif /* !MLIB_BITSET_H */ diff --git a/include/errors.h b/include/errors.h index dfd092a..6e8cbce 100644 --- a/include/errors.h +++ b/include/errors.h @@ -11,7 +11,7 @@ void vwarn(const char *, va_list); [[noreturn, gnu::format(printf, 1, 2)]] void err(const char *, ...); [[noreturn, gnu::format(printf, 2, 3)]] void cerr(int, const char *, ...); -extern const char *__mlib_errors_progname; +extern const char *_mlib_errors_progname; void mlib_setprogname(const char *); @@ -19,7 +19,7 @@ void mlib_setprogname(const char *); static inline const char * mlib_progname(void) { - return __mlib_errors_progname; + return _mlib_errors_progname; } #endif /* !MLIB_ERRORS_H */ diff --git a/include/mbio.h b/include/mbio.h index 80e703b..2cb501d 100644 --- a/include/mbio.h +++ b/include/mbio.h @@ -3,8 +3,8 @@ #include <stdio.h> -#include "__charN_t.h" -#include "__rune.h" +#include "_charN_t.h" +#include "_rune.h" int freadrune(rune *, FILE *); diff --git a/include/mbstring.h b/include/mbstring.h index 7e3f453..b6a769c 100644 --- a/include/mbstring.h +++ b/include/mbstring.h @@ -3,10 +3,10 @@ #include <stddef.h> -#include "__charN_t.h" -#include "__qmacros.h" -#include "__rune.h" -#include "__u8view.h" +#include "_charN_t.h" +#include "_qmacros.h" +#include "_rune.h" +#include "_u8view.h" #define U8V(s) ((struct u8view){.p = (s), .len = sizeof(s) - 1}) #define U8_ARGS(s) ((s).p), ((s).len) @@ -51,8 +51,8 @@ int u8prev(rune *, const char8_t **, const char8_t *); [[nodiscard]] size_t u8len(const char8_t *, size_t); -#define u8chk(s, n) __MLIB_Q_PTR(char8_t, u8chk, (s), (s), (n)) -#define u8chr(s, n, ch) __MLIB_Q_PTR(char8_t, u8chr, (s), (s), (n), (ch)) -#define u8rchr(s, n, ch) __MLIB_Q_PTR(char8_t, u8rchr, (s), (s), (n), (ch)) +#define u8chk(s, n) _MLIB_Q_PTR(char8_t, u8chk, (s), (s), (n)) +#define u8chr(s, n, ch) _MLIB_Q_PTR(char8_t, u8chr, (s), (s), (n), (ch)) +#define u8rchr(s, n, ch) _MLIB_Q_PTR(char8_t, u8rchr, (s), (s), (n), (ch)) #endif /* !MLIB_MBSTRING_H */ diff --git a/include/optparse.h b/include/optparse.h index 5f7eafd..7e2c315 100644 --- a/include/optparse.h +++ b/include/optparse.h @@ -3,10 +3,10 @@ #include <stddef.h> -#include "__charN_t.h" -#include "__rune.h" -#include "__u8view.h" #include "_attrs.h" +#include "_charN_t.h" +#include "_rune.h" +#include "_u8view.h" struct optparse { bool _b; diff --git a/include/rune.h b/include/rune.h index db08de2..1ee868c 100644 --- a/include/rune.h +++ b/include/rune.h @@ -3,28 +3,28 @@ #include <inttypes.h> -#include "__rune.h" +#include "_rune.h" -#define __MLIB_RUNE_PRIDEF(c) PRI##c##LEAST32 -#define __MLIB_RUNE_SCNDEF(c) SCN##c##LEAST32 +#define _MLIB_RUNE_PRIDEF(c) PRI##c##LEAST32 +#define _MLIB_RUNE_SCNDEF(c) SCN##c##LEAST32 #ifdef PRIBLEAST32 -# define PRIBRUNE __MLIB_RUNE_PRIDEF(B) +# define PRIBRUNE _MLIB_RUNE_PRIDEF(B) #endif -#define PRIbRUNE __MLIB_RUNE_PRIDEF(b) -#define PRIdRUNE __MLIB_RUNE_PRIDEF(d) -#define PRIiRUNE __MLIB_RUNE_PRIDEF(i) -#define PRIoRUNE __MLIB_RUNE_PRIDEF(o) -#define PRIuRUNE __MLIB_RUNE_PRIDEF(u) -#define PRIxRUNE __MLIB_RUNE_PRIDEF(x) -#define PRIXRUNE __MLIB_RUNE_PRIDEF(X) - -#define SCNbRUNE __MLIB_RUNE_SCNDEF(b) -#define SCNdRUNE __MLIB_RUNE_SCNDEF(d) -#define SCNiRUNE __MLIB_RUNE_SCNDEF(i) -#define SCNuRUNE __MLIB_RUNE_SCNDEF(u) -#define SCNoRUNE __MLIB_RUNE_SCNDEF(o) -#define SCNxRUNE __MLIB_RUNE_SCNDEF(x) +#define PRIbRUNE _MLIB_RUNE_PRIDEF(b) +#define PRIdRUNE _MLIB_RUNE_PRIDEF(d) +#define PRIiRUNE _MLIB_RUNE_PRIDEF(i) +#define PRIoRUNE _MLIB_RUNE_PRIDEF(o) +#define PRIuRUNE _MLIB_RUNE_PRIDEF(u) +#define PRIxRUNE _MLIB_RUNE_PRIDEF(x) +#define PRIXRUNE _MLIB_RUNE_PRIDEF(X) + +#define SCNbRUNE _MLIB_RUNE_SCNDEF(b) +#define SCNdRUNE _MLIB_RUNE_SCNDEF(d) +#define SCNiRUNE _MLIB_RUNE_SCNDEF(i) +#define SCNuRUNE _MLIB_RUNE_SCNDEF(u) +#define SCNoRUNE _MLIB_RUNE_SCNDEF(o) +#define SCNxRUNE _MLIB_RUNE_SCNDEF(x) #define RUNE_C(x) UINT32_C(x) diff --git a/include/unicode/__gbrk.h b/include/unicode/_gbrk.h index 476c4a7..cfcdb34 100644 --- a/include/unicode/__gbrk.h +++ b/include/unicode/_gbrk.h @@ -1,11 +1,11 @@ /* This file is autogenerated by gen/string/gbrk; DO NOT EDIT. */ -#ifndef MLIB_UNICODE___GBRK_H -#define MLIB_UNICODE___GBRK_H +#ifndef MLIB_UNICODE__GBRK_H +#define MLIB_UNICODE__GBRK_H /* clang-format off */ -#include "__rune.h" +#include "_rune.h" typedef enum { GBP_OTHER = 0, @@ -1564,4 +1564,4 @@ static const struct { {0x0E01F0, 0x0E0FFF, GBP_CTRL}, }; -#endif /* !MLIB_UNICODE___GBRK_H */ +#endif /* !MLIB_UNICODE__GBRK_H */ diff --git a/include/unicode/prop.h b/include/unicode/prop.h index e3e0d5e..01283e8 100644 --- a/include/unicode/prop.h +++ b/include/unicode/prop.h @@ -4,9 +4,9 @@ #include <inttypes.h> #include <stddef.h> -#include "__rune.h" -#include "__u8view.h" #include "_attrs.h" +#include "_rune.h" +#include "_u8view.h" struct rview { const rune *p; diff --git a/include/unicode/string.h b/include/unicode/string.h index 81c2aff..6363d9d 100644 --- a/include/unicode/string.h +++ b/include/unicode/string.h @@ -3,8 +3,8 @@ #include <stddef.h> -#include "__charN_t.h" -#include "__u8view.h" +#include "_charN_t.h" +#include "_u8view.h" /* clang-format off */ diff --git a/lib/errors/mlib_setprogname.c b/lib/errors/mlib_setprogname.c index bfc77b0..415ed64 100644 --- a/lib/errors/mlib_setprogname.c +++ b/lib/errors/mlib_setprogname.c @@ -2,11 +2,11 @@ #include "errors.h" -const char *__mlib_errors_progname; +const char *_mlib_errors_progname; void mlib_setprogname(const char *s) { const char *p = strrchr(s, '/'); - __mlib_errors_progname = p ? p + 1 : s; + _mlib_errors_progname = p ? p + 1 : s; } diff --git a/lib/unicode/prop/uprop_get_age.c b/lib/unicode/prop/uprop_get_age.c index 0c9d6fe..4a67453 100644 --- a/lib/unicode/prop/uprop_get_age.c +++ b/lib/unicode/prop/uprop_get_age.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/age; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "rune.h" #include "unicode/prop.h" @@ -1703,7 +1703,7 @@ static const struct { {RUNE_C(0x0EFFFE), RUNE_C(0x10FFFF), AGE_V2_0}, }; -__MLIB_DEFINE_BSEARCH(enum uprop_age, lookup, AGE_NA) +_MLIB_DEFINE_BSEARCH(enum uprop_age, lookup, AGE_NA) enum uprop_age uprop_get_age(rune ch) diff --git a/lib/unicode/prop/uprop_get_bc.c b/lib/unicode/prop/uprop_get_bc.c index c8b7a35..1de3458 100644 --- a/lib/unicode/prop/uprop_get_bc.c +++ b/lib/unicode/prop/uprop_get_bc.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bc; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "macros.h" #include "rune.h" #include "unicode/prop.h" @@ -1529,7 +1529,7 @@ static const struct { {RUNE_C(0x10FFFE), RUNE_C(0x10FFFF), BC_BN}, }; -__MLIB_DEFINE_BSEARCH(enum uprop_bc, lookup, BC_L) +_MLIB_DEFINE_BSEARCH(enum uprop_bc, lookup, BC_L) enum uprop_bc uprop_get_bc(rune ch) diff --git a/lib/unicode/prop/uprop_get_blk.c b/lib/unicode/prop/uprop_get_blk.c index a1a6c39..9bb30a5 100644 --- a/lib/unicode/prop/uprop_get_blk.c +++ b/lib/unicode/prop/uprop_get_blk.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/blk; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "macros.h" #include "rune.h" #include "unicode/prop.h" @@ -372,7 +372,7 @@ static const struct { {RUNE_C(0x100000), RUNE_C(0x10FFFF), BLK_SUP_PUA_B}, }; -__MLIB_DEFINE_BSEARCH(enum uprop_blk, lookup, BLK_NB) +_MLIB_DEFINE_BSEARCH(enum uprop_blk, lookup, BLK_NB) enum uprop_blk uprop_get_blk(rune ch) diff --git a/lib/unicode/prop/uprop_get_bmg.c b/lib/unicode/prop/uprop_get_bmg.c index 629e7f1..2242f01 100644 --- a/lib/unicode/prop/uprop_get_bmg.c +++ b/lib/unicode/prop/uprop_get_bmg.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bmg; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "macros.h" #include "rune.h" #include "unicode/prop.h" @@ -463,7 +463,7 @@ static const struct { {RUNE_C(0x00FF63), RUNE_C(0x00FF62)}, }; -__MLIB_DEFINE_BSEARCH_KV(rune, lookup, 0) +_MLIB_DEFINE_BSEARCH_KV(rune, lookup, 0) rune uprop_get_bmg(rune ch) diff --git a/lib/unicode/prop/uprop_get_bpb.c b/lib/unicode/prop/uprop_get_bpb.c index 343f71b..2b7eb10 100644 --- a/lib/unicode/prop/uprop_get_bpb.c +++ b/lib/unicode/prop/uprop_get_bpb.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bpb; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "macros.h" #include "rune.h" #include "unicode/prop.h" @@ -167,7 +167,7 @@ static const struct { {RUNE_C(0x00FF63), RUNE_C(0x00FF62)}, }; -__MLIB_DEFINE_BSEARCH_KV(rune, lookup, 0) +_MLIB_DEFINE_BSEARCH_KV(rune, lookup, 0) rune uprop_get_bpb(rune ch) diff --git a/lib/unicode/prop/uprop_get_bpt.c b/lib/unicode/prop/uprop_get_bpt.c index 7e8c11a..6de4483 100644 --- a/lib/unicode/prop/uprop_get_bpt.c +++ b/lib/unicode/prop/uprop_get_bpt.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bpt; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "macros.h" #include "rune.h" #include "unicode/prop.h" @@ -168,7 +168,7 @@ static const struct { {RUNE_C(0x00FF63), BPT_C}, }; -__MLIB_DEFINE_BSEARCH_KV(enum uprop_bpt, lookup, BPT_N) +_MLIB_DEFINE_BSEARCH_KV(enum uprop_bpt, lookup, BPT_N) enum uprop_bpt uprop_get_bpt(rune ch) diff --git a/lib/unicode/prop/uprop_get_cf.c b/lib/unicode/prop/uprop_get_cf.c index 4b0e90b..fecb08f 100644 --- a/lib/unicode/prop/uprop_get_cf.c +++ b/lib/unicode/prop/uprop_get_cf.c @@ -1,4 +1,4 @@ -#include "__bsearch.h" +#include "_bsearch.h" #include "unicode/prop.h" #define M(...) ((struct rview)_(__VA_ARGS__)) @@ -114,7 +114,7 @@ static const struct { {0xFB17, /* ﬗ */ _(U'մ', U'խ')}, }; -__MLIB_DEFINE_BSEARCH_KV(struct rview, lookup, M()) +_MLIB_DEFINE_BSEARCH_KV(struct rview, lookup, M()) struct rview uprop_get_cf(rune ch, bool az_or_tr) diff --git a/lib/unicode/prop/uprop_get_dt.c b/lib/unicode/prop/uprop_get_dt.c index afc3e66..0db4a72 100644 --- a/lib/unicode/prop/uprop_get_dt.c +++ b/lib/unicode/prop/uprop_get_dt.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/dt; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "macros.h" #include "rune.h" #include "unicode/prop.h" @@ -821,7 +821,7 @@ static const struct { {RUNE_C(0x02F800), RUNE_C(0x02FA1D), DT_CAN}, }; -__MLIB_DEFINE_BSEARCH(enum uprop_dt, lookup, DT_NONE) +_MLIB_DEFINE_BSEARCH(enum uprop_dt, lookup, DT_NONE) enum uprop_dt uprop_get_dt(rune ch) diff --git a/lib/unicode/prop/uprop_get_ea.c b/lib/unicode/prop/uprop_get_ea.c index 91cafad..07642a7 100644 --- a/lib/unicode/prop/uprop_get_ea.c +++ b/lib/unicode/prop/uprop_get_ea.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/ea; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "macros.h" #include "rune.h" #include "unicode/prop.h" @@ -1179,7 +1179,7 @@ static const struct { {RUNE_C(0x100000), RUNE_C(0x10FFFD), EA_A}, }; -__MLIB_DEFINE_BSEARCH(enum uprop_ea, lookup, EA_NA) +_MLIB_DEFINE_BSEARCH(enum uprop_ea, lookup, EA_NA) enum uprop_ea uprop_get_ea(rune ch) diff --git a/lib/unicode/prop/uprop_get_gc.c b/lib/unicode/prop/uprop_get_gc.c index bd7a743..448039f 100644 --- a/lib/unicode/prop/uprop_get_gc.c +++ b/lib/unicode/prop/uprop_get_gc.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/gc; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "macros.h" #include "rune.h" #include "unicode/prop.h" @@ -3289,7 +3289,7 @@ static const struct { {RUNE_C(0x100000), RUNE_C(0x10FFFD), GC_CO}, }; -__MLIB_DEFINE_BSEARCH(enum uprop_gc, lookup, GC_CN) +_MLIB_DEFINE_BSEARCH(enum uprop_gc, lookup, GC_CN) enum uprop_gc uprop_get_gc(rune ch) diff --git a/lib/unicode/prop/uprop_get_lb.c b/lib/unicode/prop/uprop_get_lb.c index 67437ad..7c9b34a 100644 --- a/lib/unicode/prop/uprop_get_lb.c +++ b/lib/unicode/prop/uprop_get_lb.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/lb; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "macros.h" #include "rune.h" #include "unicode/prop.h" @@ -2852,7 +2852,7 @@ static const struct { {RUNE_C(0x100000), RUNE_C(0x10FFFD), LB_XX}, }; -__MLIB_DEFINE_BSEARCH(enum uprop_lb, lookup, LB_XX) +_MLIB_DEFINE_BSEARCH(enum uprop_lb, lookup, LB_XX) enum uprop_lb uprop_get_lb(rune ch) diff --git a/lib/unicode/prop/uprop_get_na1.c b/lib/unicode/prop/uprop_get_na1.c index b204cce..cd66595 100644 --- a/lib/unicode/prop/uprop_get_na1.c +++ b/lib/unicode/prop/uprop_get_na1.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/na1; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "macros.h" #include "rune.h" #include "unicode/prop.h" @@ -1992,7 +1992,7 @@ static const struct { {RUNE_C(0x00FFE4), _('F', 'U', 'L', 'L', 'W', 'I', 'D', 'T', 'H', ' ', 'B', 'R', 'O', 'K', 'E', 'N', ' ', 'V', 'E', 'R', 'T', 'I', 'C', 'A', 'L', ' ', 'B', 'A', 'R')}, }; -__MLIB_DEFINE_BSEARCH_KV(struct u8view, lookup, (struct u8view){}) +_MLIB_DEFINE_BSEARCH_KV(struct u8view, lookup, (struct u8view){}) struct u8view uprop_get_na1(rune ch) diff --git a/lib/unicode/prop/uprop_get_nt.c b/lib/unicode/prop/uprop_get_nt.c index 70e0055..bbcaa02 100644 --- a/lib/unicode/prop/uprop_get_nt.c +++ b/lib/unicode/prop/uprop_get_nt.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/nt; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "macros.h" #include "rune.h" #include "unicode/prop.h" @@ -288,7 +288,7 @@ static const struct { {RUNE_C(0x02F890), RUNE_C(0x02F890), NT_NU}, }; -__MLIB_DEFINE_BSEARCH(enum uprop_nt, lookup, NT_NONE) +_MLIB_DEFINE_BSEARCH(enum uprop_nt, lookup, NT_NONE) enum uprop_nt uprop_get_nt(rune ch) diff --git a/lib/unicode/prop/uprop_get_nv.c b/lib/unicode/prop/uprop_get_nv.c index 73fa482..13ea573 100644 --- a/lib/unicode/prop/uprop_get_nv.c +++ b/lib/unicode/prop/uprop_get_nv.c @@ -2,7 +2,7 @@ #include <float.h> -#include "__bsearch.h" +#include "_bsearch.h" #include "macros.h" #include "rune.h" #include "unicode/prop.h" @@ -1954,7 +1954,7 @@ static const struct { {RUNE_C(0x02F890), 9}, }; -__MLIB_DEFINE_BSEARCH_KV(double, lookup, NAN) +_MLIB_DEFINE_BSEARCH_KV(double, lookup, NAN) double uprop_get_nv(rune ch) diff --git a/lib/unicode/prop/uprop_get_sc.c b/lib/unicode/prop/uprop_get_sc.c index 531c0c7..16bbdd8 100644 --- a/lib/unicode/prop/uprop_get_sc.c +++ b/lib/unicode/prop/uprop_get_sc.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/sc; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "macros.h" #include "rune.h" #include "unicode/prop.h" @@ -986,7 +986,7 @@ static const struct { {RUNE_C(0x0E0100), RUNE_C(0x0E01EF), SC_ZINH}, }; -__MLIB_DEFINE_BSEARCH(enum uprop_sc, lookup, SC_ZZZZ) +_MLIB_DEFINE_BSEARCH(enum uprop_sc, lookup, SC_ZZZZ) enum uprop_sc uprop_get_sc(rune ch) diff --git a/lib/unicode/prop/uprop_get_scf.c b/lib/unicode/prop/uprop_get_scf.c index 88ecf4e..daffc02 100644 --- a/lib/unicode/prop/uprop_get_scf.c +++ b/lib/unicode/prop/uprop_get_scf.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/scf; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "macros.h" #include "rune.h" #include "unicode/prop.h" @@ -1445,7 +1445,7 @@ static const struct { {RUNE_C(0x01E921), RUNE_C(0x01E943)}, }; -__MLIB_DEFINE_BSEARCH_KV(rune, lookup, ch) +_MLIB_DEFINE_BSEARCH_KV(rune, lookup, ch) rune uprop_get_scf(rune ch, bool az_or_tr) diff --git a/lib/unicode/prop/uprop_get_slc.c b/lib/unicode/prop/uprop_get_slc.c index 40e7d84..eec3088 100644 --- a/lib/unicode/prop/uprop_get_slc.c +++ b/lib/unicode/prop/uprop_get_slc.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/slc; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "macros.h" #include "rune.h" #include "unicode/prop.h" @@ -1422,7 +1422,7 @@ static const struct { {RUNE_C(0x01E921), RUNE_C(0x01E943)}, }; -__MLIB_DEFINE_BSEARCH_KV(rune, lookup, ch) +_MLIB_DEFINE_BSEARCH_KV(rune, lookup, ch) rune uprop_get_slc(rune ch) diff --git a/lib/unicode/prop/uprop_get_stc.c b/lib/unicode/prop/uprop_get_stc.c index 8eead56..4f34472 100644 --- a/lib/unicode/prop/uprop_get_stc.c +++ b/lib/unicode/prop/uprop_get_stc.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/stc; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "macros.h" #include "rune.h" #include "unicode/prop.h" @@ -18,7 +18,7 @@ static const struct { {RUNE_C(0x0001F3), RUNE_C(0x0001F2)}, }; -__MLIB_DEFINE_BSEARCH_KV(rune, lookup, uprop_get_suc(ch)) +_MLIB_DEFINE_BSEARCH_KV(rune, lookup, uprop_get_suc(ch)) rune uprop_get_stc(rune ch) diff --git a/lib/unicode/prop/uprop_get_suc.c b/lib/unicode/prop/uprop_get_suc.c index 652ca11..579b78c 100644 --- a/lib/unicode/prop/uprop_get_suc.c +++ b/lib/unicode/prop/uprop_get_suc.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/suc; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "macros.h" #include "rune.h" #include "unicode/prop.h" @@ -1437,7 +1437,7 @@ static const struct { {RUNE_C(0x01E943), RUNE_C(0x01E921)}, }; -__MLIB_DEFINE_BSEARCH_KV(rune, lookup, ch) +_MLIB_DEFINE_BSEARCH_KV(rune, lookup, ch) rune uprop_get_suc(rune ch) diff --git a/lib/unicode/prop/uprop_get_tc.c b/lib/unicode/prop/uprop_get_tc.c index 029ef51..442db6e 100644 --- a/lib/unicode/prop/uprop_get_tc.c +++ b/lib/unicode/prop/uprop_get_tc.c @@ -1,4 +1,4 @@ -#include "__bsearch.h" +#include "_bsearch.h" #include "unicode/prop.h" #define M(...) ((struct rview)_(__VA_ARGS__)) @@ -59,7 +59,7 @@ static const struct { {0xFB17 /* ﬗ */, _(U'Մ', U'խ')}, }; -__MLIB_DEFINE_BSEARCH_KV(struct rview, lookup, M(ch)) +_MLIB_DEFINE_BSEARCH_KV(struct rview, lookup, M(ch)) struct rview uprop_get_tc(rune ch, struct tcctx ctx) diff --git a/lib/unicode/prop/uprop_get_uc.c b/lib/unicode/prop/uprop_get_uc.c index 69435b8..ecb0883 100644 --- a/lib/unicode/prop/uprop_get_uc.c +++ b/lib/unicode/prop/uprop_get_uc.c @@ -1,4 +1,4 @@ -#include "__bsearch.h" +#include "_bsearch.h" #include "macros.h" #include "rune.h" #include "unicode/prop.h" @@ -114,7 +114,7 @@ static const struct { {0xFB17, /* ﬗ */ _(U'Մ', U'Խ')}, }; -__MLIB_DEFINE_BSEARCH_KV(struct rview, lookup, M(ch)) +_MLIB_DEFINE_BSEARCH_KV(struct rview, lookup, M(ch)) struct rview uprop_get_uc(rune ch, struct ucctx ctx) diff --git a/lib/unicode/prop/uprop_is_ahex.c b/lib/unicode/prop/uprop_is_ahex.c index 21dcd97..81465b1 100644 --- a/lib/unicode/prop/uprop_is_ahex.c +++ b/lib/unicode/prop/uprop_is_ahex.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" diff --git a/lib/unicode/prop/uprop_is_alpha.c b/lib/unicode/prop/uprop_is_alpha.c index f5328b4..6fcd435 100644 --- a/lib/unicode/prop/uprop_is_alpha.c +++ b/lib/unicode/prop/uprop_is_alpha.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -745,7 +745,7 @@ static const struct { {RUNE_C(0x031350), RUNE_C(0x0323AF)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_alpha(rune ch) diff --git a/lib/unicode/prop/uprop_is_bidi_c.c b/lib/unicode/prop/uprop_is_bidi_c.c index 962c219..409c20e 100644 --- a/lib/unicode/prop/uprop_is_bidi_c.c +++ b/lib/unicode/prop/uprop_is_bidi_c.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -16,7 +16,7 @@ static const struct { {RUNE_C(0x002066), RUNE_C(0x002069)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_bidi_c(rune ch) diff --git a/lib/unicode/prop/uprop_is_bidi_m.c b/lib/unicode/prop/uprop_is_bidi_m.c index f415fce..9ffd897 100644 --- a/lib/unicode/prop/uprop_is_bidi_m.c +++ b/lib/unicode/prop/uprop_is_bidi_m.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -124,7 +124,7 @@ static const struct { {RUNE_C(0x01D7C3), RUNE_C(0x01D7C3)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_bidi_m(rune ch) diff --git a/lib/unicode/prop/uprop_is_cased.c b/lib/unicode/prop/uprop_is_cased.c index ee0b288..59a5b8d 100644 --- a/lib/unicode/prop/uprop_is_cased.c +++ b/lib/unicode/prop/uprop_is_cased.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -169,7 +169,7 @@ static const struct { {RUNE_C(0x01F170), RUNE_C(0x01F189)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_cased(rune ch) diff --git a/lib/unicode/prop/uprop_is_ci.c b/lib/unicode/prop/uprop_is_ci.c index 43f0e11..33eff8d 100644 --- a/lib/unicode/prop/uprop_is_ci.c +++ b/lib/unicode/prop/uprop_is_ci.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -446,7 +446,7 @@ static const struct { {RUNE_C(0x0E0100), RUNE_C(0x0E01EF)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_ci(rune ch) diff --git a/lib/unicode/prop/uprop_is_cwcf.c b/lib/unicode/prop/uprop_is_cwcf.c index beefb71..809e4c5 100644 --- a/lib/unicode/prop/uprop_is_cwcf.c +++ b/lib/unicode/prop/uprop_is_cwcf.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -637,7 +637,7 @@ static const struct { {RUNE_C(0x01E900), RUNE_C(0x01E921)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_cwcf(rune ch) diff --git a/lib/unicode/prop/uprop_is_cwcm.c b/lib/unicode/prop/uprop_is_cwcm.c index b031ce3..9f67ba6 100644 --- a/lib/unicode/prop/uprop_is_cwcm.c +++ b/lib/unicode/prop/uprop_is_cwcm.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -145,7 +145,7 @@ static const struct { {RUNE_C(0x01E900), RUNE_C(0x01E943)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_cwcm(rune ch) diff --git a/lib/unicode/prop/uprop_is_cwkcf.c b/lib/unicode/prop/uprop_is_cwkcf.c index 33a7c48..c93ff02 100644 --- a/lib/unicode/prop/uprop_is_cwkcf.c +++ b/lib/unicode/prop/uprop_is_cwkcf.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -847,7 +847,7 @@ static const struct { {RUNE_C(0x0E0000), RUNE_C(0x0E0FFF)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_cwkcf(rune ch) diff --git a/lib/unicode/prop/uprop_is_cwl.c b/lib/unicode/prop/uprop_is_cwl.c index 5232692..82152a2 100644 --- a/lib/unicode/prop/uprop_is_cwl.c +++ b/lib/unicode/prop/uprop_is_cwl.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -625,7 +625,7 @@ static const struct { {RUNE_C(0x01E900), RUNE_C(0x01E921)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_cwl(rune ch) diff --git a/lib/unicode/prop/uprop_is_cwt.c b/lib/unicode/prop/uprop_is_cwt.c index 1b32828..8ea2110 100644 --- a/lib/unicode/prop/uprop_is_cwt.c +++ b/lib/unicode/prop/uprop_is_cwt.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -641,7 +641,7 @@ static const struct { {RUNE_C(0x01E922), RUNE_C(0x01E943)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_cwt(rune ch) diff --git a/lib/unicode/prop/uprop_is_cwu.c b/lib/unicode/prop/uprop_is_cwu.c index 27bf088..2b32787 100644 --- a/lib/unicode/prop/uprop_is_cwu.c +++ b/lib/unicode/prop/uprop_is_cwu.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -642,7 +642,7 @@ static const struct { {RUNE_C(0x01E922), RUNE_C(0x01E943)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_cwu(rune ch) diff --git a/lib/unicode/prop/uprop_is_dash.c b/lib/unicode/prop/uprop_is_dash.c index 7b326f7..e49b04a 100644 --- a/lib/unicode/prop/uprop_is_dash.c +++ b/lib/unicode/prop/uprop_is_dash.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -41,7 +41,7 @@ static const struct { {RUNE_C(0x010EAD), RUNE_C(0x010EAD)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_dash(rune ch) diff --git a/lib/unicode/prop/uprop_is_dep.c b/lib/unicode/prop/uprop_is_dep.c index aed1401..d696c07 100644 --- a/lib/unicode/prop/uprop_is_dep.c +++ b/lib/unicode/prop/uprop_is_dep.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -20,7 +20,7 @@ static const struct { {RUNE_C(0x0E0001), RUNE_C(0x0E0001)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_dep(rune ch) diff --git a/lib/unicode/prop/uprop_is_di.c b/lib/unicode/prop/uprop_is_di.c index c4dc596..585ce4f 100644 --- a/lib/unicode/prop/uprop_is_di.c +++ b/lib/unicode/prop/uprop_is_di.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -35,7 +35,7 @@ static const struct { {RUNE_C(0x0E0000), RUNE_C(0x0E0FFF)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_di(rune ch) diff --git a/lib/unicode/prop/uprop_is_dia.c b/lib/unicode/prop/uprop_is_dia.c index 3d0a783..f900d3e 100644 --- a/lib/unicode/prop/uprop_is_dia.c +++ b/lib/unicode/prop/uprop_is_dia.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -208,7 +208,7 @@ static const struct { {RUNE_C(0x01E948), RUNE_C(0x01E94A)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_dia(rune ch) diff --git a/lib/unicode/prop/uprop_is_ebase.c b/lib/unicode/prop/uprop_is_ebase.c index 99da199..912671a 100644 --- a/lib/unicode/prop/uprop_is_ebase.c +++ b/lib/unicode/prop/uprop_is_ebase.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -52,7 +52,7 @@ static const struct { {RUNE_C(0x01FAF0), RUNE_C(0x01FAF8)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_ebase(rune ch) diff --git a/lib/unicode/prop/uprop_is_ecomp.c b/lib/unicode/prop/uprop_is_ecomp.c index aa61aa3..b4e5a5a 100644 --- a/lib/unicode/prop/uprop_is_ecomp.c +++ b/lib/unicode/prop/uprop_is_ecomp.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -26,7 +26,7 @@ static const struct { {RUNE_C(0x0E0020), RUNE_C(0x0E007F)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_ecomp(rune ch) diff --git a/lib/unicode/prop/uprop_is_emod.c b/lib/unicode/prop/uprop_is_emod.c index b560ed9..7b50fc8 100644 --- a/lib/unicode/prop/uprop_is_emod.c +++ b/lib/unicode/prop/uprop_is_emod.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -13,7 +13,7 @@ static const struct { {RUNE_C(0x01F3FB), RUNE_C(0x01F3FF)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_emod(rune ch) diff --git a/lib/unicode/prop/uprop_is_emoji.c b/lib/unicode/prop/uprop_is_emoji.c index d689b14..42aed21 100644 --- a/lib/unicode/prop/uprop_is_emoji.c +++ b/lib/unicode/prop/uprop_is_emoji.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -165,7 +165,7 @@ static const struct { {RUNE_C(0x01FAF0), RUNE_C(0x01FAF8)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_emoji(rune ch) diff --git a/lib/unicode/prop/uprop_is_epres.c b/lib/unicode/prop/uprop_is_epres.c index 45959db..cfd4b4b 100644 --- a/lib/unicode/prop/uprop_is_epres.c +++ b/lib/unicode/prop/uprop_is_epres.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -93,7 +93,7 @@ static const struct { {RUNE_C(0x01FAF0), RUNE_C(0x01FAF8)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_epres(rune ch) diff --git a/lib/unicode/prop/uprop_is_ext.c b/lib/unicode/prop/uprop_is_ext.c index 09d5366..b779cb7 100644 --- a/lib/unicode/prop/uprop_is_ext.c +++ b/lib/unicode/prop/uprop_is_ext.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -51,7 +51,7 @@ static const struct { {RUNE_C(0x01E944), RUNE_C(0x01E946)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_ext(rune ch) diff --git a/lib/unicode/prop/uprop_is_extpic.c b/lib/unicode/prop/uprop_is_extpic.c index 06075e7..c69f04b 100644 --- a/lib/unicode/prop/uprop_is_extpic.c +++ b/lib/unicode/prop/uprop_is_extpic.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -95,7 +95,7 @@ static const struct { {RUNE_C(0x01FC00), RUNE_C(0x01FFFD)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_extpic(rune ch) diff --git a/lib/unicode/prop/uprop_is_gr_base.c b/lib/unicode/prop/uprop_is_gr_base.c index e76ed48..22666d6 100644 --- a/lib/unicode/prop/uprop_is_gr_base.c +++ b/lib/unicode/prop/uprop_is_gr_base.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -892,7 +892,7 @@ static const struct { {RUNE_C(0x031350), RUNE_C(0x0323AF)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_gr_base(rune ch) diff --git a/lib/unicode/prop/uprop_is_gr_ext.c b/lib/unicode/prop/uprop_is_gr_ext.c index d0b0d93..2889b07 100644 --- a/lib/unicode/prop/uprop_is_gr_ext.c +++ b/lib/unicode/prop/uprop_is_gr_ext.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -375,7 +375,7 @@ static const struct { {RUNE_C(0x0E0100), RUNE_C(0x0E01EF)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_gr_ext(rune ch) diff --git a/lib/unicode/prop/uprop_is_hex.c b/lib/unicode/prop/uprop_is_hex.c index c2e6793..c303e69 100644 --- a/lib/unicode/prop/uprop_is_hex.c +++ b/lib/unicode/prop/uprop_is_hex.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -22,7 +22,7 @@ static const struct { {RUNE_C(0x00FF41), RUNE_C(0x00FF46)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_hex(rune ch) diff --git a/lib/unicode/prop/uprop_is_id_compat_math_continue.c b/lib/unicode/prop/uprop_is_id_compat_math_continue.c index 2cde8a1..51cd8e0 100644 --- a/lib/unicode/prop/uprop_is_id_compat_math_continue.c +++ b/lib/unicode/prop/uprop_is_id_compat_math_continue.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -35,7 +35,7 @@ static const struct { {RUNE_C(0x01D7C3), RUNE_C(0x01D7C3)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_id_compat_math_continue(rune ch) diff --git a/lib/unicode/prop/uprop_is_id_compat_math_start.c b/lib/unicode/prop/uprop_is_id_compat_math_start.c index e89ef5d..9da9cdf 100644 --- a/lib/unicode/prop/uprop_is_id_compat_math_start.c +++ b/lib/unicode/prop/uprop_is_id_compat_math_start.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -25,7 +25,7 @@ static const struct { {RUNE_C(0x01D7C3), RUNE_C(0x01D7C3)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_id_compat_math_start(rune ch) diff --git a/lib/unicode/prop/uprop_is_idc.c b/lib/unicode/prop/uprop_is_idc.c index f02ad69..3b79afd 100644 --- a/lib/unicode/prop/uprop_is_idc.c +++ b/lib/unicode/prop/uprop_is_idc.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -778,7 +778,7 @@ static const struct { {RUNE_C(0x0E0100), RUNE_C(0x0E01EF)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_idc(rune ch) diff --git a/lib/unicode/prop/uprop_is_ideo.c b/lib/unicode/prop/uprop_is_ideo.c index 54b535c..611a77a 100644 --- a/lib/unicode/prop/uprop_is_ideo.c +++ b/lib/unicode/prop/uprop_is_ideo.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -33,7 +33,7 @@ static const struct { {RUNE_C(0x031350), RUNE_C(0x0323AF)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_ideo(rune ch) diff --git a/lib/unicode/prop/uprop_is_ids.c b/lib/unicode/prop/uprop_is_ids.c index 0730213..a0ba82a 100644 --- a/lib/unicode/prop/uprop_is_ids.c +++ b/lib/unicode/prop/uprop_is_ids.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -672,7 +672,7 @@ static const struct { {RUNE_C(0x031350), RUNE_C(0x0323AF)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_ids(rune ch) diff --git a/lib/unicode/prop/uprop_is_idsb.c b/lib/unicode/prop/uprop_is_idsb.c index 4ce977c..ebbfdfe 100644 --- a/lib/unicode/prop/uprop_is_idsb.c +++ b/lib/unicode/prop/uprop_is_idsb.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -15,7 +15,7 @@ static const struct { {RUNE_C(0x0031EF), RUNE_C(0x0031EF)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_idsb(rune ch) diff --git a/lib/unicode/prop/uprop_is_incb.c b/lib/unicode/prop/uprop_is_incb.c index 622b9ac..d9e01c8 100644 --- a/lib/unicode/prop/uprop_is_incb.c +++ b/lib/unicode/prop/uprop_is_incb.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -212,7 +212,7 @@ static const struct { {RUNE_C(0x01E944), RUNE_C(0x01E94A)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_incb(rune ch) diff --git a/lib/unicode/prop/uprop_is_loe.c b/lib/unicode/prop/uprop_is_loe.c index 699b100..625b0f6 100644 --- a/lib/unicode/prop/uprop_is_loe.c +++ b/lib/unicode/prop/uprop_is_loe.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -19,7 +19,7 @@ static const struct { {RUNE_C(0x00AABB), RUNE_C(0x00AABC)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_loe(rune ch) diff --git a/lib/unicode/prop/uprop_is_lower.c b/lib/unicode/prop/uprop_is_lower.c index 3d3f6a9..474ae32 100644 --- a/lib/unicode/prop/uprop_is_lower.c +++ b/lib/unicode/prop/uprop_is_lower.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -684,7 +684,7 @@ static const struct { {RUNE_C(0x01E922), RUNE_C(0x01E943)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_lower(rune ch) diff --git a/lib/unicode/prop/uprop_is_math.c b/lib/unicode/prop/uprop_is_math.c index d53d487..ca2318b 100644 --- a/lib/unicode/prop/uprop_is_math.c +++ b/lib/unicode/prop/uprop_is_math.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -148,7 +148,7 @@ static const struct { {RUNE_C(0x01EEF0), RUNE_C(0x01EEF1)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_math(rune ch) diff --git a/lib/unicode/prop/uprop_is_pat_syn.c b/lib/unicode/prop/uprop_is_pat_syn.c index cab14e8..c2beece 100644 --- a/lib/unicode/prop/uprop_is_pat_syn.c +++ b/lib/unicode/prop/uprop_is_pat_syn.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -32,7 +32,7 @@ static const struct { {RUNE_C(0x00FE45), RUNE_C(0x00FE46)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_pat_syn(rune ch) diff --git a/lib/unicode/prop/uprop_is_pat_ws.c b/lib/unicode/prop/uprop_is_pat_ws.c index fe2f462..8f701b5 100644 --- a/lib/unicode/prop/uprop_is_pat_ws.c +++ b/lib/unicode/prop/uprop_is_pat_ws.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -21,7 +21,7 @@ static const struct { {RUNE_C(0x002028), RUNE_C(0x002029)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_pat_ws(rune ch) diff --git a/lib/unicode/prop/uprop_is_pcm.c b/lib/unicode/prop/uprop_is_pcm.c index eb28cbb..b1c243f 100644 --- a/lib/unicode/prop/uprop_is_pcm.c +++ b/lib/unicode/prop/uprop_is_pcm.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -19,7 +19,7 @@ static const struct { {RUNE_C(0x0110CD), RUNE_C(0x0110CD)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_pcm(rune ch) diff --git a/lib/unicode/prop/uprop_is_qmark.c b/lib/unicode/prop/uprop_is_qmark.c index 44925e5..c62e106 100644 --- a/lib/unicode/prop/uprop_is_qmark.c +++ b/lib/unicode/prop/uprop_is_qmark.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -28,7 +28,7 @@ static const struct { {RUNE_C(0x00FF62), RUNE_C(0x00FF63)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_qmark(rune ch) diff --git a/lib/unicode/prop/uprop_is_radical.c b/lib/unicode/prop/uprop_is_radical.c index ff4a376..028a64a 100644 --- a/lib/unicode/prop/uprop_is_radical.c +++ b/lib/unicode/prop/uprop_is_radical.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -15,7 +15,7 @@ static const struct { {RUNE_C(0x002F00), RUNE_C(0x002FD5)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_radical(rune ch) diff --git a/lib/unicode/prop/uprop_is_sd.c b/lib/unicode/prop/uprop_is_sd.c index e547820..0cbcb5c 100644 --- a/lib/unicode/prop/uprop_is_sd.c +++ b/lib/unicode/prop/uprop_is_sd.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -52,7 +52,7 @@ static const struct { {RUNE_C(0x01E068), RUNE_C(0x01E068)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_sd(rune ch) diff --git a/lib/unicode/prop/uprop_is_sterm.c b/lib/unicode/prop/uprop_is_sterm.c index a375061..90966c4 100644 --- a/lib/unicode/prop/uprop_is_sterm.c +++ b/lib/unicode/prop/uprop_is_sterm.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -97,7 +97,7 @@ static const struct { {RUNE_C(0x01DA88), RUNE_C(0x01DA88)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_sterm(rune ch) diff --git a/lib/unicode/prop/uprop_is_term.c b/lib/unicode/prop/uprop_is_term.c index 4789e1a..1475fbc 100644 --- a/lib/unicode/prop/uprop_is_term.c +++ b/lib/unicode/prop/uprop_is_term.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -122,7 +122,7 @@ static const struct { {RUNE_C(0x01DA87), RUNE_C(0x01DA8A)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_term(rune ch) diff --git a/lib/unicode/prop/uprop_is_uideo.c b/lib/unicode/prop/uprop_is_uideo.c index d90cfea..a178b69 100644 --- a/lib/unicode/prop/uprop_is_uideo.c +++ b/lib/unicode/prop/uprop_is_uideo.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -29,7 +29,7 @@ static const struct { {RUNE_C(0x031350), RUNE_C(0x0323AF)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_uideo(rune ch) diff --git a/lib/unicode/prop/uprop_is_upper.c b/lib/unicode/prop/uprop_is_upper.c index a5ceee0..1ed0436 100644 --- a/lib/unicode/prop/uprop_is_upper.c +++ b/lib/unicode/prop/uprop_is_upper.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -667,7 +667,7 @@ static const struct { {RUNE_C(0x01F170), RUNE_C(0x01F189)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_upper(rune ch) diff --git a/lib/unicode/prop/uprop_is_vs.c b/lib/unicode/prop/uprop_is_vs.c index 25751aa..3133d6b 100644 --- a/lib/unicode/prop/uprop_is_vs.c +++ b/lib/unicode/prop/uprop_is_vs.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -16,7 +16,7 @@ static const struct { {RUNE_C(0x0E0100), RUNE_C(0x0E01EF)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_vs(rune ch) diff --git a/lib/unicode/prop/uprop_is_wspace.c b/lib/unicode/prop/uprop_is_wspace.c index 3306eec..c4644a2 100644 --- a/lib/unicode/prop/uprop_is_wspace.c +++ b/lib/unicode/prop/uprop_is_wspace.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -25,7 +25,7 @@ static const struct { {RUNE_C(0x003000), RUNE_C(0x003000)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_wspace(rune ch) diff --git a/lib/unicode/prop/uprop_is_xidc.c b/lib/unicode/prop/uprop_is_xidc.c index 2aa4033..5503caa 100644 --- a/lib/unicode/prop/uprop_is_xidc.c +++ b/lib/unicode/prop/uprop_is_xidc.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -785,7 +785,7 @@ static const struct { {RUNE_C(0x0E0100), RUNE_C(0x0E01EF)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_xidc(rune ch) diff --git a/lib/unicode/prop/uprop_is_xids.c b/lib/unicode/prop/uprop_is_xids.c index 4ee559e..3b29835 100644 --- a/lib/unicode/prop/uprop_is_xids.c +++ b/lib/unicode/prop/uprop_is_xids.c @@ -1,6 +1,6 @@ /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ -#include "__bsearch.h" +#include "_bsearch.h" #include "bitset.h" #include "rune.h" #include "unicode/prop.h" @@ -679,7 +679,7 @@ static const struct { {RUNE_C(0x031350), RUNE_C(0x0323AF)}, }; -__MLIB_DEFINE_BSEARCH_CONTAINS(lookup) +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) bool uprop_is_xids(rune ch) diff --git a/lib/unicode/string/u8gnext.c b/lib/unicode/string/u8gnext.c index 9824abb..a050bd5 100644 --- a/lib/unicode/string/u8gnext.c +++ b/lib/unicode/string/u8gnext.c @@ -1,8 +1,8 @@ #include <stddef.h> -#include "__bsearch.h" +#include "_bsearch.h" #include "mbstring.h" -#include "unicode/__gbrk.h" +#include "unicode/_gbrk.h" #include "unicode/string.h" struct gbrk_state { @@ -17,7 +17,7 @@ struct gbrk_state { static bool u8isgbrk(rune, rune, struct gbrk_state *); -__MLIB_DEFINE_BSEARCH(gbrk_prop, gbrk_prop_tbl, GBP_OTHER) +_MLIB_DEFINE_BSEARCH(gbrk_prop, gbrk_prop_tbl, GBP_OTHER) size_t u8gnext(struct u8view *g, const char8_t **s, size_t *n) |