From a13daaddc5e77ab028553caa92e1bcb0206e892f Mon Sep 17 00:00:00 2001 From: Thomas Voss Date: Sun, 21 Apr 2024 23:23:30 +0200 Subject: Fix typo (extpic -> extpict) --- gen/prop/bool-props | 2 +- include/unicode/prop.h | 2 +- lib/unicode/prop/uprop_is_extpic.c | 104 ------------------------------------ lib/unicode/prop/uprop_is_extpict.c | 104 ++++++++++++++++++++++++++++++++++++ 4 files changed, 106 insertions(+), 106 deletions(-) delete mode 100644 lib/unicode/prop/uprop_is_extpic.c create mode 100644 lib/unicode/prop/uprop_is_extpict.c diff --git a/gen/prop/bool-props b/gen/prop/bool-props index 3d806b5..b98b9d8 100755 --- a/gen/prop/bool-props +++ b/gen/prop/bool-props @@ -57,7 +57,7 @@ ecomp=Emoji_Component emod=Emoji_Modifier emoji=Emoji epres=Emoji_Presentation -extpic=Extended_Pictographic +extpict=Extended_Pictographic ' props4=' diff --git a/include/unicode/prop.h b/include/unicode/prop.h index d450636..7928fdc 100644 --- a/include/unicode/prop.h +++ b/include/unicode/prop.h @@ -1157,7 +1157,7 @@ enum uprop_wb { [[_mlib_pure]] bool uprop_is_emoji(rune); [[_mlib_pure]] bool uprop_is_epres(rune); [[_mlib_pure]] bool uprop_is_ext(rune); -[[_mlib_pure]] bool uprop_is_extpic(rune); +[[_mlib_pure]] bool uprop_is_extpict(rune); [[_mlib_pure]] bool uprop_is_gr_base(rune); [[_mlib_pure]] bool uprop_is_gr_ext(rune); [[_mlib_pure]] bool uprop_is_hex(rune); diff --git a/lib/unicode/prop/uprop_is_extpic.c b/lib/unicode/prop/uprop_is_extpic.c deleted file mode 100644 index c69f04b..0000000 --- a/lib/unicode/prop/uprop_is_extpic.c +++ /dev/null @@ -1,104 +0,0 @@ -/* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ - -#include "_bsearch.h" -#include "bitset.h" -#include "rune.h" -#include "unicode/prop.h" - -/* clang-format off */ - -static constexpr bitset(bs, LATIN1_MAX) = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -static const struct { - rune lo, hi; -} lookup[] = { - {RUNE_C(0x00203C), RUNE_C(0x00203C)}, - {RUNE_C(0x002049), RUNE_C(0x002049)}, - {RUNE_C(0x002122), RUNE_C(0x002122)}, - {RUNE_C(0x002139), RUNE_C(0x002139)}, - {RUNE_C(0x002194), RUNE_C(0x002199)}, - {RUNE_C(0x0021A9), RUNE_C(0x0021AA)}, - {RUNE_C(0x00231A), RUNE_C(0x00231B)}, - {RUNE_C(0x002328), RUNE_C(0x002328)}, - {RUNE_C(0x002388), RUNE_C(0x002388)}, - {RUNE_C(0x0023CF), RUNE_C(0x0023CF)}, - {RUNE_C(0x0023E9), RUNE_C(0x0023F3)}, - {RUNE_C(0x0023F8), RUNE_C(0x0023FA)}, - {RUNE_C(0x0024C2), RUNE_C(0x0024C2)}, - {RUNE_C(0x0025AA), RUNE_C(0x0025AB)}, - {RUNE_C(0x0025B6), RUNE_C(0x0025B6)}, - {RUNE_C(0x0025C0), RUNE_C(0x0025C0)}, - {RUNE_C(0x0025FB), RUNE_C(0x0025FE)}, - {RUNE_C(0x002600), RUNE_C(0x002605)}, - {RUNE_C(0x002607), RUNE_C(0x002612)}, - {RUNE_C(0x002614), RUNE_C(0x002685)}, - {RUNE_C(0x002690), RUNE_C(0x002705)}, - {RUNE_C(0x002708), RUNE_C(0x002712)}, - {RUNE_C(0x002714), RUNE_C(0x002714)}, - {RUNE_C(0x002716), RUNE_C(0x002716)}, - {RUNE_C(0x00271D), RUNE_C(0x00271D)}, - {RUNE_C(0x002721), RUNE_C(0x002721)}, - {RUNE_C(0x002728), RUNE_C(0x002728)}, - {RUNE_C(0x002733), RUNE_C(0x002734)}, - {RUNE_C(0x002744), RUNE_C(0x002744)}, - {RUNE_C(0x002747), RUNE_C(0x002747)}, - {RUNE_C(0x00274C), RUNE_C(0x00274C)}, - {RUNE_C(0x00274E), RUNE_C(0x00274E)}, - {RUNE_C(0x002753), RUNE_C(0x002755)}, - {RUNE_C(0x002757), RUNE_C(0x002757)}, - {RUNE_C(0x002763), RUNE_C(0x002767)}, - {RUNE_C(0x002795), RUNE_C(0x002797)}, - {RUNE_C(0x0027A1), RUNE_C(0x0027A1)}, - {RUNE_C(0x0027B0), RUNE_C(0x0027B0)}, - {RUNE_C(0x0027BF), RUNE_C(0x0027BF)}, - {RUNE_C(0x002934), RUNE_C(0x002935)}, - {RUNE_C(0x002B05), RUNE_C(0x002B07)}, - {RUNE_C(0x002B1B), RUNE_C(0x002B1C)}, - {RUNE_C(0x002B50), RUNE_C(0x002B50)}, - {RUNE_C(0x002B55), RUNE_C(0x002B55)}, - {RUNE_C(0x003030), RUNE_C(0x003030)}, - {RUNE_C(0x00303D), RUNE_C(0x00303D)}, - {RUNE_C(0x003297), RUNE_C(0x003297)}, - {RUNE_C(0x003299), RUNE_C(0x003299)}, - {RUNE_C(0x01F000), RUNE_C(0x01F0FF)}, - {RUNE_C(0x01F10D), RUNE_C(0x01F10F)}, - {RUNE_C(0x01F12F), RUNE_C(0x01F12F)}, - {RUNE_C(0x01F16C), RUNE_C(0x01F171)}, - {RUNE_C(0x01F17E), RUNE_C(0x01F17F)}, - {RUNE_C(0x01F18E), RUNE_C(0x01F18E)}, - {RUNE_C(0x01F191), RUNE_C(0x01F19A)}, - {RUNE_C(0x01F1AD), RUNE_C(0x01F1E5)}, - {RUNE_C(0x01F201), RUNE_C(0x01F20F)}, - {RUNE_C(0x01F21A), RUNE_C(0x01F21A)}, - {RUNE_C(0x01F22F), RUNE_C(0x01F22F)}, - {RUNE_C(0x01F232), RUNE_C(0x01F23A)}, - {RUNE_C(0x01F23C), RUNE_C(0x01F23F)}, - {RUNE_C(0x01F249), RUNE_C(0x01F3FA)}, - {RUNE_C(0x01F400), RUNE_C(0x01F53D)}, - {RUNE_C(0x01F546), RUNE_C(0x01F64F)}, - {RUNE_C(0x01F680), RUNE_C(0x01F6FF)}, - {RUNE_C(0x01F774), RUNE_C(0x01F77F)}, - {RUNE_C(0x01F7D5), RUNE_C(0x01F7FF)}, - {RUNE_C(0x01F80C), RUNE_C(0x01F80F)}, - {RUNE_C(0x01F848), RUNE_C(0x01F84F)}, - {RUNE_C(0x01F85A), RUNE_C(0x01F85F)}, - {RUNE_C(0x01F888), RUNE_C(0x01F88F)}, - {RUNE_C(0x01F8AE), RUNE_C(0x01F8FF)}, - {RUNE_C(0x01F90C), RUNE_C(0x01F93A)}, - {RUNE_C(0x01F93C), RUNE_C(0x01F945)}, - {RUNE_C(0x01F947), RUNE_C(0x01FAFF)}, - {RUNE_C(0x01FC00), RUNE_C(0x01FFFD)}, -}; - -_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) - -bool -uprop_is_extpic(rune ch) -{ - return ch <= LATIN1_MAX ? TESTBIT(bs, ch) : mlib_lookup_contains(ch); -} diff --git a/lib/unicode/prop/uprop_is_extpict.c b/lib/unicode/prop/uprop_is_extpict.c new file mode 100644 index 0000000..5334703 --- /dev/null +++ b/lib/unicode/prop/uprop_is_extpict.c @@ -0,0 +1,104 @@ +/* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */ + +#include "_bsearch.h" +#include "bitset.h" +#include "rune.h" +#include "unicode/prop.h" + +/* clang-format off */ + +static constexpr bitset(bs, LATIN1_MAX) = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +}; + +static const struct { + rune lo, hi; +} lookup[] = { + {RUNE_C(0x00203C), RUNE_C(0x00203C)}, + {RUNE_C(0x002049), RUNE_C(0x002049)}, + {RUNE_C(0x002122), RUNE_C(0x002122)}, + {RUNE_C(0x002139), RUNE_C(0x002139)}, + {RUNE_C(0x002194), RUNE_C(0x002199)}, + {RUNE_C(0x0021A9), RUNE_C(0x0021AA)}, + {RUNE_C(0x00231A), RUNE_C(0x00231B)}, + {RUNE_C(0x002328), RUNE_C(0x002328)}, + {RUNE_C(0x002388), RUNE_C(0x002388)}, + {RUNE_C(0x0023CF), RUNE_C(0x0023CF)}, + {RUNE_C(0x0023E9), RUNE_C(0x0023F3)}, + {RUNE_C(0x0023F8), RUNE_C(0x0023FA)}, + {RUNE_C(0x0024C2), RUNE_C(0x0024C2)}, + {RUNE_C(0x0025AA), RUNE_C(0x0025AB)}, + {RUNE_C(0x0025B6), RUNE_C(0x0025B6)}, + {RUNE_C(0x0025C0), RUNE_C(0x0025C0)}, + {RUNE_C(0x0025FB), RUNE_C(0x0025FE)}, + {RUNE_C(0x002600), RUNE_C(0x002605)}, + {RUNE_C(0x002607), RUNE_C(0x002612)}, + {RUNE_C(0x002614), RUNE_C(0x002685)}, + {RUNE_C(0x002690), RUNE_C(0x002705)}, + {RUNE_C(0x002708), RUNE_C(0x002712)}, + {RUNE_C(0x002714), RUNE_C(0x002714)}, + {RUNE_C(0x002716), RUNE_C(0x002716)}, + {RUNE_C(0x00271D), RUNE_C(0x00271D)}, + {RUNE_C(0x002721), RUNE_C(0x002721)}, + {RUNE_C(0x002728), RUNE_C(0x002728)}, + {RUNE_C(0x002733), RUNE_C(0x002734)}, + {RUNE_C(0x002744), RUNE_C(0x002744)}, + {RUNE_C(0x002747), RUNE_C(0x002747)}, + {RUNE_C(0x00274C), RUNE_C(0x00274C)}, + {RUNE_C(0x00274E), RUNE_C(0x00274E)}, + {RUNE_C(0x002753), RUNE_C(0x002755)}, + {RUNE_C(0x002757), RUNE_C(0x002757)}, + {RUNE_C(0x002763), RUNE_C(0x002767)}, + {RUNE_C(0x002795), RUNE_C(0x002797)}, + {RUNE_C(0x0027A1), RUNE_C(0x0027A1)}, + {RUNE_C(0x0027B0), RUNE_C(0x0027B0)}, + {RUNE_C(0x0027BF), RUNE_C(0x0027BF)}, + {RUNE_C(0x002934), RUNE_C(0x002935)}, + {RUNE_C(0x002B05), RUNE_C(0x002B07)}, + {RUNE_C(0x002B1B), RUNE_C(0x002B1C)}, + {RUNE_C(0x002B50), RUNE_C(0x002B50)}, + {RUNE_C(0x002B55), RUNE_C(0x002B55)}, + {RUNE_C(0x003030), RUNE_C(0x003030)}, + {RUNE_C(0x00303D), RUNE_C(0x00303D)}, + {RUNE_C(0x003297), RUNE_C(0x003297)}, + {RUNE_C(0x003299), RUNE_C(0x003299)}, + {RUNE_C(0x01F000), RUNE_C(0x01F0FF)}, + {RUNE_C(0x01F10D), RUNE_C(0x01F10F)}, + {RUNE_C(0x01F12F), RUNE_C(0x01F12F)}, + {RUNE_C(0x01F16C), RUNE_C(0x01F171)}, + {RUNE_C(0x01F17E), RUNE_C(0x01F17F)}, + {RUNE_C(0x01F18E), RUNE_C(0x01F18E)}, + {RUNE_C(0x01F191), RUNE_C(0x01F19A)}, + {RUNE_C(0x01F1AD), RUNE_C(0x01F1E5)}, + {RUNE_C(0x01F201), RUNE_C(0x01F20F)}, + {RUNE_C(0x01F21A), RUNE_C(0x01F21A)}, + {RUNE_C(0x01F22F), RUNE_C(0x01F22F)}, + {RUNE_C(0x01F232), RUNE_C(0x01F23A)}, + {RUNE_C(0x01F23C), RUNE_C(0x01F23F)}, + {RUNE_C(0x01F249), RUNE_C(0x01F3FA)}, + {RUNE_C(0x01F400), RUNE_C(0x01F53D)}, + {RUNE_C(0x01F546), RUNE_C(0x01F64F)}, + {RUNE_C(0x01F680), RUNE_C(0x01F6FF)}, + {RUNE_C(0x01F774), RUNE_C(0x01F77F)}, + {RUNE_C(0x01F7D5), RUNE_C(0x01F7FF)}, + {RUNE_C(0x01F80C), RUNE_C(0x01F80F)}, + {RUNE_C(0x01F848), RUNE_C(0x01F84F)}, + {RUNE_C(0x01F85A), RUNE_C(0x01F85F)}, + {RUNE_C(0x01F888), RUNE_C(0x01F88F)}, + {RUNE_C(0x01F8AE), RUNE_C(0x01F8FF)}, + {RUNE_C(0x01F90C), RUNE_C(0x01F93A)}, + {RUNE_C(0x01F93C), RUNE_C(0x01F945)}, + {RUNE_C(0x01F947), RUNE_C(0x01FAFF)}, + {RUNE_C(0x01FC00), RUNE_C(0x01FFFD)}, +}; + +_MLIB_DEFINE_BSEARCH_CONTAINS(lookup) + +bool +uprop_is_extpict(rune ch) +{ + return ch <= LATIN1_MAX ? TESTBIT(bs, ch) : mlib_lookup_contains(ch); +} -- cgit v1.2.3